nonFungibleTokenStateAndRef : list) {
+ if (nonFungibleTokenStateAndRef.getState().getData().getLinearId().getId().equals(UUID.fromString(nonFungibleTokenId))) {
+ return "This account does hold the ticket";
+ }
+ }
+ return "This account does not hold the ticket";
+ }
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/clients/src/main/java/com/t20worldcup/webserver/NodeRPCConnection.java b/Accounts/worldcupticketbooking/clients/src/main/java/com/t20worldcup/webserver/NodeRPCConnection.java
new file mode 100644
index 00000000..af714c22
--- /dev/null
+++ b/Accounts/worldcupticketbooking/clients/src/main/java/com/t20worldcup/webserver/NodeRPCConnection.java
@@ -0,0 +1,48 @@
+package com.t20worldcup.webserver;
+
+import net.corda.client.rpc.CordaRPCClient;
+import net.corda.client.rpc.CordaRPCConnection;
+import net.corda.core.messaging.CordaRPCOps;
+import net.corda.core.utilities.NetworkHostAndPort;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+/**
+ * Wraps an RPC connection to a Corda node.
+ *
+ * The RPC connection is configured using command line arguments.
+ */
+@Component
+public class NodeRPCConnection implements AutoCloseable {
+ // The host of the node we are connecting to.
+ @Value("${config.rpc.host}")
+ private String host;
+ // The RPC port of the node we are connecting to.
+ @Value("${config.rpc.username}")
+ private String username;
+ // The username for logging into the RPC client.
+ @Value("${config.rpc.password}")
+ private String password;
+ // The password for logging into the RPC client.
+ @Value("${config.rpc.port}")
+ private int rpcPort;
+
+ private CordaRPCConnection rpcConnection;
+ CordaRPCOps proxy;
+
+ @PostConstruct
+ public void initialiseNodeRPCConnection() {
+ NetworkHostAndPort rpcAddress = new NetworkHostAndPort(host, rpcPort);
+ CordaRPCClient rpcClient = new CordaRPCClient(rpcAddress);
+ rpcConnection = rpcClient.start(username, password);
+ proxy = rpcConnection.getProxy();
+ }
+
+ @PreDestroy
+ public void close() {
+ rpcConnection.notifyServerAndClose();
+ }
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/clients/src/main/java/com/t20worldcup/webserver/Starter.java b/Accounts/worldcupticketbooking/clients/src/main/java/com/t20worldcup/webserver/Starter.java
new file mode 100644
index 00000000..cb9e63ee
--- /dev/null
+++ b/Accounts/worldcupticketbooking/clients/src/main/java/com/t20worldcup/webserver/Starter.java
@@ -0,0 +1,23 @@
+package com.t20worldcup.webserver;
+
+import org.springframework.boot.Banner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import static org.springframework.boot.WebApplicationType.SERVLET;
+
+/**
+ * Our Spring Boot application.
+ */
+@SpringBootApplication
+public class Starter {
+ /**
+ * Starts our Spring Boot application.
+ */
+ public static void main(String[] args) {
+ SpringApplication app = new SpringApplication(Starter.class);
+ app.setBannerMode(Banner.Mode.OFF);
+ app.setWebApplicationType(SERVLET);
+ app.run();
+ }
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/clients/src/main/resources/static/app.js b/Accounts/worldcupticketbooking/clients/src/main/resources/static/app.js
new file mode 100644
index 00000000..c58d2de8
--- /dev/null
+++ b/Accounts/worldcupticketbooking/clients/src/main/resources/static/app.js
@@ -0,0 +1,3 @@
+"use strict";
+
+// Define your client-side logic here.
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/clients/src/main/resources/static/index.html b/Accounts/worldcupticketbooking/clients/src/main/resources/static/index.html
new file mode 100644
index 00000000..758501dd
--- /dev/null
+++ b/Accounts/worldcupticketbooking/clients/src/main/resources/static/index.html
@@ -0,0 +1,10 @@
+
+
+
+ Example front-end.
+
+
+ Define your front-end here.
+
+
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/config/dev/log4j2.xml b/Accounts/worldcupticketbooking/config/dev/log4j2.xml
new file mode 100644
index 00000000..34ba4d45
--- /dev/null
+++ b/Accounts/worldcupticketbooking/config/dev/log4j2.xml
@@ -0,0 +1,59 @@
+
+
+
+
+ logs
+ node-${hostName}
+ ${log-path}/archive
+
+
+
+
+
+
+ %highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Accounts/worldcupticketbooking/config/test/log4j2.xml b/Accounts/worldcupticketbooking/config/test/log4j2.xml
new file mode 100644
index 00000000..cd9926ca
--- /dev/null
+++ b/Accounts/worldcupticketbooking/config/test/log4j2.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
+ >
+
+
+
+
+
+
+
+
+
+
diff --git a/Accounts/worldcupticketbooking/contracts/build.gradle b/Accounts/worldcupticketbooking/contracts/build.gradle
new file mode 100644
index 00000000..a8f6b788
--- /dev/null
+++ b/Accounts/worldcupticketbooking/contracts/build.gradle
@@ -0,0 +1,37 @@
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ contract {
+ name "t20worldcup Contracts"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+}
+
+sourceSets {
+ main{
+ java {
+ srcDir 'src/main/java'
+ java.outputDir = file('bin/main')
+ }
+ }
+ test{
+ java{
+ srcDir 'src/test/java'
+ java.outputDir = file('bin/test')
+ }
+ }
+}
+
+dependencies {
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+
+ cordaCompile "$tokens_release_group:tokens-contracts:$tokens_release_version"
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/contracts/src/main/java/com/t20worldcup/contracts/T20CricketTicketContract.java b/Accounts/worldcupticketbooking/contracts/src/main/java/com/t20worldcup/contracts/T20CricketTicketContract.java
new file mode 100644
index 00000000..ebd02248
--- /dev/null
+++ b/Accounts/worldcupticketbooking/contracts/src/main/java/com/t20worldcup/contracts/T20CricketTicketContract.java
@@ -0,0 +1,26 @@
+package com.t20worldcup.contracts;
+
+import com.r3.corda.lib.tokens.contracts.EvolvableTokenContract;
+import net.corda.core.contracts.Contract;
+import net.corda.core.transactions.LedgerTransaction;
+import org.jetbrains.annotations.NotNull;
+
+public class T20CricketTicketContract extends EvolvableTokenContract implements Contract {
+
+ @Override
+ public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
+
+ }
+
+ @Override
+ public void additionalCreateChecks(@NotNull LedgerTransaction tx) {
+ // Write contract validation logic to be performed while creation of token
+
+ }
+
+ @Override
+ public void additionalUpdateChecks(@NotNull LedgerTransaction tx) {
+ // Write contract validation logic to be performed while updation of token
+ }
+
+}
diff --git a/Accounts/worldcupticketbooking/contracts/src/main/java/com/t20worldcup/states/T20CricketTicket.java b/Accounts/worldcupticketbooking/contracts/src/main/java/com/t20worldcup/states/T20CricketTicket.java
new file mode 100644
index 00000000..76998c06
--- /dev/null
+++ b/Accounts/worldcupticketbooking/contracts/src/main/java/com/t20worldcup/states/T20CricketTicket.java
@@ -0,0 +1,63 @@
+package com.t20worldcup.states;
+
+import com.r3.corda.lib.tokens.contracts.states.EvolvableTokenType;
+import com.t20worldcup.contracts.T20CricketTicketContract;
+import net.corda.core.contracts.BelongsToContract;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.Party;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+@BelongsToContract(T20CricketTicketContract.class)
+public class T20CricketTicket extends EvolvableTokenType {
+
+ private UniqueIdentifier linearId;
+ private String ticketTeam;
+ private Party issuer;//dealer
+ //private AbstractParty owner;//for the first time dealer then customers
+
+ public T20CricketTicket(UniqueIdentifier linearId, String ticketTeam, Party issuer) {
+ this.linearId = linearId;
+ this.ticketTeam = ticketTeam;
+ this.issuer = issuer;
+ //this.owner = owner;
+ }
+
+ @Override
+ public int getFractionDigits() {
+ return 0;
+ }
+
+ @NotNull
+ @Override
+ public List getMaintainers() {
+ return Arrays.asList(this.getIssuer());
+ }
+
+// @NotNull
+// @Override
+// public List getParticipants() {
+// return Arrays.asList(this.getOwner());
+// }
+
+ @NotNull
+ @Override
+ public UniqueIdentifier getLinearId() {
+ return this.linearId;
+ }
+
+// public AbstractParty getOwner() {
+// return owner;
+// }
+
+ public String getTicketTeam() {
+ return ticketTeam;
+ }
+
+ public Party getIssuer() {
+ return issuer;
+ }
+
+}
diff --git a/Accounts/worldcupticketbooking/contracts/src/test/java/com/t20worldcup/contracts/ContractTests.java b/Accounts/worldcupticketbooking/contracts/src/test/java/com/t20worldcup/contracts/ContractTests.java
new file mode 100644
index 00000000..d5c7394d
--- /dev/null
+++ b/Accounts/worldcupticketbooking/contracts/src/test/java/com/t20worldcup/contracts/ContractTests.java
@@ -0,0 +1,13 @@
+package com.t20worldcup.contracts;
+
+import net.corda.testing.node.MockServices;
+import org.junit.Test;
+
+public class ContractTests {
+ private final MockServices ledgerServices = new MockServices();
+
+ @Test
+ public void dummyTest() {
+
+ }
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/gradle.properties b/Accounts/worldcupticketbooking/gradle.properties
new file mode 100644
index 00000000..9c8df25c
--- /dev/null
+++ b/Accounts/worldcupticketbooking/gradle.properties
@@ -0,0 +1,3 @@
+name=Test
+group=com.t20worldcup
+version=0.1
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/gradle/wrapper/gradle-wrapper.jar b/Accounts/worldcupticketbooking/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..99340b4a
Binary files /dev/null and b/Accounts/worldcupticketbooking/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Accounts/worldcupticketbooking/gradle/wrapper/gradle-wrapper.properties b/Accounts/worldcupticketbooking/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..2a2a3a8e
--- /dev/null
+++ b/Accounts/worldcupticketbooking/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Aug 25 12:50:39 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/Accounts/worldcupticketbooking/gradlew b/Accounts/worldcupticketbooking/gradlew
new file mode 100755
index 00000000..cccdd3d5
--- /dev/null
+++ b/Accounts/worldcupticketbooking/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/Accounts/worldcupticketbooking/gradlew.bat b/Accounts/worldcupticketbooking/gradlew.bat
new file mode 100644
index 00000000..f9553162
--- /dev/null
+++ b/Accounts/worldcupticketbooking/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Accounts/worldcupticketbooking/images/T20-World-Cup-e1578570579412.jpg b/Accounts/worldcupticketbooking/images/T20-World-Cup-e1578570579412.jpg
new file mode 100644
index 00000000..9c7e051a
Binary files /dev/null and b/Accounts/worldcupticketbooking/images/T20-World-Cup-e1578570579412.jpg differ
diff --git a/Accounts/worldcupticketbooking/images/graph.png b/Accounts/worldcupticketbooking/images/graph.png
new file mode 100644
index 00000000..f434fe1e
Binary files /dev/null and b/Accounts/worldcupticketbooking/images/graph.png differ
diff --git a/Accounts/worldcupticketbooking/images/workflow.png b/Accounts/worldcupticketbooking/images/workflow.png
new file mode 100644
index 00000000..bc401c35
Binary files /dev/null and b/Accounts/worldcupticketbooking/images/workflow.png differ
diff --git a/Accounts/worldcupticketbooking/repositories.gradle b/Accounts/worldcupticketbooking/repositories.gradle
new file mode 100644
index 00000000..072b616b
--- /dev/null
+++ b/Accounts/worldcupticketbooking/repositories.gradle
@@ -0,0 +1,10 @@
+repositories {
+ mavenLocal()
+ mavenCentral()
+
+ maven { url 'https://jitpack.io' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+ maven { url 'http://software.r3.com/artifactory/corda-lib-dev' }
+ maven { url 'http://software.r3.com/artifactory/corda-lib' }
+}
diff --git a/Accounts/worldcupticketbooking/settings.gradle b/Accounts/worldcupticketbooking/settings.gradle
new file mode 100644
index 00000000..2514aca2
--- /dev/null
+++ b/Accounts/worldcupticketbooking/settings.gradle
@@ -0,0 +1,3 @@
+include 'workflows'
+include 'contracts'
+include 'clients'
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/workflows/build.gradle b/Accounts/worldcupticketbooking/workflows/build.gradle
new file mode 100644
index 00000000..b2f724d5
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/build.gradle
@@ -0,0 +1,78 @@
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ workflow {
+ name "t20worldcup Flows"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src/main/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+ test {
+ java {
+ srcDir 'src/test/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/test")
+ }
+ }
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ }
+}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+dependencies {
+ testCompile "junit:junit:$junit_version"
+
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+
+ // CorDapp dependencies.
+ cordapp project(":contracts")
+
+ //Account dependencies
+ cordaCompile "$confidential_id_release_group:ci-workflows:$confidential_id_release_version"
+ cordaCompile "$accounts_release_group:accounts-workflows:$accounts_release_version"
+ cordaCompile "$accounts_release_group:accounts-contracts:$accounts_release_version"
+
+
+ // Token SDK dependencies.
+ cordaCompile "$tokens_release_group:tokens-workflows:$tokens_release_version"
+ cordaCompile "$tokens_release_group:tokens-contracts:$tokens_release_version"
+ cordaCompile "$tokens_release_group:tokens-money:$tokens_release_version"
+ cordapp "$tokens_release_group:tokens-selection:$tokens_release_version"
+
+}
+
+task integrationTest(type: Test, dependsOn: []) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/workflows/src/integrationTest/java/com/t20worldcup/DriverBasedTest.java b/Accounts/worldcupticketbooking/workflows/src/integrationTest/java/com/t20worldcup/DriverBasedTest.java
new file mode 100644
index 00000000..1ba4baba
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/integrationTest/java/com/t20worldcup/DriverBasedTest.java
@@ -0,0 +1,48 @@
+package com.t20worldcup;
+
+import com.google.common.collect.ImmutableList;
+import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.driver.DriverParameters;
+import net.corda.testing.driver.NodeHandle;
+import net.corda.testing.driver.NodeParameters;
+import org.junit.Test;
+
+import java.util.List;
+
+import static net.corda.testing.driver.Driver.driver;
+import static org.junit.Assert.assertEquals;
+
+public class DriverBasedTest {
+ private final TestIdentity bankA = new TestIdentity(new CordaX500Name("BankA", "", "GB"));
+ private final TestIdentity bankB = new TestIdentity(new CordaX500Name("BankB", "", "US"));
+
+ @Test
+ public void nodeTest() {
+ driver(new DriverParameters().withIsDebug(true).withStartNodesInProcess(true), dsl -> {
+ // Start a pair of nodes and wait for them both to be ready.
+ List> handleFutures = ImmutableList.of(
+ dsl.startNode(new NodeParameters().withProvidedName(bankA.getName())),
+ dsl.startNode(new NodeParameters().withProvidedName(bankB.getName()))
+ );
+
+ try {
+ NodeHandle partyAHandle = handleFutures.get(0).get();
+ NodeHandle partyBHandle = handleFutures.get(1).get();
+
+ // From each node, make an RPC call to retrieve another node's name from the network map, to verify that the
+ // nodes have started and can communicate.
+
+ // This is a very basic test: in practice tests would be starting flows, and verifying the states in the vault
+ // and other important metrics to ensure that your CorDapp is working as intended.
+ assertEquals(partyAHandle.getRpc().wellKnownPartyFromX500Name(bankB.getName()).getName(), bankB.getName());
+ assertEquals(partyBHandle.getRpc().wellKnownPartyFromX500Name(bankA.getName()).getName(), bankA.getName());
+ } catch (Exception e) {
+ throw new RuntimeException("Caught exception during test: ", e);
+ }
+
+ return null;
+ });
+ }
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/CreateAndShareAccountFlow.java b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/CreateAndShareAccountFlow.java
new file mode 100644
index 00000000..cb226518
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/CreateAndShareAccountFlow.java
@@ -0,0 +1,46 @@
+package com.t20worldcup.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.r3.corda.lib.accounts.contracts.states.AccountInfo;
+import com.r3.corda.lib.accounts.workflows.flows.CreateAccount;
+import com.r3.corda.lib.accounts.workflows.flows.ShareAccountInfo;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.flows.FlowException;
+import net.corda.core.flows.FlowLogic;
+import net.corda.core.flows.InitiatingFlow;
+import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+
+import java.util.List;
+
+/**
+ * This flow will create the account on the node on which you run this flow. This is done using inbuilt flow called CreateAccount.
+ * CreateAccount creates an AccountInfo object which has name, host and id as its fields. This is mapped to Account table in the db.
+ * For any other party to transact with this account, this AccountInfo will haveto be shared with that Party.
+ * Hence the Ipl Ticket Dealers create the ticket buyers accounts on their end and share this accountInfo with the Bank node and BCCI node.
+ */
+@StartableByRPC
+@InitiatingFlow
+public class CreateAndShareAccountFlow extends FlowLogic {
+
+ private final String accountName;
+ private final List partyToShareAccountInfoToList;
+
+ public CreateAndShareAccountFlow(String accountName, List partyToShareAccountInfoToList) {
+ this.accountName = accountName;
+ this.partyToShareAccountInfoToList = partyToShareAccountInfoToList;
+ }
+
+ @Override
+ @Suspendable
+ public String call() throws FlowException {
+
+ //Call inbuilt CreateAccount flow to create the AccountInfo object
+ StateAndRef accountInfoStateAndRef = (StateAndRef) subFlow(new CreateAccount(accountName));
+
+ //Share this AccountInfo object with the parties who want to transact with this account
+ subFlow(new ShareAccountInfo(accountInfoStateAndRef, partyToShareAccountInfoToList));
+ return "" + accountName +"has been created and shared to " +partyToShareAccountInfoToList+".";
+ }
+}
diff --git a/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/CreateT20CricketTicketTokenFlow.java b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/CreateT20CricketTicketTokenFlow.java
new file mode 100644
index 00000000..f75f0d25
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/CreateT20CricketTicketTokenFlow.java
@@ -0,0 +1,51 @@
+package com.t20worldcup.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.t20worldcup.states.T20CricketTicket;
+import com.r3.corda.lib.tokens.workflows.flows.rpc.CreateEvolvableTokens;
+import net.corda.core.contracts.TransactionState;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.FlowException;
+import net.corda.core.flows.FlowLogic;
+import net.corda.core.flows.InitiatingFlow;
+import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.identity.CordaX500Name;
+
+/**
+ * This flow should be run by BCCI node. BCCI node will take care of issuing the base token type for the Ipl ticket. The token type will be craeted on the BCCI node
+ * and need not be shared with anyone. Later BCCI will Issue NonFungible tokens on this base type.
+ * Ipl base type will be of type EvolvableToken. Keep in mind that the maintainer of the EvolvableTokenType is of type Party and not of type AnonymousParty
+ */
+@StartableByRPC
+@InitiatingFlow
+public class CreateT20CricketTicketTokenFlow extends FlowLogic {
+
+ private final String ticketTeam;
+
+ public CreateT20CricketTicketTokenFlow(String ticketTeam) {
+ this.ticketTeam = ticketTeam;
+ }
+
+ @Override
+ @Suspendable
+ public String call() throws FlowException {
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
+ //create token type by passing in the name of the ipl match. specify the maintainer as BCCI
+ UniqueIdentifier id = new UniqueIdentifier();
+ T20CricketTicket t20CricketTicket = new T20CricketTicket(id, ticketTeam, getOurIdentity());
+
+ //warp it with transaction state specifying the notary
+ TransactionState transactionState = new TransactionState(t20CricketTicket, notary);
+
+ //call built in sub flow CreateEvolvableTokens to craete the base type on BCCI node
+ SignedTransaction stx = subFlow(new CreateEvolvableTokens(transactionState));
+
+ return "Ticket for "+ticketTeam+" has been created. With Ticket ID: "+ id.toString()+"" +
+ "\ntxId: "+stx.getId()+"";
+ }
+}
diff --git a/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/DVPAccountsHostedOnDifferentNodes.java b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/DVPAccountsHostedOnDifferentNodes.java
new file mode 100644
index 00000000..39243ab4
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/DVPAccountsHostedOnDifferentNodes.java
@@ -0,0 +1,281 @@
+package com.t20worldcup.flows;
+
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.r3.corda.lib.tokens.contracts.states.NonFungibleToken;
+import com.r3.corda.lib.tokens.workflows.utilities.QueryUtilitiesKt;
+import com.t20worldcup.states.T20CricketTicket;
+import com.r3.corda.lib.accounts.contracts.states.AccountInfo;
+import com.r3.corda.lib.accounts.workflows.UtilitiesKt;
+import com.r3.corda.lib.accounts.workflows.flows.RequestKeyForAccount;
+import com.r3.corda.lib.ci.workflows.SyncKeyMappingFlow;
+import com.r3.corda.lib.ci.workflows.SyncKeyMappingFlowHandler;
+import com.r3.corda.lib.tokens.contracts.states.FungibleToken;
+import com.r3.corda.lib.tokens.contracts.types.TokenPointer;
+import com.r3.corda.lib.tokens.contracts.types.TokenType;
+import com.r3.corda.lib.tokens.money.FiatCurrency;
+import com.r3.corda.lib.tokens.selection.TokenQueryBy;
+import com.r3.corda.lib.tokens.selection.database.config.DatabaseSelectionConfigKt;
+import com.r3.corda.lib.tokens.selection.database.selector.DatabaseTokenSelection;
+import com.r3.corda.lib.tokens.workflows.flows.move.MoveTokensUtilitiesKt;
+import kotlin.Pair;
+import net.corda.core.contracts.*;
+import net.corda.core.flows.*;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.AnonymousParty;
+import net.corda.core.identity.Party;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import org.jetbrains.annotations.NotNull;
+
+import java.security.PublicKey;
+import java.util.*;
+
+
+/**
+ * This flow shows you how to perform a dvp between accounts hosted on different nodes. Buyer account is on one host and Seller account is on other node.
+ * Majority of the code which deals with building the transaction for dvp is similar to DVPAccountsOnSameNode.java.
+ * Few more things to keep in mind - when accounts hosted on different nodes want to transact with each other you need to make sure to
+ * share the keys which account on one node must created and used. This is done as the other node/account is not aware which key was used to sign
+ * a shared transaction. To verify this, Node1 needs to share the keys. This can be done by calling SyncKeyMappingFlow. This flow will have to be called from
+ * both the sides. Once we sync accounts and keys and built the transaction, we can then call CollectSignaturesFlow.
+ * Look at how I am passing the 4 th parameter to CollectSignaturesFlow which tells the counterparty which all keys were used by the initiator for signing,
+ * so the counterparty will use remaining keys to sign the transaction. There is one more tricky bit tto this. When we call MoveTokensUtilitiesKt.addMoveTokens,
+ * internally a new Anonymous key is created and assigned to the current holder. So internally as well token sdk uses Confidential Identity. We will have to
+ * explicitly sync this key as well, as the counterparty is not aware of this key.
+ */
+@StartableByRPC
+@InitiatingFlow
+public class DVPAccountsHostedOnDifferentNodes extends FlowLogic {
+
+ private final String tokenId;
+ private final String buyerAccountName;
+ private final String sellerAccountName;
+ private final String currency;
+ private final Long costOfTicket;
+
+ public DVPAccountsHostedOnDifferentNodes(String tokenId, String buyerAccountName, String sellerAccountName, Long costOfTicket, String currency) {
+ this.tokenId = tokenId;
+ this.buyerAccountName = buyerAccountName;
+ this.sellerAccountName = sellerAccountName;
+ this.costOfTicket = costOfTicket;
+ this.currency = currency;
+ }
+
+
+ //This flow will be initiated by the buyer who wishes to buy the ticket from an account hosted on different node.
+ //The buyer will call the generate move token , generate the cash token transfer states and send it to selelr.
+ @Override
+ @Suspendable
+ public String call() throws FlowException {
+
+ //Get buyers and sellers account infos
+ AccountInfo buyerAccountInfo = UtilitiesKt.getAccountService(this).accountInfo(buyerAccountName).get(0).getState().getData();
+ AccountInfo sellerAccountInfo = UtilitiesKt.getAccountService(this).accountInfo(sellerAccountName).get(0).getState().getData();
+
+ //Generate new keys for buyers and sellers
+ //make sure to sync these keys with the counterparty by calling SyncKeyMappingFlow as below
+ AnonymousParty buyerAccount = subFlow(new RequestKeyForAccount(buyerAccountInfo));//mappng saved locally
+ AnonymousParty sellerAccount = subFlow(new RequestKeyForAccount(sellerAccountInfo));//mappiing requested from counterparty. does the counterparty save i dont think so
+
+
+ //Part1 : Move non fungible token - ticket from seller to buyer
+ //establish session with seller
+ FlowSession sellerSession = initiateFlow(sellerAccountInfo.getHost());
+
+ //send uuid, buyer,seller account name to seller
+ sellerSession.send(tokenId);
+ sellerSession.send(buyerAccountName);
+ sellerSession.send(sellerAccountName);
+
+ //buyer will create generate a move tokens state and send this state with new holder(seller) to seller
+ Amount amount = new Amount(costOfTicket, FiatCurrency.Companion.getInstance(currency));
+
+ //Buyer Query for token balance.
+ QueryCriteria queryCriteria = QueryUtilitiesKt.heldTokenAmountCriteria(this.getInstance(currency), buyerAccount).and(QueryUtilitiesKt.sumTokenCriteria());
+ List sum = getServiceHub().getVaultService().queryBy(FungibleToken.class, queryCriteria).component5();
+ if(sum.size() == 0)
+ throw new FlowException(buyerAccountName + " has 0 token balance. Please ask the Bank to issue some cash.");
+ else {
+ Long tokenBalance = (Long) sum.get(0);
+ if(tokenBalance < costOfTicket)
+ throw new FlowException("Available token balance of " + buyerAccountName+ " is less than the cost of the ticket. Please ask the Bank to issue some cash if you wish to buy the ticket ");
+ }
+
+ //the tokens to move to new account which is the seller account
+ Pair> partyAndAmount = new Pair(sellerAccount, amount);
+
+ //let's use the DatabaseTokenSelection to get the tokens from the db
+ DatabaseTokenSelection tokenSelection = new DatabaseTokenSelection(
+ getServiceHub(),
+ DatabaseSelectionConfigKt.MAX_RETRIES_DEFAULT,
+ DatabaseSelectionConfigKt.RETRY_SLEEP_DEFAULT,
+ DatabaseSelectionConfigKt.RETRY_CAP_DEFAULT,
+ DatabaseSelectionConfigKt.PAGE_SIZE_DEFAULT
+ );
+
+ //call generateMove which gives us 2 stateandrefs with tokens having new owner as seller.
+ Pair>, List> inputsAndOutputs =
+ tokenSelection.generateMove(Arrays.asList(partyAndAmount), buyerAccount, new TokenQueryBy(), getRunId().getUuid());
+
+ //send the generated inputsAndOutputs to the seller
+ subFlow(new SendStateAndRefFlow(sellerSession, inputsAndOutputs.getFirst()));
+ sellerSession.send(inputsAndOutputs.getSecond());
+
+ //sync following keys with seller - buyeraccounts, selleraccounts which we generated above using RequestKeyForAccount, and IMP: also share the anonymouse keys
+ //created by the above token move method for the holder.
+ List signers = new ArrayList<>();
+ signers.add(buyerAccount);
+ signers.add(sellerAccount);
+
+ List> inputs = inputsAndOutputs.getFirst();
+ for(StateAndRef tokenStateAndRef : inputs) {
+ signers.add(tokenStateAndRef.getState().getData().getHolder());
+ }
+
+ //Sync our associated keys with the conterparties.
+ subFlow(new SyncKeyMappingFlow(sellerSession, signers));
+
+ //this is the handler for synckeymapping called by seller. seller must also have created some keys not known to us - buyer
+ subFlow(new SyncKeyMappingFlowHandler(sellerSession));
+
+ //recieve the data from counter session in tx formatt.
+ subFlow(new SignTransactionFlow(sellerSession) {
+ @Override
+ protected void checkTransaction(@NotNull SignedTransaction stx) throws FlowException {
+ // Custom Logic to validate transaction.
+ }
+ });
+ SignedTransaction stx = subFlow(new ReceiveFinalityFlow(sellerSession));
+ return ("The ticket is sold to "+buyerAccountName+""+ "\ntxID: " + stx.getId().toString());
+ }
+
+ public TokenType getInstance(String currencyCode) {
+ Currency currency = Currency.getInstance(currencyCode);
+ return new TokenType(currency.getCurrencyCode(), 0);
+ }
+}
+
+
+
+//seller will get the token cash transfer state from buyer. seller will generate the non fungible transfer - ticket transfer state. Seller will add these two
+//inouts and outputs to a transaction and perform dvp.
+@InitiatedBy(DVPAccountsHostedOnDifferentNodes.class)
+class DVPAccountsHostedOnDifferentNodesResponder extends FlowLogic {
+
+ private final FlowSession otherSide;
+
+ public DVPAccountsHostedOnDifferentNodesResponder(FlowSession otherSide) {
+ this.otherSide = otherSide;
+ }
+
+ @Override
+ @Suspendable
+ public Void call() throws FlowException {
+
+ //get all the details from the seller
+ String tokenId = otherSide.receive(String.class).unwrap(t->t);
+ String buyerAccountName = otherSide.receive(String.class).unwrap(t->t);
+ String sellerAccountName = otherSide.receive(String.class).unwrap(t->t);
+
+ List> inputs = subFlow(new ReceiveStateAndRefFlow<>(otherSide));
+ List moneyReceived = otherSide.receive(List.class).unwrap(value -> value);
+
+ //call SyncKeyMappingHandler for SyncKey Mapping called at buyers side
+ subFlow(new SyncKeyMappingFlowHandler(otherSide));
+
+ //Get buyers and sellers account infos
+ AccountInfo buyerAccountInfo = UtilitiesKt.getAccountService(this).accountInfo(buyerAccountName).get(0).getState().getData();
+ AccountInfo sellerAccountInfo = UtilitiesKt.getAccountService(this).accountInfo(sellerAccountName).get(0).getState().getData();
+
+ //Generate new keys for buyers and sellers
+ AnonymousParty buyerAccount = subFlow(new RequestKeyForAccount(buyerAccountInfo));
+ AnonymousParty sellerAccount = subFlow(new RequestKeyForAccount(sellerAccountInfo));
+
+ //query for all tickets
+ QueryCriteria queryCriteriaForSellerTicketType = new QueryCriteria.VaultQueryCriteria()
+ .withExternalIds(Arrays.asList(sellerAccountInfo.getIdentifier().getId()))
+ .withStatus(Vault.StateStatus.UNCONSUMED);
+ List> allNonfungibleTokens = getServiceHub().getVaultService()
+ .queryBy(NonFungibleToken.class, queryCriteriaForSellerTicketType).getStates();
+
+ //Retrieve the one that he wants to sell
+ StateAndRef matchedNonFungibleToken;
+ if(allNonfungibleTokens.stream()
+ .filter(i-> i.getState().getData().getTokenType().getTokenIdentifier().equals(tokenId))
+ .findAny().isPresent()) {
+ matchedNonFungibleToken = allNonfungibleTokens.stream()
+ .filter(i-> i.getState().getData().getTokenType().getTokenIdentifier().equals(tokenId))
+ .findAny().get();
+ }
+ else
+ throw new FlowException(sellerAccountName + "does not own ticket with token id - " + tokenId);
+
+ String ticketId = matchedNonFungibleToken.getState().getData().getTokenType().getTokenIdentifier();
+
+ //Query for the ticket Buyer wants to sell.
+ QueryCriteria queryCriteria = new QueryCriteria.LinearStateQueryCriteria(null, Arrays.asList(UUID.fromString(ticketId)), null,
+ Vault.StateStatus.UNCONSUMED, null);
+
+ //grab the t20worldcup off the ledger
+ StateAndRef stateAndRef = getServiceHub().getVaultService().
+ queryBy(T20CricketTicket.class, queryCriteria).getStates().get(0);
+
+ T20CricketTicket evolvableTokenType = stateAndRef.getState().getData();
+
+ //get the pointer pointer to the T20CricketTicket
+ TokenPointer tokenPointer = evolvableTokenType.toPointer(evolvableTokenType.getClass());
+
+ // Obtain a reference to a notary we wish to use.
+ Party notary = stateAndRef.getState().getNotary();
+
+ TransactionBuilder transactionBuilder = new TransactionBuilder(notary);
+
+ //part1 of DVP is to transfer the non fungible token from seller to buyer
+ MoveTokensUtilitiesKt.addMoveNonFungibleTokens(transactionBuilder, getServiceHub(), tokenPointer, buyerAccount);
+
+ //part2 of DVP is to transfer cash - fungible token from buyer to seller and return the change to buyer
+ MoveTokensUtilitiesKt.addMoveTokens(transactionBuilder, inputs, moneyReceived);
+
+ //sync keys with buyer, again sync for similar members
+
+ List signers = new ArrayList<>();
+ signers.add(buyerAccount);
+ signers.add(sellerAccount);
+
+ for(StateAndRef tokenStateAndRef : inputs) {
+ signers.add(tokenStateAndRef.getState().getData().getHolder());
+ }
+
+ subFlow(new SyncKeyMappingFlow(otherSide, signers));
+
+ //call filterMyKeys to get the my signers for seller node and pass in as a 4th parameter to CollectSignaturesFlow.
+ //by doing this we tell CollectSignaturesFlow that these are the signers which have already signed the transaction
+ List> commandWithPartiesList = transactionBuilder.toLedgerTransaction(getServiceHub()).getCommands();
+
+ List mySigners = new ArrayList();
+
+ for(CommandWithParties commandDataCommandWithParties : commandWithPartiesList) {
+ if(((ArrayList)(getServiceHub().getKeyManagementService().filterMyKeys(commandDataCommandWithParties.getSigners()))).size() > 0) {
+ mySigners.add(((ArrayList)getServiceHub().getKeyManagementService().filterMyKeys(commandDataCommandWithParties.getSigners())).get(0));
+ }
+ }
+
+ //sign the transaction with the signers we got by calling filterMyKeys
+ SignedTransaction selfSignedTransaction = getServiceHub().signInitialTransaction(transactionBuilder, mySigners);
+
+ final SignedTransaction fullySignedTx = subFlow(new CollectSignaturesFlow(
+ selfSignedTransaction,
+ Collections.singletonList(otherSide),
+ mySigners));
+
+ //call FinalityFlow for finality
+ subFlow(new FinalityFlow(fullySignedTx, Arrays.asList(otherSide)));
+
+ return null;
+ }
+}
+
+
diff --git a/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/DVPAccountsOnSameNode.java b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/DVPAccountsOnSameNode.java
new file mode 100644
index 00000000..e71721e7
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/DVPAccountsOnSameNode.java
@@ -0,0 +1,195 @@
+package com.t20worldcup.flows;
+
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.r3.corda.lib.tokens.contracts.states.FungibleToken;
+import com.r3.corda.lib.tokens.contracts.states.NonFungibleToken;
+import com.r3.corda.lib.tokens.contracts.types.TokenType;
+import com.r3.corda.lib.tokens.workflows.utilities.QueryUtilitiesKt;
+import com.t20worldcup.states.T20CricketTicket;
+import com.r3.corda.lib.accounts.contracts.states.AccountInfo;
+import com.r3.corda.lib.accounts.workflows.UtilitiesKt;
+import com.r3.corda.lib.accounts.workflows.flows.RequestKeyForAccount;
+import com.r3.corda.lib.tokens.contracts.types.TokenPointer;
+import com.r3.corda.lib.tokens.money.FiatCurrency;
+import com.r3.corda.lib.tokens.workflows.flows.move.MoveTokensUtilitiesKt;
+import com.r3.corda.lib.tokens.workflows.internal.flows.finality.ObserverAwareFinalityFlow;
+import com.r3.corda.lib.tokens.workflows.types.PartyAndAmount;
+import net.corda.core.contracts.Amount;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.flows.*;
+import net.corda.core.identity.AnonymousParty;
+import net.corda.core.identity.Party;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Currency;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * This is the DVP flow, where the buyer account buys the ticket token from the dealer account and in turn transfers him cash worth of the ticket.
+ * Once buyer1 buys the token from the dealer, he can further sell this ticket to other buyers.
+ * Note : this flow handles dvp from account to account on same node. This flow later will be modified if a buyer on dealer1 node wants to buy ticket from
+ * dealer2 node.
+ */
+@StartableByRPC
+@InitiatingFlow
+public class DVPAccountsOnSameNode extends FlowLogic {
+
+ private final String tokenId;
+ private final String buyerAccountName;
+ private final String sellerAccountName;
+ private final String currency;
+ private final Long costOfTicket;
+
+ public DVPAccountsOnSameNode(String tokenId, String buyerAccountName, String sellerAccountName, Long costOfTicket, String currency) {
+ this.tokenId = tokenId;
+ this.buyerAccountName = buyerAccountName;
+ this.sellerAccountName = sellerAccountName;
+ this.costOfTicket = costOfTicket;
+ this.currency = currency;
+ }
+
+ @Override
+ @Suspendable
+ public String call() throws FlowException {
+
+ //Get buyers and sellers account infos
+ AccountInfo buyerAccountInfo = UtilitiesKt.getAccountService(this).accountInfo(buyerAccountName).get(0).getState().getData();
+ AccountInfo sellerAccountInfo = UtilitiesKt.getAccountService(this).accountInfo(sellerAccountName).get(0).getState().getData();
+
+ //Generate new keys for buyers and sellers
+ AnonymousParty buyerAccount = subFlow(new RequestKeyForAccount(buyerAccountInfo));
+ AnonymousParty sellerAccount = subFlow(new RequestKeyForAccount(sellerAccountInfo));
+
+
+ //Part1 : Move non fungible token - ticket from seller to buyer
+ ///All of the Tickets Seller has
+ QueryCriteria queryCriteriaForSellerTicketType = new QueryCriteria.VaultQueryCriteria()
+ .withExternalIds(Arrays.asList(sellerAccountInfo.getIdentifier().getId()))
+ .withStatus(Vault.StateStatus.UNCONSUMED);
+ List> allNonfungibleTokens = getServiceHub().getVaultService()
+ .queryBy(NonFungibleToken.class, queryCriteriaForSellerTicketType).getStates();
+
+ //Retrieve the one that he wants to sell
+ StateAndRef matchedNonFungibleToken;
+
+ if(allNonfungibleTokens.stream()
+ .filter(i-> i.getState().getData().getTokenType().getTokenIdentifier().equals(tokenId))
+ .findAny().isPresent()) {
+ matchedNonFungibleToken = allNonfungibleTokens.stream()
+ .filter(i-> i.getState().getData().getTokenType().getTokenIdentifier().equals(tokenId))
+ .findAny().get();
+ }
+ else
+ throw new FlowException(sellerAccountName + "does not own ticket with token id - " + tokenId);
+
+ String ticketId = matchedNonFungibleToken.getState().getData().getTokenType().getTokenIdentifier();
+
+ //construct the query criteria and get the base token type
+ QueryCriteria queryCriteria = new QueryCriteria.LinearStateQueryCriteria().withUuid(Arrays.asList(UUID.fromString(ticketId))).
+ withStatus(Vault.StateStatus.UNCONSUMED);
+
+ // grab the ticket off the ledger
+ StateAndRef stateAndRef = getServiceHub().getVaultService().
+ queryBy(T20CricketTicket.class, queryCriteria).getStates().get(0);
+
+ T20CricketTicket evolvableTokenType = stateAndRef.getState().getData();
+
+ //get the pointer pointer to the T20CricketTicket
+ TokenPointer tokenPointer = evolvableTokenType.toPointer(evolvableTokenType.getClass());
+
+ // Obtain a reference to a notary we wish to use.
+ Party notary = stateAndRef.getState().getNotary();
+
+ //create a transactionBuilder
+ TransactionBuilder transactionBuilder = new TransactionBuilder(notary);
+
+ //first part of DVP is to transfer the non fungible token from seller to buyer
+ //this add inputs and outputs to transactionBuilder
+ MoveTokensUtilitiesKt.addMoveNonFungibleTokens(transactionBuilder, getServiceHub(), tokenPointer, buyerAccount);
+
+ //Part2 : Move fungible token - cash from buyer to seller
+
+ QueryCriteria queryCriteriaForTokenBalance = QueryUtilitiesKt.heldTokenAmountCriteria(this.getInstance(currency), buyerAccount).and(QueryUtilitiesKt.sumTokenCriteria());
+
+ List sum = getServiceHub().getVaultService().
+ queryBy(FungibleToken.class, queryCriteriaForTokenBalance).component5();
+
+ if(sum.size() == 0)
+ throw new FlowException(buyerAccountName + "has 0 token balance. Please ask the Bank to issue some cash.");
+ else {
+ Long tokenBalance = (Long) sum.get(0);
+ if(tokenBalance < costOfTicket)
+ throw new FlowException("Available token balance of " + buyerAccountName+ " is less than the cost of the ticket. Please ask the Bank to issue some cash if you wish to buy the ticket ");
+ }
+
+ Amount amount = new Amount(costOfTicket, FiatCurrency.Companion.getInstance(currency));
+
+ //move money to sellerAccountInfo account.
+ PartyAndAmount partyAndAmount = new PartyAndAmount(sellerAccount, amount);
+
+ //construct the query criteria and get all available unconsumed fungible tokens which belong to buyers account
+ QueryCriteria criteria = new QueryCriteria.VaultQueryCriteria().withStatus(Vault.StateStatus.UNCONSUMED).
+ withExternalIds(Arrays.asList(buyerAccountInfo.getIdentifier().getId()));
+
+ //call utility function to move the fungible token from buyer to seller account
+ //this also adds inputs and outputs to the transactionBuilder
+ //till now we have only 1 transaction with 2 inputs and 2 outputs - one moving fungible tokens other moving non fungible tokens between accounts
+ MoveTokensUtilitiesKt.addMoveFungibleTokens(transactionBuilder, getServiceHub(), Arrays.asList(partyAndAmount), buyerAccount, criteria);
+
+ //self sign the transaction. note : the host party will first self sign the transaction.
+ SignedTransaction selfSignedTransaction = getServiceHub().signInitialTransaction(transactionBuilder,
+ Arrays.asList(getOurIdentity().getOwningKey()));
+
+ //establish sessions with buyer and seller. to establish session get the host name from accountinfo object
+ FlowSession customerSession = initiateFlow(buyerAccountInfo.getHost());
+
+ FlowSession dealerSession = initiateFlow(sellerAccountInfo.getHost());
+
+ //Note: though buyer and seller are on the same node still we will have to call CollectSignaturesFlow as the signer is not a Party but an account.
+ SignedTransaction fullySignedTx = subFlow(new CollectSignaturesFlow(selfSignedTransaction,
+ Arrays.asList(customerSession, dealerSession)));
+
+ //call ObserverAwareFinalityFlow for finality
+ SignedTransaction stx = subFlow(new ObserverAwareFinalityFlow(fullySignedTx, Arrays.asList(customerSession, dealerSession)));
+
+ return ("The ticket is sold to "+buyerAccountName+""+ "\ntxID: " + stx.getId().toString());
+ }
+
+ public TokenType getInstance(String currencyCode) {
+ Currency currency = Currency.getInstance(currencyCode);
+ return new TokenType(currency.getCurrencyCode(), 0);
+ }
+}
+
+@InitiatedBy(DVPAccountsOnSameNode.class)
+class DVPAccountsOnSameNodeResponder extends FlowLogic {
+
+ private final FlowSession otherSide;
+
+ public DVPAccountsOnSameNodeResponder(FlowSession otherSide) {
+ this.otherSide = otherSide;
+ }
+
+ @Override
+ @Suspendable
+ public Void call() throws FlowException {
+
+ subFlow(new SignTransactionFlow(otherSide) {
+ @Override
+ protected void checkTransaction(@NotNull SignedTransaction stx) throws FlowException {
+ // Custom Logic to validate transaction.
+ }
+ });
+
+ subFlow(new ReceiveFinalityFlow(otherSide));
+
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/GetAllAccounts.java b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/GetAllAccounts.java
new file mode 100644
index 00000000..6df38a8e
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/GetAllAccounts.java
@@ -0,0 +1,37 @@
+package com.t20worldcup.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.r3.corda.lib.accounts.contracts.states.AccountInfo;
+import com.r3.corda.lib.accounts.workflows.UtilitiesKt;
+import com.r3.corda.lib.accounts.workflows.services.AccountService;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.flows.FlowException;
+import net.corda.core.flows.FlowLogic;
+import net.corda.core.flows.InitiatingFlow;
+import net.corda.core.flows.StartableByRPC;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@InitiatingFlow
+@StartableByRPC
+public class GetAllAccounts extends FlowLogic> {
+
+ @Override
+ @Suspendable
+ public List call() throws FlowException {
+ AccountService accountService = UtilitiesKt.getAccountService(this);
+
+ List> stateAndRefList = accountService.allAccounts();
+
+ List accountInfoList = new ArrayList<>();
+
+
+ for(StateAndRef stateAndRef : stateAndRefList) {
+ accountInfoList.add(stateAndRef.getState().getData());
+ }
+
+ return accountInfoList;
+
+ }
+}
diff --git a/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/IssueCashFlow.java b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/IssueCashFlow.java
new file mode 100644
index 00000000..1815ca6e
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/IssueCashFlow.java
@@ -0,0 +1,71 @@
+package com.t20worldcup.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.r3.corda.lib.accounts.contracts.states.AccountInfo;
+import com.r3.corda.lib.accounts.workflows.UtilitiesKt;
+import com.r3.corda.lib.accounts.workflows.flows.RequestKeyForAccount;
+import com.r3.corda.lib.tokens.contracts.states.FungibleToken;
+import com.r3.corda.lib.tokens.contracts.types.IssuedTokenType;
+import com.r3.corda.lib.tokens.contracts.types.TokenType;
+import com.r3.corda.lib.tokens.workflows.flows.rpc.IssueTokens;
+import net.corda.core.contracts.Amount;
+import net.corda.core.flows.*;
+import net.corda.core.identity.AnonymousParty;
+import net.corda.core.transactions.SignedTransaction;
+
+import java.util.Arrays;
+import java.util.Currency;
+
+/**
+ * This should be run by the bank node. The Bank node issues Cash (Fungible Tokens) to the buyers who want to buy he Ipl ticket.
+ */
+
+@StartableByRPC
+@InitiatingFlow
+public class IssueCashFlow extends FlowLogic {
+
+ private final String accountName;
+ private final String currency;
+ private final Long amount;
+
+ public IssueCashFlow(String accountName, String currency, Long amount) {
+ this.accountName = accountName;
+ this.currency = currency;
+ this.amount = amount;
+ }
+
+ @Override
+ @Suspendable
+ public String call() throws FlowException {
+
+ //Dealer node has already shared accountinfo with the bank when we ran the CreateAndShareAccountFlow. So this bank node will
+ //have access to AccountInfo of the buyer. Retrieve it using the AccountService. AccountService has certain helper methods, take a look at them.
+ AccountInfo accountInfo = UtilitiesKt.getAccountService(this).accountInfo(accountName).get(0).getState().getData();
+
+ //To transact with any account, we have to request for a Key from the node hosting the account. For this we use RequestKeyForAccount inbuilt flow.
+ //This will return a Public key wrapped in an AnonymousParty class.
+ AnonymousParty anonymousParty = subFlow(new RequestKeyForAccount(accountInfo));
+
+ //Get the base token type for issuing fungible tokens
+ TokenType token = getInstance(currency);
+
+ //issuer will be the bank. Keep in mind the issuer will always be an known legal Party class and not an AnonymousParty. This is by design
+ IssuedTokenType issuedTokenType = new IssuedTokenType(getOurIdentity(), token);
+
+ //Create a fungible token for issuing cash to account
+ FungibleToken fungibleToken = new FungibleToken(new Amount(this.amount, issuedTokenType), anonymousParty, null);
+
+ //Issue fungible tokens to specified account
+ SignedTransaction stx =subFlow(new IssueTokens(Arrays.asList(fungibleToken)));
+
+ return "Issued "+amount+" "+currency+" token(s) to "+accountName+"" +
+ "\ntxId: "+stx.getId().toString()+"";
+ }
+
+ public TokenType getInstance(String currencyCode) {
+ Currency currency = Currency.getInstance(currencyCode);
+ return new TokenType(currency.getCurrencyCode(), 0);
+ }
+}
+
+
diff --git a/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/IssueNonFungibleTicketFlow.java b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/IssueNonFungibleTicketFlow.java
new file mode 100644
index 00000000..a361f276
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/IssueNonFungibleTicketFlow.java
@@ -0,0 +1,84 @@
+package com.t20worldcup.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.t20worldcup.states.T20CricketTicket;
+import com.r3.corda.lib.accounts.contracts.states.AccountInfo;
+import com.r3.corda.lib.accounts.workflows.UtilitiesKt;
+import com.r3.corda.lib.accounts.workflows.flows.RequestKeyForAccount;
+import com.r3.corda.lib.tokens.contracts.states.NonFungibleToken;
+import com.r3.corda.lib.tokens.contracts.types.IssuedTokenType;
+import com.r3.corda.lib.tokens.contracts.types.TokenPointer;
+import com.r3.corda.lib.tokens.contracts.utilities.TransactionUtilitiesKt;
+import com.r3.corda.lib.tokens.workflows.flows.rpc.IssueTokens;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.FlowException;
+import net.corda.core.flows.FlowLogic;
+import net.corda.core.flows.InitiatingFlow;
+import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.AnonymousParty;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+
+import java.util.Arrays;
+import java.util.UUID;
+
+/**
+ * This will be run by the BCCI node and it will issue a nonfungible token represnting each ticket to the dealer account.
+ * Buyers can then buy tickets from the dealer account.
+ */
+@StartableByRPC
+@InitiatingFlow
+public class IssueNonFungibleTicketFlow extends FlowLogic {
+
+ private final String tokenId;
+ //private final int quantity;//TODO handle quantity later
+ private final String dealerAccountName;
+
+ public IssueNonFungibleTicketFlow(String tokenId, String dealerAccountName) {
+ this.tokenId = tokenId;
+ // this.quantity = quantity;
+ this.dealerAccountName = dealerAccountName;
+ }
+
+
+ @Override
+ @Suspendable
+ public String call() throws FlowException {
+
+ //Since dealer has already shared the dealer account with BCCI, BCCI will retrieve this accountinfo from the vault.
+ AccountInfo dealerAccountInfo = UtilitiesKt.getAccountService(this).accountInfo(dealerAccountName).get(0).getState().getData();
+
+ //Generate the key pair for dealer account so taht BCCI node will be able to transact with issue a token to the dealer account.
+ AnonymousParty dealerAccount = subFlow(new RequestKeyForAccount(dealerAccountInfo));
+
+ UUID uuid = UUID.fromString(tokenId);
+
+ //construct the query criteria and get the base token type
+ QueryCriteria queryCriteria = new QueryCriteria.LinearStateQueryCriteria(null, Arrays.asList(uuid), null,
+ Vault.StateStatus.UNCONSUMED, null);
+
+ //grab the created ticket type off the ledger
+ StateAndRef stateAndRef = getServiceHub().getVaultService().
+ queryBy(T20CricketTicket.class, queryCriteria).getStates().get(0);
+
+
+ T20CricketTicket evolvableTokenType = stateAndRef.getState().getData();
+
+ //get the pointer pointer to the T20CricketTicket
+ TokenPointer tokenPointer = evolvableTokenType.toPointer(evolvableTokenType.getClass());
+
+ //assign the issuer to the T20CricketTicket type who is the BCCI node
+ IssuedTokenType issuedTokenType = new IssuedTokenType(getOurIdentity(), tokenPointer);
+
+ //mention the current holder which is now going to be the dealer account
+ NonFungibleToken nonFungibleToken = new NonFungibleToken(issuedTokenType, dealerAccount, new UniqueIdentifier(),
+ TransactionUtilitiesKt.getAttachmentIdForGenericParam(tokenPointer));
+
+ //call built in flow to issue non fungible tokens
+ SignedTransaction stx = subFlow(new IssueTokens(Arrays.asList(nonFungibleToken)));
+ return "Issued the ticket of "+evolvableTokenType.getTicketTeam()+" to "+dealerAccountName+"" +
+ "\ntxId: "+stx.getId().toString()+"";
+ }
+}
diff --git a/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/MoveTokensBetweenAccounts.java b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/MoveTokensBetweenAccounts.java
new file mode 100644
index 00000000..c2f0ffb2
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/MoveTokensBetweenAccounts.java
@@ -0,0 +1,143 @@
+package com.t20worldcup.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.r3.corda.lib.accounts.contracts.states.AccountInfo;
+import com.r3.corda.lib.accounts.workflows.UtilitiesKt;
+import com.r3.corda.lib.accounts.workflows.flows.RequestKeyForAccount;
+import com.r3.corda.lib.tokens.contracts.states.FungibleToken;
+import com.r3.corda.lib.tokens.contracts.types.TokenType;
+import com.r3.corda.lib.tokens.selection.TokenQueryBy;
+import com.r3.corda.lib.tokens.selection.database.config.DatabaseSelectionConfigKt;
+import com.r3.corda.lib.tokens.selection.database.selector.DatabaseTokenSelection;
+import com.r3.corda.lib.tokens.workflows.flows.move.MoveTokensUtilitiesKt;
+import com.r3.corda.lib.tokens.workflows.utilities.QueryUtilitiesKt;
+import kotlin.Pair;
+import net.corda.core.contracts.Amount;
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.CommandWithParties;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.flows.*;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.AnonymousParty;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+
+import java.security.PublicKey;
+import java.util.*;
+
+/**
+ * This flow only talks about moving fungible tokens from one account to other.
+ */
+@StartableByRPC
+@InitiatingFlow
+public class MoveTokensBetweenAccounts extends FlowLogic {
+
+ private final String buyerAccountName;
+ private final String sellerAccountName;
+ private final String currency;
+ private final Long costOfTicket;
+
+ public MoveTokensBetweenAccounts(String buyerAccountName, String sellerAccountName, String currency, Long costOfTicket) {
+ this.buyerAccountName = buyerAccountName;
+ this.sellerAccountName = sellerAccountName;
+ this.currency = currency;
+ this.costOfTicket = costOfTicket;
+ }
+
+ @Override
+ @Suspendable
+ public String call() throws FlowException {
+
+ //Get buyers and sellers account infos
+ AccountInfo buyerAccountInfo = UtilitiesKt.getAccountService(this).accountInfo(buyerAccountName).get(0).getState().getData();
+ AccountInfo sellerAccountInfo = UtilitiesKt.getAccountService(this).accountInfo(sellerAccountName).get(0).getState().getData();
+
+ //Generate new keys for buyers and sellers
+ AnonymousParty buyerAccount = subFlow(new RequestKeyForAccount(buyerAccountInfo));//mappng saved locally
+ AnonymousParty sellerAccount = subFlow(new RequestKeyForAccount(sellerAccountInfo));//mappiing requested from counterparty. does the counterparty save i dont think so
+
+ //buyer will create generate a move tokens state and send this state with new holder(seller) to seller
+ Amount amount = new Amount(costOfTicket, getInstance(currency));
+
+ //Buyer Query for token balance.
+ QueryCriteria queryCriteria = QueryUtilitiesKt.heldTokenAmountCriteria(this.getInstance(currency), buyerAccount).and(QueryUtilitiesKt.sumTokenCriteria());
+ List sum = getServiceHub().getVaultService().queryBy(FungibleToken.class, queryCriteria).component5();
+ if(sum.size() == 0)
+ throw new FlowException(buyerAccountName + " has 0 token balance. Please ask the Bank to issue some cash.");
+ else {
+ Long tokenBalance = (Long) sum.get(0);
+ if(tokenBalance < costOfTicket)
+ throw new FlowException("Available token balance of " + buyerAccountName+ " is less than the cost of the ticket. Please ask the Bank to issue some cash if you wish to buy the ticket ");
+ }
+
+ //the tokens to move to new account which is the seller account
+ Pair> partyAndAmount = new Pair(sellerAccount, amount);
+
+ //let's use the DatabaseTokenSelection to get the tokens from the db
+ DatabaseTokenSelection tokenSelection = new DatabaseTokenSelection(
+ getServiceHub(),
+ DatabaseSelectionConfigKt.MAX_RETRIES_DEFAULT,
+ DatabaseSelectionConfigKt.RETRY_SLEEP_DEFAULT,
+ DatabaseSelectionConfigKt.RETRY_CAP_DEFAULT,
+ DatabaseSelectionConfigKt.PAGE_SIZE_DEFAULT
+ );
+
+ //call generateMove which gives us 2 stateandrefs with tokens having new owner as seller.
+ Pair>, List> inputsAndOutputs =
+ tokenSelection.generateMove(Arrays.asList(partyAndAmount), buyerAccount, new TokenQueryBy(), getRunId().getUuid());
+
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+ TransactionBuilder transactionBuilder = new TransactionBuilder(notary);
+
+ MoveTokensUtilitiesKt.addMoveTokens(transactionBuilder, inputsAndOutputs.getFirst(), inputsAndOutputs.getSecond());
+
+ Set mySigners = new HashSet<>();
+
+ List> commandWithPartiesList = transactionBuilder.toLedgerTransaction(getServiceHub()).getCommands();
+
+ for(CommandWithParties commandDataCommandWithParties : commandWithPartiesList) {
+ if(((ArrayList)(getServiceHub().getKeyManagementService().filterMyKeys(commandDataCommandWithParties.getSigners()))).size() > 0) {
+ mySigners.add(((ArrayList)getServiceHub().getKeyManagementService().filterMyKeys(commandDataCommandWithParties.getSigners())).get(0));
+ }
+ }
+
+ FlowSession sellerSession = initiateFlow(sellerAccountInfo.getHost());
+
+ //sign the transaction with the signers we got by calling filterMyKeys
+ SignedTransaction selfSignedTransaction = getServiceHub().signInitialTransaction(transactionBuilder, mySigners);
+
+ //call FinalityFlow for finality
+ subFlow(new FinalityFlow(selfSignedTransaction, Arrays.asList(sellerSession)));
+
+ return null;
+ }
+
+ public TokenType getInstance(String currencyCode) {
+ Currency currency = Currency.getInstance(currencyCode);
+ return new TokenType(currency.getCurrencyCode(), 0);
+ }
+}
+
+@InitiatedBy(MoveTokensBetweenAccounts.class)
+class MoveTokensBetweenAccountsResponder extends FlowLogic {
+
+ private final FlowSession otherSide;
+
+ public MoveTokensBetweenAccountsResponder(FlowSession otherSide) {
+ this.otherSide = otherSide;
+ }
+
+ @Override
+ @Suspendable
+ public Void call() throws FlowException {
+
+ subFlow(new ReceiveFinalityFlow(otherSide));
+
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/QuerybyAccount.java b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/QuerybyAccount.java
new file mode 100644
index 00000000..39ccee75
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/main/java/com/t20worldcup/flows/QuerybyAccount.java
@@ -0,0 +1,78 @@
+package com.t20worldcup.flows;
+import co.paralleluniverse.fibers.Suspendable;
+import com.r3.corda.lib.accounts.contracts.states.AccountInfo;
+import com.r3.corda.lib.accounts.workflows.UtilitiesKt;
+import com.r3.corda.lib.tokens.contracts.states.FungibleToken;
+import com.r3.corda.lib.tokens.contracts.states.NonFungibleToken;
+import com.r3.corda.lib.tokens.contracts.types.TokenPointer;
+import com.t20worldcup.states.T20CricketTicket;
+import net.corda.core.contracts.LinearPointer;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.flows.FlowException;
+import net.corda.core.flows.FlowLogic;
+import net.corda.core.flows.StartableByRPC;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+/**
+ * This will be run by the BCCI node and it will issue a nonfungible token represnting each ticket to the dealer account.
+ * Buyers can then buy tickets from the dealer account.
+ */
+@StartableByRPC
+public class QuerybyAccount extends FlowLogic {
+ private final String whoAmI;
+ public QuerybyAccount(String whoAmI) {
+ this.whoAmI = whoAmI;
+ }
+ @Override
+ @Suspendable
+ public String call() throws FlowException {
+ AccountInfo myAccount = UtilitiesKt.getAccountService(this).accountInfo(whoAmI).get(0).getState().getData();
+ UUID id = myAccount.getIdentifier().getId();
+ QueryCriteria.VaultQueryCriteria criteria = new QueryCriteria.VaultQueryCriteria().withExternalIds(Arrays.asList(id));
+
+ //Ticket
+ List> ticketList = getServiceHub().getVaultService().queryBy(NonFungibleToken.class,criteria).getStates();
+ List myTicketIDs = ticketList.stream().map( it ->it.getState().getData().getTokenType().getTokenIdentifier()).collect(Collectors.toList());
+ List tkList = myTicketIDs.stream().map( it -> {
+ UUID uuid = UUID.fromString(it);
+ QueryCriteria.LinearStateQueryCriteria queryCriteria =
+ new QueryCriteria.LinearStateQueryCriteria(null,Arrays.asList(uuid),null, Vault.StateStatus.UNCONSUMED);
+ StateAndRef stateAndRef = getServiceHub().getVaultService().queryBy(T20CricketTicket.class,queryCriteria).getStates().get(0);
+ String description = stateAndRef.getState().getData().getTicketTeam();
+ return description;
+ }).collect(Collectors.toList());
+
+ //Assets
+ List> asset = getServiceHub().getVaultService().queryBy(FungibleToken.class,criteria).getStates();
+ List myMoney = asset.stream().map(it -> {
+ String money = "";
+ money = money+it.getState().getData().getAmount().getQuantity() + " " + it.getState().getData().getTokenType().getTokenIdentifier();
+ return money;
+ }).collect(Collectors.toList());
+
+ String tickets = "\nI have ticket(s) for: ";
+ if(ticketList.size() == 0) {
+ tickets = "I do not own any ticket";
+ } else {
+ for(String item : tkList){
+ tickets = tickets + item;
+ }
+ }
+
+
+ String wallets = "\nI have money of: ";
+ if(myMoney.size() == 0) {
+ wallets = "I do not have any money";
+ } else {
+ for(String item: myMoney){
+ wallets = wallets + item;
+ }
+ }
+
+ return tickets + wallets;
+ }
+}
\ No newline at end of file
diff --git a/Accounts/worldcupticketbooking/workflows/src/test/java/com/t20worldcup/ContractTests.java b/Accounts/worldcupticketbooking/workflows/src/test/java/com/t20worldcup/ContractTests.java
new file mode 100644
index 00000000..90a8a2ff
--- /dev/null
+++ b/Accounts/worldcupticketbooking/workflows/src/test/java/com/t20worldcup/ContractTests.java
@@ -0,0 +1,13 @@
+package com.t20worldcup;
+
+import net.corda.testing.node.MockServices;
+import org.junit.Test;
+
+public class ContractTests {
+ private final MockServices ledgerServices = new MockServices();
+
+ @Test
+ public void dummyTest() {
+
+ }
+}
\ No newline at end of file
diff --git a/Advanced/auction-cordapp/build.gradle b/Advanced/auction-cordapp/build.gradle
index a78a991d..4d87e6dc 100644
--- a/Advanced/auction-cordapp/build.gradle
+++ b/Advanced/auction-cordapp/build.gradle
@@ -20,8 +20,9 @@ buildscript {
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda' }
+
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -37,9 +38,10 @@ allprojects {
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://jitpack.io' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
@@ -87,6 +89,9 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
diff --git a/Advanced/auction-cordapp/client/build.gradle b/Advanced/auction-cordapp/client/build.gradle
index e9184696..e94a0e39 100644
--- a/Advanced/auction-cordapp/client/build.gradle
+++ b/Advanced/auction-cordapp/client/build.gradle
@@ -1,5 +1,11 @@
apply plugin: 'org.springframework.boot'
+configurations {
+ all {
+ exclude group: 'ch.qos.logback', module: 'logback-classic'
+ }
+}
+
dependencies {
// Corda dependencies.
compile "$corda_release_group:corda-rpc:$corda_release_version"
diff --git a/Advanced/auction-cordapp/contracts/build.gradle b/Advanced/auction-cordapp/contracts/build.gradle
index 6d9813f8..d35b4df3 100644
--- a/Advanced/auction-cordapp/contracts/build.gradle
+++ b/Advanced/auction-cordapp/contracts/build.gradle
@@ -23,7 +23,7 @@ dependencies {
// Corda dependencies.
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
- compileOnly "$corda_release_group:corda-testserver-impl:$corda_release_version"
+
cordaRuntime "$corda_release_group:corda:$corda_release_version"
cordaRuntime "$corda_release_group:corda-testserver:$corda_release_version"
diff --git a/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/AuctionDvPFlow.java b/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/AuctionDvPFlow.java
index da3b9a06..e4321c63 100644
--- a/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/AuctionDvPFlow.java
+++ b/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/AuctionDvPFlow.java
@@ -79,13 +79,8 @@ public SignedTransaction call() throws FlowException {
.withNewOwner(auctionState.getWinner());
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = auctionStateAndRef.getState().getNotary();
// Create the transaction builder.
TransactionBuilder transactionBuilder = new TransactionBuilder(notary);
diff --git a/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/CreateAssetFlow.java b/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/CreateAssetFlow.java
index 2d66e502..dc95df45 100644
--- a/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/CreateAssetFlow.java
+++ b/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/CreateAssetFlow.java
@@ -8,6 +8,7 @@
import net.corda.core.transactions.TransactionBuilder;
import net.corda.samples.auction.contracts.AssetContract;
import net.corda.samples.auction.states.Asset;
+import net.corda.core.identity.CordaX500Name;
import java.util.Arrays;
import java.util.Collections;
@@ -42,13 +43,8 @@ public CreateAssetFlow(String title, String description, String imageURL) {
@Suspendable
public SignedTransaction call() throws FlowException {
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
// Create the output states
Asset output = new Asset(new UniqueIdentifier(), title, description, imageURL,
diff --git a/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/CreateAuctionFlow.java b/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/CreateAuctionFlow.java
index e78675c0..b9b1ccd8 100644
--- a/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/CreateAuctionFlow.java
+++ b/Advanced/auction-cordapp/workflows/src/main/java/net/corda/samples/auction/flows/CreateAuctionFlow.java
@@ -7,12 +7,14 @@
import net.corda.core.contracts.LinearState;
import net.corda.core.contracts.UniqueIdentifier;
import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.transactions.SignedTransaction;
import net.corda.core.transactions.TransactionBuilder;
import net.corda.core.utilities.ProgressTracker;
import net.corda.samples.auction.contracts.AuctionContract;
import net.corda.samples.auction.states.AuctionState;
+import net.corda.core.identity.CordaX500Name;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -56,13 +58,8 @@ public ProgressTracker getProgressTracker() {
@Override
public SignedTransaction call() throws FlowException {
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
Party auctioneer = getOurIdentity();
diff --git a/Advanced/auction-cordapp/workflows/src/test/java/net/corda/samples/auction/FlowTests.java b/Advanced/auction-cordapp/workflows/src/test/java/net/corda/samples/auction/FlowTests.java
index 50814f39..58b2a115 100644
--- a/Advanced/auction-cordapp/workflows/src/test/java/net/corda/samples/auction/FlowTests.java
+++ b/Advanced/auction-cordapp/workflows/src/test/java/net/corda/samples/auction/FlowTests.java
@@ -3,16 +3,14 @@
import com.google.common.collect.ImmutableList;
import net.corda.core.concurrent.CordaFuture;
import net.corda.core.contracts.Amount;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.node.NetworkParameters;
import net.corda.core.transactions.SignedTransaction;
import net.corda.samples.auction.flows.CreateAssetFlow;
import net.corda.samples.auction.flows.CreateAuctionFlow;
import net.corda.samples.auction.states.Asset;
import net.corda.samples.auction.states.AuctionState;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -39,7 +37,8 @@ public void setup() {
)
).withNetworkParameters(new NetworkParameters(4, Collections.emptyList(),
10485760, 10485760 * 50, Instant.now(), 1,
- Collections.emptyMap()))
+ Collections.emptyMap())
+ ).withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
);
a = network.createPartyNode(null);
b = network.createPartyNode(null);
diff --git a/Advanced/constants.properties b/Advanced/constants.properties
index 2cd5a28c..adcdb361 100644
--- a/Advanced/constants.properties
+++ b/Advanced/constants.properties
@@ -1,12 +1,12 @@
cordaReleaseGroup=net.corda
cordaCoreReleaseGroup=net.corda
-cordaVersion=4.6
-cordaCoreVersion=4.6
+cordaVersion=4.10
+cordaCoreVersion=4.10
gradlePluginsVersion=5.0.12
kotlinVersion=1.2.71
junitVersion=4.12
quasarVersion=0.7.10
-log4jVersion =2.11.2
-platformVersion=8
+log4jVersion =2.17.1
+platformVersion=12
slf4jVersion=1.7.25
nettyVersion=4.1.22.Final
diff --git a/Advanced/duediligence-cordapp/build.gradle b/Advanced/duediligence-cordapp/build.gradle
index 3c34d04e..ef682822 100644
--- a/Advanced/duediligence-cordapp/build.gradle
+++ b/Advanced/duediligence-cordapp/build.gradle
@@ -22,8 +22,8 @@ buildscript {//properties that you need to build the project
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -40,9 +40,9 @@ allprojects {//Properties that you need to compile your project (The application
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://jitpack.io' }
}
@@ -83,6 +83,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
diff --git a/Advanced/duediligence-cordapp/clients/build.gradle b/Advanced/duediligence-cordapp/clients/build.gradle
index ff114932..0585ba30 100644
--- a/Advanced/duediligence-cordapp/clients/build.gradle
+++ b/Advanced/duediligence-cordapp/clients/build.gradle
@@ -8,6 +8,12 @@ sourceSets {
}
}
+configurations {
+ all {
+ exclude group: 'ch.qos.logback', module: 'logback-classic'
+ }
+}
+
dependencies {
// Corda dependencies.
compile "$corda_release_group:corda-rpc:$corda_release_version"
diff --git a/Advanced/duediligence-cordapp/repositories.gradle b/Advanced/duediligence-cordapp/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/Advanced/duediligence-cordapp/repositories.gradle
+++ b/Advanced/duediligence-cordapp/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Advanced/duediligence-cordapp/workflows/src/main/java/net/corda/samples/duediligence/flows/RequestToValidateCorporateRecords.java b/Advanced/duediligence-cordapp/workflows/src/main/java/net/corda/samples/duediligence/flows/RequestToValidateCorporateRecords.java
index dd297df4..c8b20d09 100644
--- a/Advanced/duediligence-cordapp/workflows/src/main/java/net/corda/samples/duediligence/flows/RequestToValidateCorporateRecords.java
+++ b/Advanced/duediligence-cordapp/workflows/src/main/java/net/corda/samples/duediligence/flows/RequestToValidateCorporateRecords.java
@@ -8,6 +8,7 @@
import net.corda.core.transactions.TransactionBuilder;
import net.corda.samples.duediligence.contracts.CorporateRecordsContract;
import net.corda.samples.duediligence.states.CorporateRecordsAuditRequest;
+import net.corda.core.identity.CordaX500Name;
import java.util.Arrays;
import java.util.List;
@@ -33,7 +34,8 @@ public RequestToValidateCorporateRecordsInitiator(Party validater, int numberOfF
@Override
public String call() throws FlowException {
//notary
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
//Initiate Corporate Records validation
CorporateRecordsAuditRequest cr = new CorporateRecordsAuditRequest(getOurIdentity(),this.validater,this.numberOfFiles);
diff --git a/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java b/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java
index 80b7ba7f..ae0438d4 100644
--- a/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java
+++ b/Advanced/duediligence-cordapp/workflows/src/test/java/net/corda/samples/duediligence/FlowTests.java
@@ -4,14 +4,12 @@
import net.corda.core.contracts.ContractState;
import net.corda.core.contracts.StateAndRef;
import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.node.services.Vault;
import net.corda.core.node.services.vault.QueryCriteria;
import net.corda.samples.duediligence.flows.RequestToValidateCorporateRecords;
import net.corda.samples.duediligence.states.CorporateRecordsAuditRequest;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -20,7 +18,7 @@
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import static org.jgroups.util.Util.assertEquals;
+import static org.junit.Assert.assertEquals;
public class FlowTests {
private MockNetwork network;
@@ -31,7 +29,8 @@ public class FlowTests {
public void setup() {
network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
TestCordapp.findCordapp("net.corda.samples.duediligence.contracts"),
- TestCordapp.findCordapp("net.corda.samples.duediligence.flows"))));
+ TestCordapp.findCordapp("net.corda.samples.duediligence.flows")))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB")))));
a = network.createPartyNode(null);
b = network.createPartyNode(null);
network.runNetwork();
diff --git a/Advanced/negotiation-cordapp/build.gradle b/Advanced/negotiation-cordapp/build.gradle
index ad92a9bd..d98cff3d 100644
--- a/Advanced/negotiation-cordapp/build.gradle
+++ b/Advanced/negotiation-cordapp/build.gradle
@@ -20,17 +20,17 @@ buildscript {
}
repositories {
- jcenter()
+
mavenLocal()
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'http://software.r3.com/artifactory/corda-lib' }
maven { url 'http://software.r3.com/artifactory/corda-lib-dev' }
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+ maven { url 'https://download.corda.net/maven/corda-releases' }
// Corda dependencies for the patched Quasar version
- maven { url "https://software.r3.com/artifactory/corda-dependencies" } // access to the patched Quasar version
+ maven { url "https://download.corda.net/maven/corda-dependencies" } // access to the patched Quasar version
}
dependencies {
@@ -47,12 +47,12 @@ allprojects {
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
// Can be removed post-release - used to get nightly snapshot build.
- maven { url 'https://software.r3.com/artifactory/corda-lib' }
- maven { url 'https://software.r3.com/artifactory/corda-lib-dev' }
+ maven { url 'https://download.corda.net/maven/corda-lib' }
+ maven { url 'https://download.corda.net/maven/corda-lib-dev' }
maven { url 'https://jitpack.io' }
maven { url "https://repo.gradle.org/gradle/libs-releases-local" }
}
@@ -94,6 +94,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
cordapp {
@@ -111,6 +113,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
nodeDefaults {
cordapp project(':contracts')
+ cordapp project(':workflows')
runSchemaMigration = true
}
diff --git a/Advanced/negotiation-cordapp/gradle.properties b/Advanced/negotiation-cordapp/gradle.properties
index e1fac0e5..03a6057a 100644
--- a/Advanced/negotiation-cordapp/gradle.properties
+++ b/Advanced/negotiation-cordapp/gradle.properties
@@ -1,3 +1,3 @@
name=Negotiation Cordapp
-group=com.negotiation
+group=net.corda.samples.negotiation
version=0.2
diff --git a/Advanced/negotiation-cordapp/repositories.gradle b/Advanced/negotiation-cordapp/repositories.gradle
index 206b9c68..9797c0ea 100644
--- a/Advanced/negotiation-cordapp/repositories.gradle
+++ b/Advanced/negotiation-cordapp/repositories.gradle
@@ -1,8 +1,7 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Advanced/negotiation-cordapp/workflows/src/main/java/net/corda/samples/negotiation/flows/ProposalFlow.java b/Advanced/negotiation-cordapp/workflows/src/main/java/net/corda/samples/negotiation/flows/ProposalFlow.java
index 8cefad5b..45def7ee 100644
--- a/Advanced/negotiation-cordapp/workflows/src/main/java/net/corda/samples/negotiation/flows/ProposalFlow.java
+++ b/Advanced/negotiation-cordapp/workflows/src/main/java/net/corda/samples/negotiation/flows/ProposalFlow.java
@@ -15,6 +15,7 @@
import java.security.PublicKey;
import java.util.List;
+import net.corda.core.identity.CordaX500Name;
public class ProposalFlow {
@InitiatingFlow
@@ -51,13 +52,8 @@ public UniqueIdentifier call() throws FlowException {
//Building the transaction
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
TransactionBuilder txBuilder = new TransactionBuilder(notary)
.addOutputState(output, ProposalAndTradeContract.ID)
diff --git a/Advanced/negotiation-cordapp/workflows/src/test/java/net/corda/samples/negotiation/flows/FlowTestBase.java b/Advanced/negotiation-cordapp/workflows/src/test/java/net/corda/samples/negotiation/flows/FlowTestBase.java
index 55b905a4..d6e2fd85 100644
--- a/Advanced/negotiation-cordapp/workflows/src/test/java/net/corda/samples/negotiation/flows/FlowTestBase.java
+++ b/Advanced/negotiation-cordapp/workflows/src/test/java/net/corda/samples/negotiation/flows/FlowTestBase.java
@@ -2,14 +2,14 @@
import com.google.common.collect.ImmutableList;
import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.driver.VerifierType;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -21,11 +21,11 @@ abstract class FlowTestBase {
@Before
public void setup() {
- network = new MockNetwork(new MockNetworkParameters(ImmutableList.of(
- TestCordapp.findCordapp("net.corda.samples.negotiation.flows"),
- TestCordapp.findCordapp("net.corda.samples.negotiation.contracts")
- )
- ));
+ network = new MockNetwork(new MockNetworkParameters(
+ ImmutableList.of(
+ TestCordapp.findCordapp("net.corda.samples.negotiation.flows"),
+ TestCordapp.findCordapp("net.corda.samples.negotiation.contracts"))
+ ).withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB")))));
a = network.createPartyNode(null);
b = network.createPartyNode(null);
diff --git a/Advanced/obligation-cordapp/README.md b/Advanced/obligation-cordapp/README.md
index 87830236..952c7f9a 100644
--- a/Advanced/obligation-cordapp/README.md
+++ b/Advanced/obligation-cordapp/README.md
@@ -1,6 +1,6 @@
# Obligation Cordap
-This Cordapp is the complete implementation of our signature IOU (I-owe-you) demonstration.
+This CorDapp is the complete implementation of our signature IOU (I-owe-you) demonstration.
## Concepts
@@ -9,12 +9,12 @@ An IOU is someone who has cash that is paying it back to someone they owe it to.
### Flows
-The first flows are the ones that issue the original cash and assets. You can find that the cash flow at `SelfIssueCashFlow.java` and the IOU issurance in `IOUIssueFlow.java`.
+The first flows are the ones that issue the original cash and assets. You can find that the cash flow at `SelfIssueCashFlow.java` and the IOU issuance in `IOUIssueFlow.java`.
The next flow is the one that transfers ownership of that asset over to another party. That can be found in `IOUTransferFlow.java`.
-Finally, once we have the ability to transfer assets, we just need to settle up. That functiionality can be found here in `IOUSettleFlow.java`
+Finally, once we have the ability to transfer assets, we just need to settle up. That functionality can be found here in `IOUSettleFlow.java`
diff --git a/Advanced/obligation-cordapp/build.gradle b/Advanced/obligation-cordapp/build.gradle
index 9d873ac6..15bd2c09 100644
--- a/Advanced/obligation-cordapp/build.gradle
+++ b/Advanced/obligation-cordapp/build.gradle
@@ -22,8 +22,8 @@ buildscript {
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -41,9 +41,8 @@ allprojects {
repositories {
mavenLocal()
- jcenter()
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://jitpack.io' }
}
@@ -92,6 +91,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
cordapp {
diff --git a/Advanced/obligation-cordapp/clients/build.gradle b/Advanced/obligation-cordapp/clients/build.gradle
index bab14a2f..6bf3c08f 100644
--- a/Advanced/obligation-cordapp/clients/build.gradle
+++ b/Advanced/obligation-cordapp/clients/build.gradle
@@ -1,6 +1,6 @@
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
maven { url 'https://jitpack.io' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda-releases' }
@@ -26,6 +26,12 @@ dependencyManagement {
}
}
+configurations {
+ all {
+ exclude group: 'ch.qos.logback', module: 'logback-classic'
+ }
+}
+
dependencies {
// CorDapp dependencies.
compile project(":contracts")
diff --git a/Advanced/obligation-cordapp/contracts/build.gradle b/Advanced/obligation-cordapp/contracts/build.gradle
index 71bf133b..ae474abf 100644
--- a/Advanced/obligation-cordapp/contracts/build.gradle
+++ b/Advanced/obligation-cordapp/contracts/build.gradle
@@ -33,7 +33,6 @@ dependencies {
cordaRuntime "$corda_release_group:corda:$corda_release_version"
cordaCompile "$corda_release_group:corda-finance-contracts:$corda_release_version"
cordaCompile "$corda_release_group:corda-finance-workflows:$corda_release_version"
- compileOnly "$corda_release_group:corda-testserver-impl:$corda_release_version"
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
cordapp "$corda_release_group:corda-finance-contracts:$corda_release_version"
cordapp "$corda_release_group:corda-finance-workflows:$corda_release_version"
diff --git a/Advanced/obligation-cordapp/repositories.gradle b/Advanced/obligation-cordapp/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/Advanced/obligation-cordapp/repositories.gradle
+++ b/Advanced/obligation-cordapp/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUIssueFlow.java b/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUIssueFlow.java
index f068e2ed..9a608cf3 100644
--- a/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUIssueFlow.java
+++ b/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUIssueFlow.java
@@ -18,6 +18,7 @@
import net.corda.samples.obligation.contracts.IOUContract;
import net.corda.samples.obligation.states.IOUState;
import static net.corda.samples.obligation.contracts.IOUContract.Commands.*;
+import net.corda.core.identity.CordaX500Name;
/**
* This is the flows which handles issuance of new IOUs on the ledger.
@@ -39,14 +40,8 @@ public InitiatorFlow(IOUState state) {
@Override
public SignedTransaction call() throws FlowException {
// Step 1. Get a reference to the notary service on our network and our key pair.
-
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
// Step 2. Create a new issue command.
// Remember that a command is a CommandData object and a list of CompositeKeys
diff --git a/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUSettleFlow.java b/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUSettleFlow.java
index 0cf47b60..714a0d3e 100644
--- a/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUSettleFlow.java
+++ b/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUSettleFlow.java
@@ -68,13 +68,7 @@ public SignedTransaction call() throws FlowException {
// Step 3. Create a transaction builder.
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ Party notary = inputStateAndRefToSettle.getState().getNotary();
TransactionBuilder tb = new TransactionBuilder(notary);
diff --git a/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUTransferFlow.java b/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUTransferFlow.java
index c29906f0..4186aabb 100644
--- a/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUTransferFlow.java
+++ b/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/IOUTransferFlow.java
@@ -66,13 +66,7 @@ public SignedTransaction call() throws FlowException {
// Here we get a reference to the default notary and instantiate a transaction builder.
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ Party notary = inputStateAndRefToTransfer.getState().getNotary();
TransactionBuilder tb = new TransactionBuilder(notary);
diff --git a/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/SelfIssueCashFlow.java b/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/SelfIssueCashFlow.java
index 4e5d69cb..2f0094dc 100644
--- a/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/SelfIssueCashFlow.java
+++ b/Advanced/obligation-cordapp/workflows/src/main/java/net/corda/samples/obligation/flows/SelfIssueCashFlow.java
@@ -9,6 +9,7 @@
import net.corda.finance.contracts.asset.Cash;
import net.corda.finance.flows.CashIssueFlow;
import java.util.Currency;
+import net.corda.core.identity.CordaX500Name;
@InitiatingFlow
@StartableByRPC
@@ -26,13 +27,8 @@ public Cash.State call() throws FlowException {
OpaqueBytes issueRef = OpaqueBytes.of("1".getBytes());
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
/** Create the cash issuance transaction. */
SignedTransaction cashIssueTransaction = subFlow(new CashIssueFlow(amount, issueRef, notary)).getStx();
diff --git a/Advanced/secretsanta-cordapp/build.gradle b/Advanced/secretsanta-cordapp/build.gradle
index d67642c8..622a2636 100644
--- a/Advanced/secretsanta-cordapp/build.gradle
+++ b/Advanced/secretsanta-cordapp/build.gradle
@@ -28,11 +28,10 @@ buildscript { //properties that you need to build the project
repositories {
mavenLocal()
mavenCentral()
- jcenter()
maven { url 'https://jitpack.io' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
maven { url 'http://software.r3.com/artifactory/corda-lib' }
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -53,10 +52,10 @@ allprojects {//Properties that you need to compile your project (The application
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
}
tasks.withType(JavaCompile) {
@@ -106,6 +105,8 @@ dependencies {
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
//Task to deploy the nodes in order to bootstrap a network
diff --git a/Advanced/secretsanta-cordapp/repositories.gradle b/Advanced/secretsanta-cordapp/repositories.gradle
index 2874c2ab..7adba3a3 100644
--- a/Advanced/secretsanta-cordapp/repositories.gradle
+++ b/Advanced/secretsanta-cordapp/repositories.gradle
@@ -1,7 +1,7 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
maven { url 'https://ci-artifactory.corda.r3cev.com/artifactory/corda' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
diff --git a/Advanced/secretsanta-cordapp/workflows/src/main/java/net/corda/samples/secretsanta/flows/CreateSantaSessionFlow.java b/Advanced/secretsanta-cordapp/workflows/src/main/java/net/corda/samples/secretsanta/flows/CreateSantaSessionFlow.java
index 0065f0e8..7b9635d5 100644
--- a/Advanced/secretsanta-cordapp/workflows/src/main/java/net/corda/samples/secretsanta/flows/CreateSantaSessionFlow.java
+++ b/Advanced/secretsanta-cordapp/workflows/src/main/java/net/corda/samples/secretsanta/flows/CreateSantaSessionFlow.java
@@ -14,6 +14,7 @@
import static java.util.Collections.singletonList;
import java.util.*;
+import net.corda.core.identity.CordaX500Name;
/**
@@ -65,7 +66,8 @@ public ProgressTracker getProgressTracker() {
public SignedTransaction call() throws FlowException {
// run an issuance transaction for a new secret santa game
progressTracker.setCurrentStep(CREATING);
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
Party issuer = getOurIdentity();
SantaSessionState newSantaState = new SantaSessionState(playerNames, playerEmails, issuer, owner);
diff --git a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java
index f59aa598..8102b6e6 100644
--- a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java
+++ b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CheckAssignedSantaFlowTests.java
@@ -1,6 +1,7 @@
package net.corda.samples.secretsanta;
import com.google.common.collect.ImmutableList;
+import net.corda.core.identity.CordaX500Name;
import net.corda.samples.secretsanta.flows.CheckAssignedSantaFlow;
import net.corda.samples.secretsanta.flows.CreateSantaSessionFlow;
import net.corda.samples.secretsanta.states.SantaSessionState;
@@ -8,10 +9,7 @@
import net.corda.core.contracts.UniqueIdentifier;
import net.corda.core.node.NetworkParameters;
import net.corda.core.transactions.SignedTransaction;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
@@ -20,7 +18,7 @@
import java.time.Instant;
import java.util.*;
-import static org.jgroups.util.Util.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class CheckAssignedSantaFlowTests {
@@ -39,6 +37,7 @@ public void setup() {
network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
TestCordapp.findCordapp("net.corda.samples.secretsanta.contracts"),
TestCordapp.findCordapp("net.corda.samples.secretsanta.flows"))).withNetworkParameters(testNetworkParameters)
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
);
santa = network.createPartyNode(null);
diff --git a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java
index 1b22d6f8..b617bca2 100644
--- a/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java
+++ b/Advanced/secretsanta-cordapp/workflows/src/test/java/net/corda/samples/secretsanta/CreateSantaSessionFlowTests.java
@@ -1,6 +1,7 @@
package net.corda.samples.secretsanta;
import com.google.common.collect.ImmutableList;
+import net.corda.core.identity.CordaX500Name;
import net.corda.samples.secretsanta.contracts.SantaSessionContract;
import net.corda.samples.secretsanta.flows.CreateSantaSessionFlow;
import net.corda.samples.secretsanta.states.SantaSessionState;
@@ -9,10 +10,7 @@
import net.corda.core.contracts.TransactionState;
import net.corda.core.node.NetworkParameters;
import net.corda.core.transactions.SignedTransaction;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -22,8 +20,8 @@
import java.util.Arrays;
import java.util.LinkedHashMap;
-import static org.jgroups.util.Util.assertEquals;
-import static org.jgroups.util.Util.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertNull;
public class CreateSantaSessionFlowTests {
@@ -43,6 +41,7 @@ public void setup() {
network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
TestCordapp.findCordapp("net.corda.samples.secretsanta.contracts"),
TestCordapp.findCordapp("net.corda.samples.secretsanta.flows"))).withNetworkParameters(testNetworkParameters)
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
);
santa = network.createPartyNode(null);
diff --git a/Advanced/snakesandladders-cordapp/README.md b/Advanced/snakesandladders-cordapp/README.md
index ae80630b..2e5f5b9a 100644
--- a/Advanced/snakesandladders-cordapp/README.md
+++ b/Advanced/snakesandladders-cordapp/README.md
@@ -2,13 +2,13 @@
This sample implements a simple Snakes And Ladder Game on Corda.
-Its a simple game which has a board with numbers from 1 to 100. Each player starts at 1.
-Players takes turn to roll a dice and move as many places as they rolled. If a player lands on a number
-with a ladder thay climb up using the ladder or if they land in a number with a snake they move down on the board.
+It's a simple game which has a board with numbers from 1 to 100. Each player starts at 1.
+Players take turn to roll a dice and move as many places as they rolled. If a player lands on a number
+with a ladder they climb up using the ladder or if they land in a number with a snake they move down on the board.
The player who reach 100 first wins.
-The cordapp runs a network having 4 nodes,
-1. Classis Games
+The CorDapp runs a network having 4 nodes,
+1. Classic Games
2. Mega Games
3. Oracle
4. Notary
diff --git a/Advanced/snakesandladders-cordapp/build.gradle b/Advanced/snakesandladders-cordapp/build.gradle
index 04dde1ae..f30e7f56 100644
--- a/Advanced/snakesandladders-cordapp/build.gradle
+++ b/Advanced/snakesandladders-cordapp/build.gradle
@@ -28,8 +28,8 @@ buildscript {
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -46,12 +46,12 @@ allprojects {
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://jitpack.io' }
//SDK lib
- maven { url 'https://software.r3.com/artifactory/corda-lib' }
+ maven { url 'https://download.corda.net/maven/corda-lib' }
//Gradle Plugins
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
@@ -98,6 +98,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
//accounts
cordapp "$accounts_release_group:accounts-contracts:$accounts_release_version"
diff --git a/Advanced/snakesandladders-cordapp/client/build.gradle b/Advanced/snakesandladders-cordapp/client/build.gradle
index 79ce3545..82103fec 100644
--- a/Advanced/snakesandladders-cordapp/client/build.gradle
+++ b/Advanced/snakesandladders-cordapp/client/build.gradle
@@ -1,5 +1,11 @@
apply plugin: 'org.springframework.boot'
+configurations {
+ all {
+ exclude group: 'ch.qos.logback', module: 'logback-classic'
+ }
+}
+
dependencies {
// Corda dependencies.
compile "$corda_release_group:corda-rpc:$corda_release_version"
diff --git a/Advanced/snakesandladders-cordapp/repositories.gradle b/Advanced/snakesandladders-cordapp/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/Advanced/snakesandladders-cordapp/repositories.gradle
+++ b/Advanced/snakesandladders-cordapp/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateAndShareAccountFlow.java b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateAndShareAccountFlow.java
index 008c605b..17c1cb96 100644
--- a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateAndShareAccountFlow.java
+++ b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateAndShareAccountFlow.java
@@ -14,6 +14,7 @@
import java.util.List;
import java.util.stream.Collectors;
+import net.corda.core.identity.CordaX500Name;
@StartableByRPC
@InitiatingFlow
@@ -33,7 +34,9 @@ public String call() throws FlowException {
StateAndRef accountInfoStateAndRef =
(StateAndRef) subFlow(new CreateAccount(accountName));
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
Party oracle = getServiceHub().getNetworkMapCache()
.getNodeByLegalName(CordaX500Name.parse("O=Oracle,L=Mumbai,C=IN")).getLegalIdentities().get(0);
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateBoardConfig.java b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateBoardConfig.java
index 705a716c..8af2de27 100644
--- a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateBoardConfig.java
+++ b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateBoardConfig.java
@@ -17,6 +17,7 @@
import java.security.SignatureException;
import java.util.*;
+import net.corda.core.identity.CordaX500Name;
public class CreateBoardConfig {
private CreateBoardConfig() {}
@@ -36,7 +37,9 @@ public Initiator(String player1, String player2) {
@Override
@Suspendable
public SignedTransaction call() throws FlowException {
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
AccountService accountService = getServiceHub().cordaService(KeyManagementBackedAccountService.class);
List> p1accountInfo = accountService.accountInfo(player1);
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateGameFlow.java b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateGameFlow.java
index ae6845b5..fb664384 100644
--- a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateGameFlow.java
+++ b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateGameFlow.java
@@ -23,6 +23,7 @@
import java.util.Collections;
import java.util.List;
import java.util.UUID;
+import net.corda.core.identity.CordaX500Name;
public class CreateGameFlow {
@@ -43,7 +44,9 @@ public Initiator(String player1, String player2) {
@Override
@Suspendable
public String call() throws FlowException {
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
AccountService accountService = getServiceHub().cordaService(KeyManagementBackedAccountService.class);
List> p1accountInfo = accountService.accountInfo(player1);
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/PlayerMoveFlow.java b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/PlayerMoveFlow.java
index 19642828..4712a094 100644
--- a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/PlayerMoveFlow.java
+++ b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/PlayerMoveFlow.java
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
+import net.corda.core.identity.CordaX500Name;
public class PlayerMoveFlow {
@@ -52,7 +53,9 @@ public Initiator(String player, String linearId, int diceRolled) {
@Override
@Suspendable
public SignedTransaction call() throws FlowException {
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
AccountService accountService = getServiceHub().cordaService(KeyManagementBackedAccountService.class);
//Get current player account info
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/test/java/net/corda/samples/snl/flows/FlowTests.java b/Advanced/snakesandladders-cordapp/workflows/src/test/java/net/corda/samples/snl/flows/FlowTests.java
index c047e9f6..7f141371 100644
--- a/Advanced/snakesandladders-cordapp/workflows/src/test/java/net/corda/samples/snl/flows/FlowTests.java
+++ b/Advanced/snakesandladders-cordapp/workflows/src/test/java/net/corda/samples/snl/flows/FlowTests.java
@@ -3,13 +3,11 @@
import com.google.common.collect.ImmutableList;
import com.r3.corda.lib.accounts.workflows.flows.CreateAccount;
import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.node.NetworkParameters;
import net.corda.core.transactions.SignedTransaction;
import net.corda.samples.snl.states.BoardConfig;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -36,7 +34,9 @@ public void setup() {
TestCordapp.findCordapp("com.r3.corda.lib.ci"))
).withNetworkParameters(new NetworkParameters(4, Collections.emptyList(),
10485760, 10485760 * 50, Instant.now(), 1,
- Collections.emptyMap()))
+ Collections.emptyMap())
+ )
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
);
a = network.createPartyNode(null);
b = network.createPartyNode(null);
diff --git a/Advanced/syndicated-lending/.ci/Jenkinsfile b/Advanced/syndicated-lending/.ci/Jenkinsfile
new file mode 100644
index 00000000..7421cafe
--- /dev/null
+++ b/Advanced/syndicated-lending/.ci/Jenkinsfile
@@ -0,0 +1,37 @@
+#!groovy
+/**
+ * Jenkins pipeline to build the java CorDapp template
+ */
+
+/**
+ * Kill already started job.
+ * Assume new commit takes precedence and results from previousunfinished builds are not required.
+ * This feature doesn't play well with disableConcurrentBuilds() option
+ */
+@Library('corda-shared-build-pipeline-steps')
+import static com.r3.build.BuildControl.killAllExistingBuildsForJob
+killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
+
+pipeline {
+ agent {
+ label 'eight-cores'
+ }
+ options {
+ ansiColor('xterm')
+ timestamps()
+ timeout(3*60) // 3 hours
+ buildDiscarder(logRotator(daysToKeepStr: '7', artifactDaysToKeepStr: '7'))
+ }
+ stages {
+ stage('Build') {
+ steps {
+ sh './gradlew --no-daemon -s clean build test deployNodes'
+ }
+ }
+ }
+ post {
+ cleanup {
+ deleteDir()
+ }
+ }
+}
diff --git a/Advanced/syndicated-lending/.gitignore b/Advanced/syndicated-lending/.gitignore
new file mode 100644
index 00000000..0d75547d
--- /dev/null
+++ b/Advanced/syndicated-lending/.gitignore
@@ -0,0 +1,78 @@
+# Eclipse, ctags, Mac metadata, log files
+.classpath
+.project
+tags
+.DS_Store
+*.log
+*.log.gz
+*.orig
+
+.gradle
+
+# General build files
+**/build/*
+!docs/build/*
+
+lib/dokka.jar
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+
+*.iml
+
+## Directory-based project format:
+#.idea
+
+# if you remove the above rule, at least ignore the following:
+
+# Specific files to avoid churn
+.idea/*.xml
+.idea/copyright
+.idea/jsLibraryMappings.xml
+
+# User-specific stuff:
+.idea/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+/workflows/out/
+/contracts/out/
+clients/out/
+*/bin/*
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+
+# docs related
+docs/virtualenv/
+
+# if you use the installQuasar task
+lib
diff --git a/Advanced/syndicated-lending/.settings/org.eclipse.jdt.core.prefs b/Advanced/syndicated-lending/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..ac86f90c
--- /dev/null
+++ b/Advanced/syndicated-lending/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/FlowDiagram.pptx b/Advanced/syndicated-lending/FlowDiagram.pptx
new file mode 100644
index 00000000..c011cc9e
Binary files /dev/null and b/Advanced/syndicated-lending/FlowDiagram.pptx differ
diff --git a/Advanced/syndicated-lending/LICENCE b/Advanced/syndicated-lending/LICENCE
new file mode 100644
index 00000000..3ff572d1
--- /dev/null
+++ b/Advanced/syndicated-lending/LICENCE
@@ -0,0 +1,13 @@
+ Copyright 2016, R3 Limited.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/README.md b/Advanced/syndicated-lending/README.md
new file mode 100644
index 00000000..77b8b6c9
--- /dev/null
+++ b/Advanced/syndicated-lending/README.md
@@ -0,0 +1,102 @@
+
+
+
+# Syndicated Lending Sample Cordapp
+
+This is a sample Cordapp which demonstrate a high level Syndicated Lending scenario on a Corda network.
+
+Syndicated lending comprises of multiple banks coming together to service the loan requirement of a borrower.
+Generally a lead bank is appointed who coordinated the process to forming a syndicate with other participating banks
+and agreeing on loan terms.
+
+# Pre-Requisites
+
+See https://docs.corda.net/getting-set-up.html.
+
+# Usage
+
+## Running the CorDapp
+
+Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)
+```
+./gradlew clean deployNodes
+```
+Then type: (to run the nodes)
+```
+./build/nodes/runnodes
+```
+
+## Interacting with the CorDapp
+
+PeterCo (as a borrower) starts the `SubmitProjectProposalFlow` in order to submit the project details to a group of
+lenders and request for funds.
+
+Go to PeterCo's terminal and run the below command
+
+```
+start SubmitProjectProposalFlow lenders: [BankOfAshu, BankOfSneha], projectDescription: "Overseas Expansion", projectCost: 10000000, loanAmount: 8000000
+```
+
+Validate the project details are created and shared with the lenders successfully by running the vaultQuery command in each
+lender's terminal and borrower's terminal.
+
+```
+run vaultQuery contractStateType: net.corda.samples.lending.states.ProjectState
+```
+
+Once the lenders have verified the project details and done their due deligence, they could submit bids for loan.
+
+Goto BankOfAshu's terminal and run the below command. The project-id can be found using the vaultQuery command shown earlier.
+
+```
+start SubmitLoanBidFlow borrower: PeterCo, loanAmount: 8000000, tenure: 5, rateofInterest: 4.0, transactionFees: 20000, projectIdentifier:
+```
+
+Validate the loanBid is submitted successfully by running the vaultQuery command below:
+
+```
+run vaultQuery contractStateType: net.corda.samples.lending.states.LoanBidState
+```
+
+Now the borrower can inspect the loan terms and approve the loan bid, to start the syndication process.
+
+Go to PeterCo's terminal and run the below command. The loanbid-identifier can be found using the vaultQuery command used earlier.
+
+```
+start ApproveLoanBidFlow bidIdentifier:
+```
+
+One the loan bid has been approved by the borrower, the lender can start the process of creating the syndicate by
+acting as the lead bank and approach participating bank for funds.
+
+Goto BankOfAshu's terminal and run the below command.
+
+```
+start CreateSyndicateFlow participantBanks: [BankOfSneha, BankOfTom], projectIdentifier: , loanDetailIdentifier:
+```
+
+Verify the syndicate is created using the below command:
+
+```
+run vaultQuery contractStateType: net.corda.samples.lending.states.SyndicateState
+```
+
+On receiving the syndicate creation request, participating banks could verify the project and loan terms and submit
+bids for the amount of fund they wish to lend by using the below flow in BankOfSneha or BankOfTom node.
+
+```
+start SyndicateBidFlow$Initiator syndicateIdentifier: , bidAmount:
+```
+
+Verify the syndicate bid is successfully created using the below command:
+
+```
+run vaultQuery contractStateType: net.corda.samples.lending.states.SyndicateBidState
+```
+
+The lead bank on receiving bids from participating banks could approve the bid using the below flow command.
+
+```
+start ApproveSyndicateBidFlow bidIdentifier:
+```
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/TRADEMARK b/Advanced/syndicated-lending/TRADEMARK
new file mode 100644
index 00000000..d2e056b5
--- /dev/null
+++ b/Advanced/syndicated-lending/TRADEMARK
@@ -0,0 +1,4 @@
+Corda and the Corda logo are trademarks of R3CEV LLC and its affiliates. All rights reserved.
+
+For R3CEV LLC's trademark and logo usage information, please consult our Trademark Usage Policy at
+https://www.r3.com/trademark-policy/.
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/build.gradle b/Advanced/syndicated-lending/build.gradle
new file mode 100644
index 00000000..68ca4762
--- /dev/null
+++ b/Advanced/syndicated-lending/build.gradle
@@ -0,0 +1,156 @@
+buildscript {//properties that you need to build the project
+ Properties constants = new Properties()
+ file("$projectDir/./constants.properties").withInputStream { constants.load(it) }
+
+ ext {
+ corda_release_group = constants.getProperty("cordaReleaseGroup")
+ corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
+ corda_release_version = constants.getProperty("cordaVersion")
+ corda_core_release_version = constants.getProperty("cordaCoreVersion")
+ corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
+ kotlin_version = constants.getProperty("kotlinVersion")
+ junit_version = constants.getProperty("junitVersion")
+ quasar_version = constants.getProperty("quasarVersion")
+ log4j_version = constants.getProperty("log4jVersion")
+ slf4j_version = constants.getProperty("slf4jVersion")
+ corda_platform_version = constants.getProperty("platformVersion").toInteger()
+ //springboot
+ spring_boot_version = '2.0.2.RELEASE'
+ spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
+ }
+
+ repositories {
+ mavenLocal()
+ mavenCentral()
+
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://download.corda.net/maven/corda-releases' }
+ }
+
+ dependencies {
+ classpath "net.corda.plugins:cordapp:$corda_gradle_plugins_version"
+ classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version"
+ classpath "net.corda.plugins:quasar-utils:$corda_gradle_plugins_version"
+ classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_gradle_plugin_version"
+ }
+}
+
+allprojects {//Properties that you need to compile your project (The application)
+ apply from: "${rootProject.projectDir}/repositories.gradle"
+ apply plugin: 'java'
+
+ repositories {
+ mavenLocal()
+
+ mavenCentral()
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://download.corda.net/maven/corda-releases' }
+ maven { url 'https://jitpack.io' }
+ }
+
+ tasks.withType(JavaCompile) {
+ options.compilerArgs << "-parameters" // Required by Corda's serialisation framework.
+ }
+
+ jar {
+ // This makes the JAR's SHA-256 hash repeatable.
+ preserveFileTimestamps = false
+ reproducibleFileOrder = true
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+ }
+}
+
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+
+sourceSets {
+ main {
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+}
+//Module dependencis
+dependencies {
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+
+ // CorDapp dependencies.
+ cordapp project(":workflows")
+ cordapp project(":contracts")
+
+ cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
+ cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
+ cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
+}
+
+
+//Task to deploy the nodes in order to bootstrap a network
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
+
+ /* This property will load the CorDapps to each of the node by default, including the Notary. You can find them
+ * in the cordapps folder of the node at build/nodes/Notary/cordapps. However, the notary doesn't really understand
+ * the notion of cordapps. In production, Notary does not need cordapps as well. This is just a short cut to load
+ * the Corda network bootstrapper.
+ */
+ nodeDefaults {
+ projectCordapp {
+ deploy = false
+ }
+ cordapp project(':contracts')
+ cordapp project(':workflows')
+ runSchemaMigration = true //This configuration is for any CorDapps with custom schema, We will leave this as true to avoid
+ //problems for developers who are not familiar with Corda. If you are not using custom schemas, you can change
+ //it to false for quicker project compiling time.
+ }
+ node {
+ name "O=Notary,L=London,C=GB"
+ notary = [validating : false]
+ p2pPort 10002
+ rpcSettings {
+ address("localhost:10003")
+ adminAddress("localhost:10043")
+ }
+ }
+ node {
+ name "O=PeterCo,L=London,C=GB"
+ p2pPort 10005
+ rpcSettings {
+ address("localhost:10006")
+ adminAddress("localhost:10046")
+ }
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+ }
+ node {
+ name "O=BankOfAshu,L=New York,C=US"
+ p2pPort 10008
+ rpcSettings {
+ address("localhost:10009")
+ adminAddress("localhost:10049")
+ }
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+ }
+ node {
+ name "O=BankOfSneha,L=New York,C=US"
+ p2pPort 10011
+ rpcSettings {
+ address("localhost:10012")
+ adminAddress("localhost:10052")
+ }
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+ }
+ node {
+ name "O=BankOfTom,L=New York,C=US"
+ p2pPort 10014
+ rpcSettings {
+ address("localhost:10016")
+ adminAddress("localhost:10056")
+ }
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+ }
+}
diff --git a/Advanced/syndicated-lending/config/dev/log4j2.xml b/Advanced/syndicated-lending/config/dev/log4j2.xml
new file mode 100644
index 00000000..34ba4d45
--- /dev/null
+++ b/Advanced/syndicated-lending/config/dev/log4j2.xml
@@ -0,0 +1,59 @@
+
+
+
+
+ logs
+ node-${hostName}
+ ${log-path}/archive
+
+
+
+
+
+
+ %highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Advanced/syndicated-lending/config/test/log4j2.xml b/Advanced/syndicated-lending/config/test/log4j2.xml
new file mode 100644
index 00000000..cd9926ca
--- /dev/null
+++ b/Advanced/syndicated-lending/config/test/log4j2.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
+ >
+
+
+
+
+
+
+
+
+
+
diff --git a/Advanced/syndicated-lending/constants.properties b/Advanced/syndicated-lending/constants.properties
new file mode 100644
index 00000000..adedb0f3
--- /dev/null
+++ b/Advanced/syndicated-lending/constants.properties
@@ -0,0 +1,12 @@
+cordaReleaseGroup=net.corda
+cordaCoreReleaseGroup=net.corda
+cordaVersion=4.8.5
+cordaCoreVersion=4.8.5
+gradlePluginsVersion=5.0.12
+kotlinVersion=1.2.71
+junitVersion=4.12
+quasarVersion=0.7.10
+log4jVersion =2.16.0
+platformVersion=10
+slf4jVersion=1.7.25
+nettyVersion=4.1.22.Final
diff --git a/Advanced/syndicated-lending/contracts/build.gradle b/Advanced/syndicated-lending/contracts/build.gradle
new file mode 100644
index 00000000..9f2664fb
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ contract {
+ name "Lending Contracts"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+}
+
+sourceSets {
+ main{
+ java {
+ srcDir 'src/main/java'
+ java.outputDir = file('bin/main')
+ }
+ }
+ test{
+ java{
+ srcDir 'src/test/java'
+ java.outputDir = file('bin/test')
+ }
+ }
+}
+
+dependencies {
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+}
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/LoanBidContract.java b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/LoanBidContract.java
new file mode 100644
index 00000000..047caa6c
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/LoanBidContract.java
@@ -0,0 +1,42 @@
+package net.corda.samples.lending.contracts;
+
+
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.transactions.LedgerTransaction;
+import org.jetbrains.annotations.NotNull;
+
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+public class LoanBidContract implements Contract {
+
+ // This is used to identify our contract when building a transaction.
+ public static final String ID = "net.corda.samples.lending.contracts.LoanBidContract";
+
+ @Override
+ public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
+ // Contract Validation Logic Goes Here
+ final CommandData commandData = tx.getCommands().get(0).getValue();
+
+ if (commandData instanceof Commands.Submit) {
+ requireThat(require -> {
+ /* At here, the loan bid proposal from the competing banks is verified.
+ These contract rules make sure that each loan bid for project is valid. */
+ return null;
+ });
+ }else if (commandData instanceof Commands.Approve) {
+ requireThat(require -> {
+ /* At here, the loan bid is verified for approval process. These contract rules make
+ sure that all the conditions are met for the borrower to approve the sole loan bid for its
+ project. */
+ return null;
+ });
+ }
+ }
+
+ // Used to indicate the transaction's intent.
+ public interface Commands extends CommandData {
+ class Submit implements ProjectContract.Commands {}
+ class Approve implements ProjectContract.Commands {}
+ }
+}
diff --git a/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/ProjectContract.java b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/ProjectContract.java
new file mode 100644
index 00000000..3189f63e
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/ProjectContract.java
@@ -0,0 +1,40 @@
+package net.corda.samples.lending.contracts;
+
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.transactions.LedgerTransaction;
+import org.jetbrains.annotations.NotNull;
+
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+// ************
+// * Contract *
+// ************
+public class ProjectContract implements Contract {
+
+ // This is used to identify our contract when building a transaction.
+ public static final String ID = "net.corda.samples.lending.contracts.ProjectContract";
+
+
+ // A transaction is valid if the verify() function of the contract of all the transaction's input and output states
+ // does not throw an exception.
+ @Override
+ public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
+ // Contract Validation Logic Goes Here
+ final CommandData commandData = tx.getCommands().get(0).getValue();
+
+ if (commandData instanceof Commands.ProposeProject) {
+ requireThat(require -> {
+ /*At here, you can structure the rules for creating a project proposal
+ * this verify method makes sure that all proposed projects from the borrower company
+ * are sound, so that banks are not going to waste any time on unqualified project proposals*/
+ return null;
+ });
+ }
+ }
+
+ // Used to indicate the transaction's intent.
+ public interface Commands extends CommandData {
+ class ProposeProject implements Commands {}
+ }
+}
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/SyndicateBidContract.java b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/SyndicateBidContract.java
new file mode 100644
index 00000000..bd3738c2
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/SyndicateBidContract.java
@@ -0,0 +1,39 @@
+package net.corda.samples.lending.contracts;
+
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.transactions.LedgerTransaction;
+import org.jetbrains.annotations.NotNull;
+
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+public class SyndicateBidContract implements Contract {
+
+ // This is used to identify our contract when building a transaction.
+ public static final String ID = "net.corda.samples.lending.contracts.SyndicateBidContract";
+
+ @Override
+ public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
+ // Contract Validation Logic Goes Here
+ final CommandData commandData = tx.getCommands().get(0).getValue();
+
+ if (commandData instanceof Commands.Submit) {
+ requireThat(require -> {
+ /* At here, the syndication bid proposal from the syndication participating banks is verified.
+ These contract rules make sure that each bid for syndicated loan is valid. */
+ return null;
+ });
+ }else if (commandData instanceof Commands.Approve) {
+ requireThat(require -> {
+ /* At here, the syndicated bid is verified for approval process. These contract rules make
+ sure that all the conditions are met for the lead bank to approve the each syndicated bid. */
+ return null;
+ });
+ }
+ }
+
+ public interface Commands extends CommandData {
+ class Submit implements Commands {}
+ class Approve implements Commands {}
+ }
+}
diff --git a/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/SyndicateContract.java b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/SyndicateContract.java
new file mode 100644
index 00000000..d2c15f9c
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/contracts/SyndicateContract.java
@@ -0,0 +1,38 @@
+package net.corda.samples.lending.contracts;
+
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.transactions.LedgerTransaction;
+import net.corda.samples.lending.states.LoanBidState;
+import net.corda.samples.lending.states.SyndicateState;
+import org.jetbrains.annotations.NotNull;
+
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+public class SyndicateContract implements Contract {
+
+ // This is used to identify our contract when building a transaction.
+ public static final String ID = "net.corda.samples.lending.contracts.SyndicateContract";
+
+
+ // A transaction is valid if the verify() function of the contract of all the transaction's input and output states
+ // does not throw an exception.
+ @Override
+ public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
+ // Contract Validation Logic Goes Here
+ final CommandData commandData = tx.getCommands().get(0).getValue();
+
+ if (commandData instanceof Commands.Create) {
+ requireThat(require -> {
+ /*Here writes the rules for the lead bank's creating the syndication.*/
+
+ return null;
+ });
+ }
+ }
+
+ public interface Commands extends CommandData {
+ class Create implements Commands {}
+ }
+}
diff --git a/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/LoanBidState.java b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/LoanBidState.java
new file mode 100644
index 00000000..7be802bc
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/LoanBidState.java
@@ -0,0 +1,82 @@
+package net.corda.samples.lending.states;
+
+import net.corda.core.contracts.*;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.Party;
+import net.corda.samples.lending.contracts.LoanBidContract;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+@BelongsToContract(LoanBidContract.class)
+public class LoanBidState implements LinearState {
+
+ private StaticPointer projectDetails;
+ private UniqueIdentifier uniqueIdentifier;
+ private Party lender;
+ private Party borrower;
+ private int loanAmount;
+ private int tenure;
+ private double rateofInterest;
+ private int transactionFees;
+ private String status;
+
+ public LoanBidState(StaticPointer projectDetails, UniqueIdentifier uniqueIdentifier,
+ Party lender, Party borrower, int loanAmount, int tenure,
+ double rateofInterest, int transactionFees, String status) {
+ this.projectDetails = projectDetails;
+ this.uniqueIdentifier = uniqueIdentifier;
+ this.lender = lender;
+ this.borrower = borrower;
+ this.loanAmount = loanAmount;
+ this.tenure = tenure;
+ this.rateofInterest = rateofInterest;
+ this.transactionFees = transactionFees;
+ this.status = status;
+ }
+
+ public StaticPointer getProjectDetails() {
+ return projectDetails;
+ }
+
+ public Party getLender() {
+ return lender;
+ }
+
+ public Party getBorrower() {
+ return borrower;
+ }
+
+ public int getLoanAmount() {
+ return loanAmount;
+ }
+
+ public int getTenure() {
+ return tenure;
+ }
+
+ public double getRateofInterest() {
+ return rateofInterest;
+ }
+
+ public int getTransactionFees() {
+ return transactionFees;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ @NotNull
+ @Override
+ public List getParticipants() {
+ return Arrays.asList(lender, borrower);
+ }
+
+ @NotNull
+ @Override
+ public UniqueIdentifier getLinearId() {
+ return uniqueIdentifier;
+ }
+}
diff --git a/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/ProjectState.java b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/ProjectState.java
new file mode 100644
index 00000000..a4240e05
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/ProjectState.java
@@ -0,0 +1,77 @@
+package net.corda.samples.lending.states;
+
+import net.corda.core.contracts.BelongsToContract;
+import net.corda.core.contracts.LinearState;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.Party;
+import net.corda.samples.lending.contracts.ProjectContract;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+// *********
+// * ProposalState *
+// *********
+@BelongsToContract(ProjectContract.class)
+public class ProjectState implements LinearState {
+
+ //private variables
+ private UniqueIdentifier uniqueIdentifier;
+ private String projectDescription;
+ private Party borrower;
+ private int projectCost;
+ private int loanAmount;
+ private List lenders;
+
+ /* Constructor of your Corda state */
+
+ public ProjectState(UniqueIdentifier uniqueIdentifier, String projectDescription, Party borrower,
+ int projectCost, int loanAmount, List lenders) {
+ this.uniqueIdentifier = uniqueIdentifier;
+ this.projectDescription = projectDescription;
+ this.borrower = borrower;
+ this.projectCost = projectCost;
+ this.loanAmount = loanAmount;
+ this.lenders = lenders;
+ }
+
+ // getters
+
+ public String getProjectDescription() {
+ return projectDescription;
+ }
+
+ public Party getBorrower() {
+ return borrower;
+ }
+
+ public int getProjectCost() {
+ return projectCost;
+ }
+
+ public int getLoanAmount() {
+ return loanAmount;
+ }
+
+ public List getBidders() {
+ return lenders;
+ }
+
+ /* This method will indicate who are the participants when
+ * this state is used in a transaction. */
+ @Override
+ public List getParticipants() {
+ List particiants = new ArrayList<>();
+ particiants.add(borrower);
+ particiants.addAll(lenders);
+ return particiants;
+ }
+
+ @NotNull
+ @Override
+ public UniqueIdentifier getLinearId() {
+ return uniqueIdentifier;
+ }
+}
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/SyndicateBidState.java b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/SyndicateBidState.java
new file mode 100644
index 00000000..204289ba
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/SyndicateBidState.java
@@ -0,0 +1,66 @@
+package net.corda.samples.lending.states;
+
+import net.corda.core.contracts.BelongsToContract;
+import net.corda.core.contracts.LinearPointer;
+import net.corda.core.contracts.LinearState;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.Party;
+import net.corda.samples.lending.contracts.SyndicateBidContract;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+@BelongsToContract(SyndicateBidContract.class)
+public class SyndicateBidState implements LinearState {
+
+ private UniqueIdentifier uniqueIdentifier;
+ private LinearPointer syndicateState;
+ private int bidAmount;
+ private Party leadBank;
+ private Party participatBank;
+ private String status;
+
+ public SyndicateBidState(UniqueIdentifier uniqueIdentifier, LinearPointer syndicateState, int bidAmount,
+ Party leadBank, Party participatBank, String status) {
+ this.uniqueIdentifier = uniqueIdentifier;
+ this.syndicateState = syndicateState;
+ this.bidAmount = bidAmount;
+ this.leadBank = leadBank;
+ this.participatBank = participatBank;
+ this.status = status;
+ }
+
+ public LinearPointer getSyndicateState() {
+ return syndicateState;
+ }
+
+ public int getBidAmount() {
+ return bidAmount;
+ }
+
+ public Party getLeadBank() {
+ return leadBank;
+ }
+
+ public Party getParticipatBank() {
+ return participatBank;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ @NotNull
+ @Override
+ public List getParticipants() {
+ return Arrays.asList(participatBank, leadBank);
+ }
+
+ @NotNull
+ @Override
+ public UniqueIdentifier getLinearId() {
+ return uniqueIdentifier;
+ }
+}
diff --git a/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/SyndicateState.java b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/SyndicateState.java
new file mode 100644
index 00000000..0787b300
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/main/java/net/corda/samples/lending/states/SyndicateState.java
@@ -0,0 +1,62 @@
+package net.corda.samples.lending.states;
+
+import net.corda.core.contracts.*;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.Party;
+import net.corda.samples.lending.contracts.SyndicateContract;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@BelongsToContract(SyndicateContract.class)
+public class SyndicateState implements LinearState {
+
+ private UniqueIdentifier uniqueIdentifier;
+ private Party leadBank;
+ private List participantBanks;
+ private LinearPointer projectDetails;
+ private LinearPointer loanDetails;
+
+ public SyndicateState(UniqueIdentifier uniqueIdentifier, Party leadBank, List participantBanks,
+ LinearPointer projectDetails,
+ LinearPointer loanDetails) {
+ this.uniqueIdentifier = uniqueIdentifier;
+ this.leadBank = leadBank;
+ this.participantBanks = participantBanks;
+ this.projectDetails = projectDetails;
+ this.loanDetails = loanDetails;
+ }
+
+ public Party getLeadBank() {
+ return leadBank;
+ }
+
+ public List getParticipantBanks() {
+ return participantBanks;
+ }
+
+ public LinearPointer getProjectDetails() {
+ return projectDetails;
+ }
+
+ public LinearPointer getLoanDetails() {
+ return loanDetails;
+ }
+
+
+ @NotNull
+ @Override
+ public List getParticipants() {
+ List particiants = new ArrayList<>();
+ particiants.add(leadBank);
+ particiants.addAll(participantBanks);
+ return particiants;
+ }
+
+ @NotNull
+ @Override
+ public UniqueIdentifier getLinearId() {
+ return uniqueIdentifier;
+ }
+}
diff --git a/Advanced/syndicated-lending/contracts/src/test/java/net/corda/samples/lending/contracts/ContractTests.java b/Advanced/syndicated-lending/contracts/src/test/java/net/corda/samples/lending/contracts/ContractTests.java
new file mode 100644
index 00000000..04ad1485
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/test/java/net/corda/samples/lending/contracts/ContractTests.java
@@ -0,0 +1,18 @@
+package net.corda.samples.lending.contracts;
+
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.node.MockServices;
+
+import java.util.Arrays;
+
+import static net.corda.testing.node.NodeTestUtils.ledger;
+
+
+public class ContractTests {
+ private final MockServices ledgerServices = new MockServices(Arrays.asList("net.corda.samples.lending"));
+ TestIdentity alice = new TestIdentity(new CordaX500Name("Alice", "TestLand", "US"));
+ TestIdentity bob = new TestIdentity(new CordaX500Name("Alice", "TestLand", "US"));
+
+
+}
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/contracts/src/test/java/net/corda/samples/lending/contracts/StateTests.java b/Advanced/syndicated-lending/contracts/src/test/java/net/corda/samples/lending/contracts/StateTests.java
new file mode 100644
index 00000000..e886d011
--- /dev/null
+++ b/Advanced/syndicated-lending/contracts/src/test/java/net/corda/samples/lending/contracts/StateTests.java
@@ -0,0 +1,8 @@
+package net.corda.samples.lending.contracts;
+
+import net.corda.samples.lending.states.ProjectState;
+import org.junit.Test;
+
+public class StateTests {
+
+}
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/gradle.properties b/Advanced/syndicated-lending/gradle.properties
new file mode 100644
index 00000000..60bb519a
--- /dev/null
+++ b/Advanced/syndicated-lending/gradle.properties
@@ -0,0 +1,3 @@
+name=Test
+group=net.corda.samples.lending
+version=0.1
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/gradle/wrapper/gradle-wrapper.jar b/Advanced/syndicated-lending/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..99340b4a
Binary files /dev/null and b/Advanced/syndicated-lending/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Advanced/syndicated-lending/gradle/wrapper/gradle-wrapper.properties b/Advanced/syndicated-lending/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..0188225a
--- /dev/null
+++ b/Advanced/syndicated-lending/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+#Fri Aug 25 12:50:39 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+
diff --git a/Advanced/syndicated-lending/gradlew b/Advanced/syndicated-lending/gradlew
new file mode 100755
index 00000000..cccdd3d5
--- /dev/null
+++ b/Advanced/syndicated-lending/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/Advanced/syndicated-lending/gradlew.bat b/Advanced/syndicated-lending/gradlew.bat
new file mode 100644
index 00000000..f9553162
--- /dev/null
+++ b/Advanced/syndicated-lending/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Advanced/syndicated-lending/repositories.gradle b/Advanced/syndicated-lending/repositories.gradle
new file mode 100644
index 00000000..8be7b630
--- /dev/null
+++ b/Advanced/syndicated-lending/repositories.gradle
@@ -0,0 +1,8 @@
+repositories {
+ mavenLocal()
+ mavenCentral()
+
+ maven { url 'https://jitpack.io' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+}
diff --git a/Advanced/syndicated-lending/settings.gradle b/Advanced/syndicated-lending/settings.gradle
new file mode 100644
index 00000000..b4446eaf
--- /dev/null
+++ b/Advanced/syndicated-lending/settings.gradle
@@ -0,0 +1,2 @@
+include 'workflows'
+include 'contracts'
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/workflows/build.gradle b/Advanced/syndicated-lending/workflows/build.gradle
new file mode 100644
index 00000000..8a229424
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/build.gradle
@@ -0,0 +1,64 @@
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ workflow {
+ name "Lending Flows"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src/main/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+ test {
+ java {
+ srcDir 'src/test/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/test")
+ }
+ }
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ }
+}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+dependencies {
+ testCompile "junit:junit:$junit_version"
+
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+
+ // CorDapp dependencies.
+ cordapp project(":contracts")
+}
+
+task integrationTest(type: Test, dependsOn: []) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/workflows/src/integrationTest/java/net/corda/samples/lending/DriverBasedTest.java b/Advanced/syndicated-lending/workflows/src/integrationTest/java/net/corda/samples/lending/DriverBasedTest.java
new file mode 100644
index 00000000..85ec790f
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/src/integrationTest/java/net/corda/samples/lending/DriverBasedTest.java
@@ -0,0 +1,48 @@
+package net.corda.samples.lending;
+
+import com.google.common.collect.ImmutableList;
+import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.driver.DriverParameters;
+import net.corda.testing.driver.NodeHandle;
+import net.corda.testing.driver.NodeParameters;
+import org.junit.Test;
+
+import java.util.List;
+
+import static net.corda.testing.driver.Driver.driver;
+import static org.junit.Assert.assertEquals;
+
+public class DriverBasedTest {
+ private final TestIdentity bankA = new TestIdentity(new CordaX500Name("BankA", "", "GB"));
+ private final TestIdentity bankB = new TestIdentity(new CordaX500Name("BankB", "", "US"));
+
+ @Test
+ public void nodeTest() {
+ driver(new DriverParameters().withIsDebug(true).withStartNodesInProcess(true), dsl -> {
+ // Start a pair of nodes and wait for them both to be ready.
+ List> handleFutures = ImmutableList.of(
+ dsl.startNode(new NodeParameters().withProvidedName(bankA.getName())),
+ dsl.startNode(new NodeParameters().withProvidedName(bankB.getName()))
+ );
+
+ try {
+ NodeHandle partyAHandle = handleFutures.get(0).get();
+ NodeHandle partyBHandle = handleFutures.get(1).get();
+
+ // From each node, make an RPC call to retrieve another node's name from the network map, to verify that the
+ // nodes have started and can communicate.
+
+ // This is a very basic test: in practice tests would be starting flows, and verifying the states in the vault
+ // and other important metrics to ensure that your CorDapp is working as intended.
+ assertEquals(partyAHandle.getRpc().wellKnownPartyFromX500Name(bankB.getName()).getName(), bankB.getName());
+ assertEquals(partyBHandle.getRpc().wellKnownPartyFromX500Name(bankA.getName()).getName(), bankA.getName());
+ } catch (Exception e) {
+ throw new RuntimeException("Caught exception during test: ", e);
+ }
+
+ return null;
+ });
+ }
+}
\ No newline at end of file
diff --git a/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/ApproveLoanBidFlow.java b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/ApproveLoanBidFlow.java
new file mode 100644
index 00000000..776a85c6
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/ApproveLoanBidFlow.java
@@ -0,0 +1,112 @@
+package net.corda.samples.lending.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.contracts.StaticPointer;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.*;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import net.corda.samples.lending.contracts.LoanBidContract;
+import net.corda.samples.lending.states.LoanBidState;
+import net.corda.samples.lending.states.ProjectState;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ApproveLoanBidFlow {
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class Initiator extends FlowLogic {
+
+ private UniqueIdentifier bidIdentifier;
+
+ //public constructor
+ public Initiator(UniqueIdentifier bidIdentifier) {
+ this.bidIdentifier = bidIdentifier;
+ }
+
+ @Override
+ @Suspendable
+ public SignedTransaction call() throws FlowException {
+
+ List> loanBidStateAndRefs = getServiceHub().getVaultService()
+ .queryBy(LoanBidState.class).getStates();
+
+ StateAndRef inputStateAndRef = loanBidStateAndRefs.stream().filter(loanBidStateAndRef -> {
+ LoanBidState loanBidState = loanBidStateAndRef.getState().getData();
+ return loanBidState.getLinearId().equals(bidIdentifier);
+ }).findAny().orElseThrow(() -> new IllegalArgumentException("Loan Bid Not Found"));
+
+ LoanBidState inputState = inputStateAndRef.getState().getData();
+
+ final LoanBidState output = new LoanBidState(
+ new StaticPointer<>(inputStateAndRef.getRef(), ProjectState.class),
+ inputState.getLinearId(), inputState.getLender(), inputState.getBorrower(),
+ inputState.getLoanAmount(), inputState.getTenure(), inputState.getRateofInterest(),
+ inputState.getTransactionFees(), "APPROVED"
+ );
+
+ Party notary = inputStateAndRef.getState().getNotary();
+
+ // Step 3. Create a new TransactionBuilder object.
+ final TransactionBuilder builder = new TransactionBuilder(notary);
+
+ // Step 4. Add the inputs and outputs, as well as a command to the transaction builder.
+ builder.addInputState(inputStateAndRef);
+ builder.addOutputState(output);
+ builder.addCommand(new LoanBidContract.Commands.Approve(), Arrays.asList(inputState.getBorrower().getOwningKey(),inputState.getLender().getOwningKey()));
+
+ // Step 5. Verify and sign it with our KeyPair.
+ builder.verify(getServiceHub());
+ final SignedTransaction ptx = getServiceHub().signInitialTransaction(builder);
+
+ FlowSession cpSession = initiateFlow(inputState.getLender());
+
+ //step 6: collect signatures
+ SignedTransaction stx = subFlow(new CollectSignaturesFlow(ptx, Arrays.asList(cpSession)));
+
+
+ // Step 7. Assuming no exceptions, we can now finalise the transaction
+ return subFlow(new FinalityFlow(stx, Arrays.asList(cpSession)));
+ }
+ }
+
+ @InitiatedBy(Initiator.class)
+ public static class Responder extends FlowLogic {
+ //private variable
+ private FlowSession counterpartySession;
+
+ //Constructor
+ public Responder(FlowSession counterpartySession) {
+ this.counterpartySession = counterpartySession;
+ }
+
+ @Suspendable
+ @Override
+ public Void call() throws FlowException {
+ SignedTransaction signedTransaction = subFlow(new SignTransactionFlow(counterpartySession) {
+ @Suspendable
+ @Override
+ protected void checkTransaction(SignedTransaction stx) throws FlowException {
+ /*
+ * SignTransactionFlow will automatically verify the transaction and its signatures before signing it.
+ * However, just because a transaction is contractually valid doesn’t mean we necessarily want to sign.
+ * What if we don’t want to deal with the counterparty in question, or the value is too high,
+ * or we’re not happy with the transaction’s structure? checkTransaction
+ * allows us to define these additional checks. If any of these conditions are not met,
+ * we will not sign the transaction - even if the transaction and its signatures are contractually valid.
+ * ----------
+ * For this hello-world cordapp, we will not implement any aditional checks.
+ * */
+ }
+ });
+ //Stored the transaction into data base.
+ subFlow(new ReceiveFinalityFlow(counterpartySession, signedTransaction.getId()));
+ return null;
+ }
+ }
+
+}
diff --git a/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/ApproveSyndicateBidFlow.java b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/ApproveSyndicateBidFlow.java
new file mode 100644
index 00000000..b1702d49
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/ApproveSyndicateBidFlow.java
@@ -0,0 +1,113 @@
+package net.corda.samples.lending.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.*;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import net.corda.samples.lending.contracts.SyndicateBidContract;
+import net.corda.samples.lending.states.SyndicateBidState;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ApproveSyndicateBidFlow {
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class Initiator extends FlowLogic {
+ private UniqueIdentifier bidIdentifier;
+
+ //public constructor
+ public Initiator(UniqueIdentifier bidIdentifier) {
+ this.bidIdentifier = bidIdentifier;
+ }
+
+ @Override
+ @Suspendable
+ public SignedTransaction call() throws FlowException {
+
+ // Fetch Project
+ List> syndicateBidStateAndRefs = getServiceHub().getVaultService()
+ .queryBy(SyndicateBidState.class).getStates();
+
+ StateAndRef syndicateBidStateAndRef = syndicateBidStateAndRefs.stream().filter(synStateAndRef -> {
+ SyndicateBidState syndicateBidState = synStateAndRef.getState().getData();
+ return syndicateBidState.getLinearId().equals(bidIdentifier);
+ }).findAny().orElseThrow(() -> new IllegalArgumentException("Syndicate Bid Not Found"));
+
+ SyndicateBidState inputState = syndicateBidStateAndRef.getState().getData();
+
+ SyndicateBidState outputState = new SyndicateBidState(
+ inputState.getLinearId(),
+ inputState.getSyndicateState(),
+ inputState.getBidAmount(),
+ inputState.getLeadBank(),
+ inputState.getParticipatBank(),
+ "APPROVED"
+ );
+
+ Party notary = syndicateBidStateAndRef.getState().getNotary();
+
+
+ // Step 3. Create a new TransactionBuilder object.
+ final TransactionBuilder builder = new TransactionBuilder(notary);
+
+ // Step 4. Add the input and output state, as well as a command to the transaction builder.
+ builder.addInputState(syndicateBidStateAndRef);
+ builder.addOutputState(outputState);
+ builder.addCommand(new SyndicateBidContract.Commands.Submit(),
+ Arrays.asList(getOurIdentity().getOwningKey(),inputState.getParticipatBank().getOwningKey()));
+
+ // Step 5. Verify and sign it with our KeyPair.
+ builder.verify(getServiceHub());
+ final SignedTransaction ptx = getServiceHub().signInitialTransaction(builder);
+
+ FlowSession cpSession = initiateFlow(inputState.getParticipatBank());
+
+ //step 6: collect signatures
+ SignedTransaction stx = subFlow(new CollectSignaturesFlow(ptx, Arrays.asList(cpSession)));
+
+ // Step 7. Assuming no exceptions, we can now finalise the transaction
+ return subFlow(new FinalityFlow(stx, Arrays.asList(cpSession)));
+ }
+ }
+
+ @InitiatedBy(Initiator.class)
+ public static class Responder extends FlowLogic {
+ //private variable
+ private FlowSession counterpartySession;
+
+ //Constructor
+ public Responder(FlowSession counterpartySession) {
+ this.counterpartySession = counterpartySession;
+ }
+
+ @Suspendable
+ @Override
+ public Void call() throws FlowException {
+ SignedTransaction signedTransaction = subFlow(new SignTransactionFlow(counterpartySession) {
+ @Suspendable
+ @Override
+ protected void checkTransaction(SignedTransaction stx) throws FlowException {
+ /*
+ * SignTransactionFlow will automatically verify the transaction and its signatures before signing it.
+ * However, just because a transaction is contractually valid doesn’t mean we necessarily want to sign.
+ * What if we don’t want to deal with the counterparty in question, or the value is too high,
+ * or we’re not happy with the transaction’s structure? checkTransaction
+ * allows us to define these additional checks. If any of these conditions are not met,
+ * we will not sign the transaction - even if the transaction and its signatures are contractually valid.
+ * ----------
+ * For this hello-world cordapp, we will not implement any aditional checks.
+ * */
+ }
+ });
+ //Stored the transaction into data base.
+ subFlow(new ReceiveFinalityFlow(counterpartySession, signedTransaction.getId()));
+ return null;
+ }
+ }
+
+}
diff --git a/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/CreateSyndicateFlow.java b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/CreateSyndicateFlow.java
new file mode 100644
index 00000000..bdf1c264
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/CreateSyndicateFlow.java
@@ -0,0 +1,116 @@
+package net.corda.samples.lending.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import net.corda.core.contracts.LinearPointer;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.contracts.StaticPointer;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.core.node.StatesToRecord;
+import net.corda.core.node.services.Vault;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import net.corda.samples.lending.contracts.SyndicateContract;
+import net.corda.samples.lending.states.LoanBidState;
+import net.corda.samples.lending.states.ProjectState;
+import net.corda.samples.lending.states.SyndicateState;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class CreateSyndicateFlow {
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class Initiator extends FlowLogic {
+
+ private Party leadBank;
+ private List participantBanks;
+ private UniqueIdentifier projectIdentifier;
+ private UniqueIdentifier loanDetailIdentifier;
+
+ //public constructor
+ public Initiator(List participantBanks, UniqueIdentifier projectIdentifier, UniqueIdentifier loanDetailIdentifier) {
+ this.participantBanks = participantBanks;
+ this.projectIdentifier = projectIdentifier;
+ this.loanDetailIdentifier = loanDetailIdentifier;
+ }
+
+ @Override
+ @Suspendable
+ public SignedTransaction call() throws FlowException {
+
+ // Step 1. Get a reference to the notary service on our network and our key pair.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
+
+ this.leadBank = getOurIdentity();
+
+ // Fetch Project
+ List> projectStateAndRefs = getServiceHub().getVaultService()
+ .queryBy(ProjectState.class).getStates();
+
+ StateAndRef projectDetailStateAndRef = projectStateAndRefs.stream().filter(projectStateAndRef -> {
+ ProjectState projectState = projectStateAndRef.getState().getData();
+ return projectState.getLinearId().equals(projectIdentifier);
+ }).findAny().orElseThrow(() -> new IllegalArgumentException("Project Not Found"));
+
+ // Fetch Loan
+ List> loanBidStateAndRefs = getServiceHub().getVaultService()
+ .queryBy(LoanBidState.class).getStates();
+
+ StateAndRef loanStateAndRef = loanBidStateAndRefs.stream().filter(loanBidStateAndRef -> {
+ LoanBidState loanBidState = loanBidStateAndRef.getState().getData();
+ return loanBidState.getLinearId().equals(loanDetailIdentifier);
+ }).findAny().orElseThrow(() -> new IllegalArgumentException("Loan Details Not Found"));
+
+ SyndicateState syndicateState = new SyndicateState(
+ new UniqueIdentifier(), leadBank, participantBanks,
+ new LinearPointer<>(projectIdentifier, ProjectState.class),
+ new LinearPointer<>(loanDetailIdentifier, LoanBidState.class)
+ //Collections.emptyList()
+ );
+
+
+ // Step 3. Create a new TransactionBuilder object.
+ final TransactionBuilder builder = new TransactionBuilder(notary);
+
+ // Step 4. Add the project as an output state, as well as a command to the transaction builder.
+ builder.addOutputState(syndicateState);
+ builder.addCommand(new SyndicateContract.Commands.Create(), Arrays.asList(syndicateState.getLeadBank().getOwningKey()));
+
+ // Step 5. Verify and sign it with our KeyPair.
+ builder.verify(getServiceHub());
+ final SignedTransaction ptx = getServiceHub().signInitialTransaction(builder);
+
+ List cpSesions = participantBanks.stream().map(this::initiateFlow).collect(Collectors.toList());
+
+ // Step 7. Assuming no exceptions, we can now finalise the transaction
+ return subFlow(new FinalityFlow(ptx, cpSesions));
+ }
+ }
+
+ @InitiatedBy(Initiator.class)
+ public static class Responder extends FlowLogic {
+ //private variable
+ private FlowSession counterpartySession;
+
+ //Constructor
+ public Responder(FlowSession counterpartySession) {
+ this.counterpartySession = counterpartySession;
+ }
+
+ @Suspendable
+ @Override
+ public Void call() throws FlowException {
+ //Stored the transaction into data base.
+ subFlow(new ReceiveFinalityFlow(counterpartySession, null, StatesToRecord.ALL_VISIBLE));
+ return null;
+ }
+ }
+
+}
diff --git a/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/SubmitLoanBidFlow.java b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/SubmitLoanBidFlow.java
new file mode 100644
index 00000000..fe2f9980
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/SubmitLoanBidFlow.java
@@ -0,0 +1,108 @@
+package net.corda.samples.lending.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.contracts.StatePointer;
+import net.corda.core.contracts.StaticPointer;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.*;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import net.corda.samples.lending.contracts.LoanBidContract;
+import net.corda.samples.lending.contracts.ProjectContract;
+import net.corda.samples.lending.states.LoanBidState;
+import net.corda.samples.lending.states.ProjectState;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class SubmitLoanBidFlow {
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class Initiator extends FlowLogic{
+
+ private Party borrower;
+ private Party lender;
+ private int loanAmount;
+ private int tenure;
+ private double rateofInterest;
+ private int transactionFees;
+ private UniqueIdentifier projectIdentifier;
+
+ //public constructor
+ public Initiator(Party borrower, int loanAmount, int tenure, double rateofInterest, int transactionFees,
+ UniqueIdentifier projectIdentifier) {
+ this.borrower = borrower;
+ this.loanAmount = loanAmount;
+ this.tenure = tenure;
+ this.rateofInterest = rateofInterest;
+ this.transactionFees = transactionFees;
+ this.projectIdentifier = projectIdentifier;
+ }
+
+ @Override
+ @Suspendable
+ public SignedTransaction call() throws FlowException {
+ this.lender = getOurIdentity();
+
+
+ List> projectStateAndRefs = getServiceHub().getVaultService()
+ .queryBy(ProjectState.class).getStates();
+
+ StateAndRef inputStateAndRef = projectStateAndRefs.stream().filter(projectStateAndRef -> {
+ ProjectState projectState = projectStateAndRef.getState().getData();
+ return projectState.getLinearId().equals(projectIdentifier);
+ }).findAny().orElseThrow(() -> new IllegalArgumentException("Project Not Found"));
+
+ Party notary = inputStateAndRef.getState().getNotary();
+
+ final LoanBidState output = new LoanBidState(
+ new StaticPointer<>(inputStateAndRef.getRef(), ProjectState.class),
+ new UniqueIdentifier(),
+ lender, borrower,
+ loanAmount, tenure, rateofInterest, transactionFees,
+ "SUBMITTED"
+ );
+
+ // Step 3. Create a new TransactionBuilder object.
+ final TransactionBuilder builder = new TransactionBuilder(notary);
+
+ // Step 4. Add the project as an output state, as well as a command to the transaction builder.
+ builder.addOutputState(output);
+ builder.addCommand(new LoanBidContract.Commands.Submit(), Arrays.asList(lender.getOwningKey()));
+
+ // Step 5. Verify and sign it with our KeyPair.
+ builder.verify(getServiceHub());
+ final SignedTransaction ptx = getServiceHub().signInitialTransaction(builder);
+
+ FlowSession cpSession = initiateFlow(borrower);
+
+ // Step 7. Assuming no exceptions, we can now finalise the transaction
+ return subFlow(new FinalityFlow(ptx, Arrays.asList(cpSession)));
+ }
+ }
+
+ @InitiatedBy(Initiator.class)
+ public static class Responder extends FlowLogic{
+ //private variable
+ private FlowSession counterpartySession;
+
+ //Constructor
+ public Responder(FlowSession counterpartySession) {
+ this.counterpartySession = counterpartySession;
+ }
+
+ @Suspendable
+ @Override
+ public Void call() throws FlowException {
+
+ //Stored the transaction into data base.
+ subFlow(new ReceiveFinalityFlow(counterpartySession));
+ return null;
+ }
+ }
+
+}
diff --git a/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/SubmitProjectProposalFlow.java b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/SubmitProjectProposalFlow.java
new file mode 100644
index 00000000..036f7f18
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/SubmitProjectProposalFlow.java
@@ -0,0 +1,90 @@
+package net.corda.samples.lending.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import net.corda.samples.lending.contracts.ProjectContract;
+import net.corda.samples.lending.states.ProjectState;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class SubmitProjectProposalFlow {
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class Initiator extends FlowLogic{
+
+ private Party borrower;
+ private List lenders;
+ private String projectDescription;
+ private int projectCost;
+ private int loanAmount;
+
+ //public constructor
+ public Initiator(List lenders, String projectDescription, int projectCost, int loanAmount) {
+ this.lenders = lenders;
+ this.projectDescription = projectDescription;
+ this.projectCost = projectCost;
+ this.loanAmount = loanAmount;
+ }
+
+ @Override
+ @Suspendable
+ public SignedTransaction call() throws FlowException {
+ this.borrower = getOurIdentity();
+
+ // Step 1. Get a reference to the notary service on our network and our key pair.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
+
+ //Compose the State that carries the Hello World message
+ final ProjectState output = new ProjectState(new UniqueIdentifier(), projectDescription, borrower,
+ projectCost, loanAmount, lenders);
+
+ // Step 3. Create a new TransactionBuilder object.
+ final TransactionBuilder builder = new TransactionBuilder(notary);
+
+ // Step 4. Add the project as an output state, as well as a command to the transaction builder.
+ builder.addOutputState(output);
+ builder.addCommand(new ProjectContract.Commands.ProposeProject(), Collections.singletonList(borrower.getOwningKey()));
+
+ // Step 5. Verify and sign it with our KeyPair.
+ builder.verify(getServiceHub());
+ final SignedTransaction ptx = getServiceHub().signInitialTransaction(builder);
+
+ List cpSesions = lenders.stream().map(this::initiateFlow).collect(Collectors.toList());
+
+ // Step 7. Assuming no exceptions, we can now finalise the transaction
+ return subFlow(new FinalityFlow(ptx, cpSesions));
+ }
+ }
+
+ @InitiatedBy(Initiator.class)
+ public static class Responder extends FlowLogic{
+ //private variable
+ private FlowSession counterpartySession;
+
+ //Constructor
+ public Responder(FlowSession counterpartySession) {
+ this.counterpartySession = counterpartySession;
+ }
+
+ @Suspendable
+ @Override
+ public Void call() throws FlowException {
+
+ //Stored the transaction into data base.
+ subFlow(new ReceiveFinalityFlow(counterpartySession));
+ return null;
+ }
+ }
+
+}
diff --git a/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/SubmitSyndicateBidFlow.java b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/SubmitSyndicateBidFlow.java
new file mode 100644
index 00000000..b1740ec6
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/src/main/java/net/corda/samples/lending/flows/SubmitSyndicateBidFlow.java
@@ -0,0 +1,97 @@
+package net.corda.samples.lending.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import net.corda.core.contracts.LinearPointer;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import net.corda.samples.lending.contracts.SyndicateBidContract;
+import net.corda.samples.lending.states.SyndicateBidState;
+import net.corda.samples.lending.states.SyndicateState;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class SubmitSyndicateBidFlow {
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class Initiator extends FlowLogic {
+ private UniqueIdentifier syndicateIdentifier;
+ private int bidAmount;
+
+ //public constructor
+ public Initiator(UniqueIdentifier syndicateIdentifier, int bidAmount) {
+ this.syndicateIdentifier = syndicateIdentifier;
+ this.bidAmount = bidAmount;
+ }
+
+ @Override
+ @Suspendable
+ public SignedTransaction call() throws FlowException {
+
+ // Fetch Project
+ List> syndicateStateAndRefs = getServiceHub().getVaultService()
+ .queryBy(SyndicateState.class).getStates();
+
+ StateAndRef syndicateStateAndRef = syndicateStateAndRefs.stream().filter(synStateAndRef -> {
+ SyndicateState syndicateState = synStateAndRef.getState().getData();
+ return syndicateState.getLinearId().equals(syndicateIdentifier);
+ }).findAny().orElseThrow(() -> new IllegalArgumentException("Syndicate Not Found"));
+
+ SyndicateState syndicateState = syndicateStateAndRef.getState().getData();
+
+ SyndicateBidState syndicateBidState = new SyndicateBidState(
+ new UniqueIdentifier(),
+ new LinearPointer<>(syndicateIdentifier, SyndicateState.class),
+ bidAmount,
+ syndicateState.getLeadBank(),
+ getOurIdentity(),
+ "SUBMITTED"
+ );
+
+ Party notary = syndicateStateAndRef.getState().getNotary();
+
+ // Step 3. Create a new TransactionBuilder object.
+ final TransactionBuilder builder = new TransactionBuilder(notary);
+
+ // Step 4. Add the project as an output state, as well as a command to the transaction builder.
+ builder.addOutputState(syndicateBidState);
+ builder.addCommand(new SyndicateBidContract.Commands.Submit(), Arrays.asList(getOurIdentity().getOwningKey()));
+
+ // Step 5. Verify and sign it with our KeyPair.
+ builder.verify(getServiceHub());
+ final SignedTransaction ptx = getServiceHub().signInitialTransaction(builder);
+
+ FlowSession cpSession = initiateFlow(syndicateState.getLeadBank());
+
+ // Step 7. Assuming no exceptions, we can now finalise the transaction
+ return subFlow(new FinalityFlow(ptx, Arrays.asList(cpSession)));
+ }
+ }
+
+ @InitiatedBy(Initiator.class)
+ public static class Responder extends FlowLogic {
+ //private variable
+ private FlowSession counterpartySession;
+
+ //Constructor
+ public Responder(FlowSession counterpartySession) {
+ this.counterpartySession = counterpartySession;
+ }
+
+ @Suspendable
+ @Override
+ public Void call() throws FlowException {
+
+ //Stored the transaction into data base.
+ subFlow(new ReceiveFinalityFlow(counterpartySession));
+ return null;
+ }
+ }
+
+}
diff --git a/Advanced/syndicated-lending/workflows/src/test/java/net/corda/samples/lending/AllInOneTester.java b/Advanced/syndicated-lending/workflows/src/test/java/net/corda/samples/lending/AllInOneTester.java
new file mode 100644
index 00000000..bfe225ec
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/src/test/java/net/corda/samples/lending/AllInOneTester.java
@@ -0,0 +1,113 @@
+package net.corda.samples.lending;
+
+import com.google.common.collect.ImmutableList;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.core.node.NetworkParameters;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.samples.lending.flows.*;
+import net.corda.samples.lending.states.LoanBidState;
+import net.corda.samples.lending.states.ProjectState;
+import net.corda.samples.lending.states.SyndicateBidState;
+import net.corda.samples.lending.states.SyndicateState;
+import net.corda.testing.node.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.concurrent.Future;
+
+import static org.junit.Assert.assertEquals;
+
+public class AllInOneTester {
+
+ private MockNetwork network;
+ private StartedMockNode bankA;
+ private StartedMockNode bankB;
+ private StartedMockNode bankC;
+ private StartedMockNode borrower;
+ private NetworkParameters testNetworkParameters =
+ new NetworkParameters(4, Arrays.asList(), 10485760, (10485760 * 5), Instant.now(),1, new LinkedHashMap<>());
+ @Before
+ public void setup() {
+ network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
+ TestCordapp.findCordapp("net.corda.samples.lending.contracts"),
+ TestCordapp.findCordapp("net.corda.samples.lending.flows")))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
+ .withNetworkParameters(testNetworkParameters));
+ borrower = network.createPartyNode(null);
+ bankA = network.createPartyNode(null);
+ bankB = network.createPartyNode(null);
+ bankC = network.createPartyNode(null);
+ network.runNetwork();
+ }
+
+ @After
+ public void tearDown() {
+ network.stopNodes();
+ }
+
+ @Test
+ public void AllBusinessLogicFlowTests() {
+ //Create the project
+ List lenders = new ArrayList();
+ lenders.add(bankA.getInfo().getLegalIdentities().get(0));
+ lenders.add(bankB.getInfo().getLegalIdentities().get(0));
+ SubmitProjectProposalFlow.Initiator createProjectFlow = new SubmitProjectProposalFlow.Initiator(lenders, "oversea expansion", 100, 10);
+ Future future = borrower.startFlow(createProjectFlow);
+ network.runNetwork();
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ QueryCriteria inputCriteria = new QueryCriteria.VaultQueryCriteria().withStatus(Vault.StateStatus.UNCONSUMED);
+ ProjectState project = bankA.getServices().getVaultService().queryBy(ProjectState.class,inputCriteria).getStates().get(0).getState().getData();
+
+ //place loan bid
+ UniqueIdentifier projectID = project.getLinearId();
+ SubmitLoanBidFlow.Initiator submitLoanBidFlow = new SubmitLoanBidFlow.Initiator(borrower.getInfo().getLegalIdentities().get(0), 7, 5, 4.0, 1, projectID);
+ Future future2 = bankA.startFlow(submitLoanBidFlow);
+ network.runNetwork();
+ LoanBidState loanBid = borrower.getServices().getVaultService().queryBy(LoanBidState.class,inputCriteria).getStates().get(0).getState().getData();
+
+ //Borrower approves the loan bid. pick the winning bank
+ UniqueIdentifier loanBidId = loanBid.getLinearId();
+ ApproveLoanBidFlow.Initiator approveLoanBidFlow = new ApproveLoanBidFlow.Initiator(loanBidId);
+ Future future3 = borrower.startFlow(approveLoanBidFlow);
+ network.runNetwork();
+ LoanBidState loanBidApproved = bankA.getServices().getVaultService().queryBy(LoanBidState.class,inputCriteria).getStates().get(0).getState().getData();
+ assertEquals("APPROVED", loanBidApproved.getStatus());
+
+ //lead bank create Syndication
+ UniqueIdentifier approveLoanBidID = loanBidApproved.getLinearId();
+ List participatingBanks = new ArrayList();
+ participatingBanks.add(bankB.getInfo().getLegalIdentities().get(0));
+ participatingBanks.add(bankC.getInfo().getLegalIdentities().get(0));
+ CreateSyndicateFlow.Initiator createSyndication = new CreateSyndicateFlow.Initiator(participatingBanks, projectID, approveLoanBidID);
+ Future future4 = bankA.startFlow(createSyndication);
+ network.runNetwork();
+ SyndicateState syndication = bankA.getServices().getVaultService().queryBy(SyndicateState.class,inputCriteria).getStates().get(0).getState().getData();
+
+ //participating bank submit syndication bid
+ UniqueIdentifier syndicationID = syndication.getLinearId();
+ SubmitSyndicateBidFlow.Initiator submitSyndicationBid = new SubmitSyndicateBidFlow.Initiator(syndicationID,2);
+ Future future5 = bankB.startFlow(submitSyndicationBid);
+ network.runNetwork();
+ SyndicateBidState syndicatedBid = bankA.getServices().getVaultService().queryBy(SyndicateBidState.class,inputCriteria).getStates().get(0).getState().getData();
+
+ //Lead bank approves syndication bid
+ UniqueIdentifier syndicationBidId = syndicatedBid.getLinearId();
+ ApproveSyndicateBidFlow.Initiator approveSyndicationBid = new ApproveSyndicateBidFlow.Initiator(syndicationBidId);
+ Future future6 = bankA.startFlow(approveSyndicationBid);
+ network.runNetwork();
+ SyndicateBidState syndicatedBidApproved = bankA.getServices().getVaultService().queryBy(SyndicateBidState.class,inputCriteria).getStates().get(0).getState().getData();
+ assertEquals("APPROVED", syndicatedBidApproved.getStatus());
+
+ }
+}
diff --git a/Advanced/syndicated-lending/workflows/src/test/java/net/corda/samples/lending/FlowTests.java b/Advanced/syndicated-lending/workflows/src/test/java/net/corda/samples/lending/FlowTests.java
new file mode 100644
index 00000000..2f2ab817
--- /dev/null
+++ b/Advanced/syndicated-lending/workflows/src/test/java/net/corda/samples/lending/FlowTests.java
@@ -0,0 +1,104 @@
+package net.corda.samples.lending;
+
+import com.google.common.collect.ImmutableList;
+import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.samples.lending.flows.ApproveLoanBidFlow;
+import net.corda.samples.lending.flows.SubmitLoanBidFlow;
+import net.corda.samples.lending.flows.SubmitProjectProposalFlow;
+import net.corda.samples.lending.states.LoanBidState;
+import net.corda.samples.lending.states.ProjectState;
+import net.corda.testing.node.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+import static org.junit.Assert.*;
+
+public class FlowTests {
+ private MockNetwork network;
+ private StartedMockNode a;
+ private StartedMockNode b;
+ private StartedMockNode c;
+ private StartedMockNode d;
+
+ @Before
+ public void setup() {
+ network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
+ TestCordapp.findCordapp("net.corda.samples.lending.contracts"),
+ TestCordapp.findCordapp("net.corda.samples.lending.flows")))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB")))));
+ a = network.createPartyNode(null);
+ b = network.createPartyNode(null);
+ c = network.createPartyNode(null);
+ d = network.createPartyNode(null);
+ network.runNetwork();
+ }
+
+ @After
+ public void tearDown() {
+ network.stopNodes();
+ }
+
+ private ProjectState createProject() throws Exception{
+ SubmitProjectProposalFlow.Initiator flow = new SubmitProjectProposalFlow.Initiator(
+ Arrays.asList(
+ b.getInfo().getLegalIdentities().get(0),
+ c.getInfo().getLegalIdentities().get(0)),
+ "Test Project", 10000000, 8000000);
+ CordaFuture future = a.startFlow(flow);
+ network.runNetwork();
+ SignedTransaction transaction = future.get();
+ ProjectState projectState = (ProjectState) transaction.getTx().getOutput(0);
+ return projectState;
+ }
+
+ private LoanBidState submitLoanBid(ProjectState projectState) throws Exception{
+ SubmitLoanBidFlow.Initiator flow = new SubmitLoanBidFlow.Initiator(
+ projectState.getBorrower(),
+ 8000000, 5, 8, 20000,
+ projectState.getLinearId()
+ );
+ CordaFuture future = b.startFlow(flow);
+ network.runNetwork();
+ SignedTransaction transaction = future.get();
+ LoanBidState loanBidState = (LoanBidState) transaction.getTx().getOutput(0);
+ return loanBidState;
+ }
+
+ private LoanBidState approveLoanBid(LoanBidState loanBidState) throws Exception{
+ ApproveLoanBidFlow.Initiator flow = new ApproveLoanBidFlow.Initiator(loanBidState.getLinearId());
+ CordaFuture future = a.startFlow(flow);
+ network.runNetwork();
+ SignedTransaction transaction = future.get();
+ LoanBidState loanBidStateUpdated = (LoanBidState) transaction.getTx().getOutput(0);
+ return loanBidStateUpdated;
+ }
+
+ @Test
+ public void testSubmitProjectProposalFlow() throws Exception{
+ ProjectState projectState = createProject();
+ assertNotNull(projectState);
+ }
+
+ @Test
+ public void testSubmitLoanBidFlow() throws Exception{
+ ProjectState projectState = createProject();
+ LoanBidState loanBidState = submitLoanBid(projectState);
+ assertNotNull(loanBidState);
+ }
+
+ @Test
+ public void testApproveLoanBidFlow() throws Exception{
+ ProjectState projectState = createProject();
+ LoanBidState loanBidState = submitLoanBid(projectState);
+ LoanBidState loanBidStateApproved = approveLoanBid(loanBidState);
+ assertNotNull(loanBidStateApproved);
+ assertEquals("APPROVED", loanBidStateApproved.getStatus());
+ }
+
+
+}
diff --git a/Basic/constants.properties b/Basic/constants.properties
index 2cd5a28c..eb9e0ed4 100644
--- a/Basic/constants.properties
+++ b/Basic/constants.properties
@@ -1,12 +1,12 @@
cordaReleaseGroup=net.corda
cordaCoreReleaseGroup=net.corda
-cordaVersion=4.6
-cordaCoreVersion=4.6
+cordaVersion=4.10
+cordaCoreVersion=4.10
gradlePluginsVersion=5.0.12
kotlinVersion=1.2.71
junitVersion=4.12
quasarVersion=0.7.10
-log4jVersion =2.11.2
-platformVersion=8
+log4jVersion =2.17.1
+platformVersion=10
slf4jVersion=1.7.25
nettyVersion=4.1.22.Final
diff --git a/Basic/cordapp-example/.idea/jarRepositories.xml b/Basic/cordapp-example/.idea/jarRepositories.xml
index 580d46d3..554006bf 100644
--- a/Basic/cordapp-example/.idea/jarRepositories.xml
+++ b/Basic/cordapp-example/.idea/jarRepositories.xml
@@ -26,11 +26,6 @@
-
-
-
+
false
-
+
@@ -171,18 +180,18 @@
+
diff --git a/Basic/cordapp-example/README.md b/Basic/cordapp-example/README.md
index 68ddc4ed..f5c93e7f 100644
--- a/Basic/cordapp-example/README.md
+++ b/Basic/cordapp-example/README.md
@@ -1,7 +1,5 @@
-# cordapp-example
+# CorDapp Example
-This repo is the implementation of the tutorial cordapp.
+This repo is the implementation of the tutorial CorDapp.
-You can find that tutorial here:
-
-https://docs.corda.net/docs/corda-os/4.7/quickstart-deploy.html#running-the-example-cordapp
+You can find the tutorial for this example [here](https://docs.r3.com/en/platform/corda/4.10/community/tutorial-cordapp.html).
diff --git a/Basic/cordapp-example/build.gradle b/Basic/cordapp-example/build.gradle
index 0aaa0341..4a2b09df 100644
--- a/Basic/cordapp-example/build.gradle
+++ b/Basic/cordapp-example/build.gradle
@@ -22,8 +22,8 @@ buildscript {//properties that you need to build the project
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -40,9 +40,8 @@ allprojects {//Properties that you need to compile your project (The application
repositories {
mavenLocal()
- jcenter()
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://jitpack.io' }
}
@@ -69,11 +68,13 @@ sourceSets {
}
}
}
-//Module dependencis
+//Module dependencies
dependencies {
// Corda dependencies.
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
- cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
+ cordaCompile ("$corda_release_group:corda-node-api:$corda_release_version") {
+ exclude group: "ch.qos.logback", module: "logback-classic"
+ }
cordaRuntime "$corda_release_group:corda:$corda_release_version"
// CorDapp dependencies.
@@ -83,6 +84,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:$corda_release_version"
+
}
//Task to deploy the nodes in order to bootstrap a network
diff --git a/Basic/cordapp-example/clients/build.gradle b/Basic/cordapp-example/clients/build.gradle
index 7ea1f1ec..bff3b3ff 100644
--- a/Basic/cordapp-example/clients/build.gradle
+++ b/Basic/cordapp-example/clients/build.gradle
@@ -10,7 +10,9 @@ sourceSets {
dependencies {
// Corda dependencies.
- compile "$corda_release_group:corda-rpc:$corda_release_version"
+ compile ("$corda_release_group:corda-rpc:$corda_release_version") {
+ exclude group: "ch.qos.logback", module: "logback-classic"
+ }
compile "net.corda:corda-jackson:$corda_release_version"
// CorDapp dependencies.
diff --git a/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/contracts/IOUContract.java b/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/contracts/IOUContract.java
index e42f6347..59d9cc85 100644
--- a/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/contracts/IOUContract.java
+++ b/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/contracts/IOUContract.java
@@ -13,7 +13,7 @@
import static net.corda.core.contracts.ContractsDSL.requireThat;
/**
- * A implementation of a basic smart contracts in Corda.
+ * An implementation of a basic smart contract in Corda.
*
* This contracts enforces rules regarding the creation of a valid [IOUState], which in turn encapsulates an [IOU].
*
@@ -22,13 +22,13 @@
* - One output states: the new [IOU].
* - An Create() command with the public keys of both the lender and the borrower.
*
- * All contracts must sub-class the [Contract] interface.
+ * All contracts must subclass the [Contract] interface.
*/
public class IOUContract implements Contract {
public static final String ID = "net.corda.samples.example.contracts.IOUContract";
/**
- * The verify() function of all the states' contracts must not throw an exception for a transaction to be
+ * The "verify()" function of all the states' contracts must not throw an exception for a transaction to be
* considered valid.
*/
@Override
diff --git a/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/schema/IOUSchemaV1.java b/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/schema/IOUSchemaV1.java
index 3ef15e1c..7dde06a2 100644
--- a/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/schema/IOUSchemaV1.java
+++ b/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/schema/IOUSchemaV1.java
@@ -31,7 +31,7 @@ public String getMigrationResource() {
public static class PersistentIOU extends PersistentState {
@Column(name = "lender") private final String lender;
@Column(name = "borrower") private final String borrower;
- @Column(name = "value") private final int value;
+ @Column(name = "iou_value") private final int value;
@Column(name = "linear_id") @Type (type = "uuid-char") private final UUID linearId;
diff --git a/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/states/IOUState.java b/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/states/IOUState.java
index 1f8708e9..ab966a81 100644
--- a/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/states/IOUState.java
+++ b/Basic/cordapp-example/contracts/src/main/java/net/corda/samples/example/states/IOUState.java
@@ -30,6 +30,7 @@ public class IOUState implements LinearState, QueryableState {
* @param value the value of the IOU.
* @param lender the party issuing the IOU.
* @param borrower the party receiving and approving the IOU.
+ * @param linearId the unique identifier of the IOU state.
*/
public IOUState(Integer value,
Party lender,
diff --git a/Basic/cordapp-example/repositories.gradle b/Basic/cordapp-example/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/Basic/cordapp-example/repositories.gradle
+++ b/Basic/cordapp-example/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Basic/cordapp-example/workflows/src/main/java/net/corda/samples/example/flows/ExampleFlow.java b/Basic/cordapp-example/workflows/src/main/java/net/corda/samples/example/flows/ExampleFlow.java
index b355aa7e..30ade19d 100644
--- a/Basic/cordapp-example/workflows/src/main/java/net/corda/samples/example/flows/ExampleFlow.java
+++ b/Basic/cordapp-example/workflows/src/main/java/net/corda/samples/example/flows/ExampleFlow.java
@@ -17,6 +17,7 @@
import java.util.Arrays;
import static net.corda.core.contracts.ContractsDSL.requireThat;
+import net.corda.core.identity.CordaX500Name;
/**
* This flow allows two parties (the [Initiator] and the [Acceptor]) to come to an agreement about the IOU encapsulated
@@ -25,9 +26,9 @@
* In our simple example, the [Acceptor] always accepts a valid IOU.
*
* These flows have deliberately been implemented by using only the call() method for ease of understanding. In
- * practice we would recommend splitting up the various stages of the flow into sub-routines.
+ * practice, we would recommend splitting up the various stages of the flow into sub-routines.
*
- * All methods called within the [FlowLogic] sub-class need to be annotated with the @Suspendable annotation.
+ * All methods called within the [FlowLogic] subclass need to be annotated with the @Suspendable annotation.
*/
public class ExampleFlow {
@InitiatingFlow
@@ -82,13 +83,8 @@ public ProgressTracker getProgressTracker() {
public SignedTransaction call() throws FlowException {
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
// Stage 1.
progressTracker.setCurrentStep(GENERATING_TRANSACTION);
diff --git a/Basic/cordapp-example/workflows/src/main/resources/migration/iou.changelog-v1.xml b/Basic/cordapp-example/workflows/src/main/resources/migration/iou.changelog-v1.xml
index 660d7b3a..9d5e67b1 100644
--- a/Basic/cordapp-example/workflows/src/main/resources/migration/iou.changelog-v1.xml
+++ b/Basic/cordapp-example/workflows/src/main/resources/migration/iou.changelog-v1.xml
@@ -7,7 +7,7 @@
+
+
+ logs
+ node-${hostName}
+ ${log-path}/archive
+
+
+
+
+
+
+ %highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Basic/tutorial-applestamp/config/test/log4j2.xml b/Basic/tutorial-applestamp/config/test/log4j2.xml
new file mode 100644
index 00000000..cd9926ca
--- /dev/null
+++ b/Basic/tutorial-applestamp/config/test/log4j2.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
+ >
+
+
+
+
+
+
+
+
+
+
diff --git a/Basic/tutorial-applestamp/contracts/build.gradle b/Basic/tutorial-applestamp/contracts/build.gradle
new file mode 100644
index 00000000..b23fdd2b
--- /dev/null
+++ b/Basic/tutorial-applestamp/contracts/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ contract {
+ name "4.8LTS Tutorial Contracts"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+}
+
+sourceSets {
+ main{
+ java {
+ srcDir 'src/main/java'
+ java.outputDir = file('bin/main')
+ }
+ }
+ test{
+ java{
+ srcDir 'src/test/java'
+ java.outputDir = file('bin/test')
+ }
+ }
+}
+
+dependencies {
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+}
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/AppleStampContract.java b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/AppleStampContract.java
new file mode 100644
index 00000000..2cb58b67
--- /dev/null
+++ b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/AppleStampContract.java
@@ -0,0 +1,44 @@
+package com.tutorial.contracts;
+
+import com.tutorial.states.AppleStamp;
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.transactions.LedgerTransaction;
+import org.jetbrains.annotations.NotNull;
+
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+public class AppleStampContract implements Contract {
+
+ // This is used to identify our contract when building a transaction.
+ public static final String ID = "com.tutorial.contracts.AppleStampContract";
+
+ @Override
+ public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
+
+ //Extract the command from the transaction.
+ final CommandData commandData = tx.getCommands().get(0).getValue();
+
+ //Verify the transaction according to the intention of the transaction
+ if (commandData instanceof AppleStampContract.Commands.Issue) {
+ AppleStamp output = tx.outputsOfType(AppleStamp.class).get(0);
+ requireThat(require -> {
+ require.using("This transaction should only have one AppleStamp state as output", tx.getOutputs().size() == 1);
+ require.using("The output AppleStamp state should have clear description of the type of redeemable goods", !output.getStampDesc().equals(""));
+ return null;
+ });
+ } else if (commandData instanceof BasketOfApplesContract.Commands.Redeem) {
+ //Transaction verification will happen in BasketOfApples Contract
+ } else {
+ //Unrecognized Command type
+ throw new IllegalArgumentException("Incorrect type of AppleStamp Commands");
+ }
+ }
+
+ // Used to indicate the transaction's intent.
+ public interface Commands extends CommandData {
+ //In our hello-world app, We will have two commands.
+ class Issue implements AppleStampContract.Commands {
+ }
+ }
+}
diff --git a/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/BasketOfApplesContract.java b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/BasketOfApplesContract.java
new file mode 100644
index 00000000..ecf7efdc
--- /dev/null
+++ b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/BasketOfApplesContract.java
@@ -0,0 +1,56 @@
+package com.tutorial.contracts;
+
+import com.tutorial.states.AppleStamp;
+import com.tutorial.states.BasketOfApples;
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.transactions.LedgerTransaction;
+import org.jetbrains.annotations.NotNull;
+
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+public class BasketOfApplesContract implements Contract {
+
+ // This is used to identify our contract when building a transaction.
+ public static final String ID = "com.tutorial.contracts.BasketOfApplesContract";
+
+ @Override
+ public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
+ //Extract the command from the transaction.
+ final CommandData commandData = tx.getCommands().get(0).getValue();
+
+ if (commandData instanceof BasketOfApplesContract.Commands.packBasket) {
+ BasketOfApples output = tx.outputsOfType(BasketOfApples.class).get(0);
+ requireThat(require -> {
+ require.using("This transaction should only output one BasketOfApples state", tx.getOutputs().size() == 1);
+ require.using("The output BasketOfApples state should have clear description of Apple product", !output.getDescription().equals(""));
+ require.using("The output BasketOfApples state should have non zero weight", output.getWeight() > 0);
+ return null;
+ });
+ } else if (commandData instanceof BasketOfApplesContract.Commands.Redeem) {
+ //Retrieve the output state of the transaction
+ AppleStamp input = tx.inputsOfType(AppleStamp.class).get(0);
+ BasketOfApples output = tx.outputsOfType(BasketOfApples.class).get(0);
+
+ //Using Corda DSL function requireThat to replicate conditions-checks
+ requireThat(require -> {
+ require.using("This transaction should consume two states", tx.getInputStates().size() == 2);
+ require.using("The issuer of the Apple stamp should be the producing farm of this basket of apple", input.getIssuer().equals(output.getFarm()));
+ require.using("The basket of apple has to weight more than 0", output.getWeight() > 0);
+ return null;
+ });
+ } else {
+ //Unrecognized Command type
+ throw new IllegalArgumentException("Incorrect type of BasketOfApples Commands");
+ }
+ }
+
+ // Used to indicate the transaction's intent.
+ public interface Commands extends CommandData {
+ class packBasket implements BasketOfApplesContract.Commands {
+ }
+
+ class Redeem implements BasketOfApplesContract.Commands {
+ }
+ }
+}
diff --git a/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/TemplateContract.java b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/TemplateContract.java
new file mode 100644
index 00000000..b6c71bb4
--- /dev/null
+++ b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/contracts/TemplateContract.java
@@ -0,0 +1,46 @@
+package com.tutorial.contracts;
+
+import com.tutorial.states.TemplateState;
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.transactions.LedgerTransaction;
+
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+// ************
+// * Contract *
+// ************
+public class TemplateContract implements Contract {
+ // This is used to identify our contract when building a transaction.
+ public static final String ID = "com.tutorial.contracts.TemplateContract";
+
+ // A transaction is valid if the verify() function of the contract of all the transaction's input and output states
+ // does not throw an exception.
+ @Override
+ public void verify(LedgerTransaction tx) {
+
+ /* We can use the requireSingleCommand function to extract command data from transaction.
+ * However, it is possible to have multiple commands in a single transaction.*/
+ //final CommandWithParties command = requireSingleCommand(tx.getCommands(), Commands.class);
+ final CommandData commandData = tx.getCommands().get(0).getValue();
+
+ if (commandData instanceof Commands.Send) {
+ //Retrieve the output state of the transaction
+ TemplateState output = tx.outputsOfType(TemplateState.class).get(0);
+
+ //Using Corda DSL function requireThat to replicate conditions-checks
+ requireThat(require -> {
+ require.using("No inputs should be consumed when sending the Hello-World message.", tx.getInputStates().size() == 0);
+ require.using("The message must be Hello-World", output.getMsg().equals("Hello-World"));
+ return null;
+ });
+ }
+ }
+
+ // Used to indicate the transaction's intent.
+ public interface Commands extends CommandData {
+ //In our hello-world app, We will only have one command.
+ class Send implements Commands {
+ }
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/AppleStamp.java b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/AppleStamp.java
new file mode 100644
index 00000000..bd899291
--- /dev/null
+++ b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/AppleStamp.java
@@ -0,0 +1,68 @@
+package com.tutorial.states;
+
+import com.tutorial.contracts.AppleStampContract;
+import net.corda.core.contracts.BelongsToContract;
+import net.corda.core.contracts.LinearState;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.Party;
+import net.corda.core.serialization.ConstructorForDeserialization;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@BelongsToContract(AppleStampContract.class)
+public class AppleStamp implements LinearState {
+
+ //Private Variables
+ private String stampDesc; //For example: "One stamp can exchange for a basket of HoneyCrispy Apple"
+ private Party issuer; //The person who issued the stamp
+ private Party holder; //The person who currently owns the stamp
+
+ //LinearState required variable.
+ private UniqueIdentifier linearID;
+
+ //ALL Corda State required parameter to indicate storing parties
+ private List participants;
+
+ //Constructor Tips: Command + N in IntelliJ can auto generate constructor.
+ @ConstructorForDeserialization
+ public AppleStamp(String stampDesc, Party issuer, Party holder, UniqueIdentifier linearID) {
+ this.stampDesc = stampDesc;
+ this.issuer = issuer;
+ this.holder = holder;
+ this.linearID = linearID;
+ this.participants = new ArrayList();
+ this.participants.add(issuer);
+ this.participants.add(holder);
+ }
+
+ @NotNull
+ @Override
+ public List getParticipants() {
+ return this.participants;
+ }
+
+ @NotNull
+ @Override
+ public UniqueIdentifier getLinearId() {
+ return this.linearID;
+ }
+
+ //Getters
+ public String getStampDesc() {
+ return stampDesc;
+ }
+
+ public Party getIssuer() {
+ return issuer;
+ }
+
+ public Party getHolder() {
+ return holder;
+ }
+
+}
+
+//Advanced tutorial add brand and type of apple for more complicated contract writing
diff --git a/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/BasketOfApples.java b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/BasketOfApples.java
new file mode 100644
index 00000000..869e1d7e
--- /dev/null
+++ b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/BasketOfApples.java
@@ -0,0 +1,79 @@
+package com.tutorial.states;
+
+import com.tutorial.contracts.BasketOfApplesContract;
+import net.corda.core.contracts.BelongsToContract;
+import net.corda.core.contracts.ContractState;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.Party;
+import net.corda.core.serialization.ConstructorForDeserialization;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@BelongsToContract(BasketOfApplesContract.class)
+public class BasketOfApples implements ContractState {
+
+ //Private Variables
+ private String description; //Brand or type
+ private Party farm; //Origin of the apple
+ private Party owner; //The person who exchange the basket of apple with the stamp.
+ private int weight;
+
+ //ALL Corda State required parameter to indicate storing parties
+ private List participants;
+
+ //Constructors
+ //Basket of Apple creation. Only farm name is stored.
+ public BasketOfApples(String description, Party farm, int weight) {
+ this.description = description;
+ this.farm = farm;
+ this.owner=farm;
+ this.weight = weight;
+ this.participants = new ArrayList();
+ this.participants.add(farm);
+ }
+
+ //Constructor for object creation during transaction
+ @ConstructorForDeserialization
+ public BasketOfApples(String description, Party farm, Party owner, int weight) {
+ this.description = description;
+ this.farm = farm;
+ this.owner = owner;
+ this.weight = weight;
+ this.participants = new ArrayList();
+ this.participants.add(farm);
+ this.participants.add(owner);
+ }
+
+ @NotNull
+ @Override
+ public List getParticipants() {
+ return participants;
+ }
+
+ //getters
+ public String getDescription() {
+ return description;
+ }
+
+ public Party getFarm() {
+ return farm;
+ }
+
+ public Party getOwner() {
+ return owner;
+ }
+
+ public int getWeight() {
+ return weight;
+ }
+
+ public BasketOfApples changeOwner(Party buyer){
+ BasketOfApples newOwnerState = new BasketOfApples(this.description,this.farm,buyer,this.weight);
+ return newOwnerState;
+ }
+
+}
+
+//Advance version will fill in brand and type.
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/TemplateState.java b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/TemplateState.java
new file mode 100644
index 00000000..a73bc4f0
--- /dev/null
+++ b/Basic/tutorial-applestamp/contracts/src/main/java/com/tutorial/states/TemplateState.java
@@ -0,0 +1,41 @@
+package com.tutorial.states;
+
+import com.tutorial.contracts.TemplateContract;
+import net.corda.core.contracts.BelongsToContract;
+import net.corda.core.contracts.ContractState;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.Party;
+
+import java.util.Arrays;
+import java.util.List;
+
+// *********
+// * State *
+// *********
+@BelongsToContract(TemplateContract.class)
+public class TemplateState implements ContractState {
+
+ //private variables
+ private String msg;
+ private Party sender;
+ private Party receiver;
+
+ /* Constructor of your Corda state */
+ public TemplateState(String msg, Party sender, Party receiver) {
+ this.msg = msg;
+ this.sender = sender;
+ this.receiver = receiver;
+ }
+
+ //getters
+ public String getMsg() { return msg; }
+ public Party getSender() { return sender; }
+ public Party getReceiver() { return receiver; }
+
+ /* This method will indicate who are the participants and required signers when
+ * this state is used in a transaction. */
+ @Override
+ public List getParticipants() {
+ return Arrays.asList(sender,receiver);
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/contracts/src/test/java/com/tutorial/contracts/ContractTests.java b/Basic/tutorial-applestamp/contracts/src/test/java/com/tutorial/contracts/ContractTests.java
new file mode 100644
index 00000000..7cdaf0e5
--- /dev/null
+++ b/Basic/tutorial-applestamp/contracts/src/test/java/com/tutorial/contracts/ContractTests.java
@@ -0,0 +1,81 @@
+package com.tutorial.contracts;
+
+import com.tutorial.states.AppleStamp;
+import com.tutorial.states.TemplateState;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.node.MockServices;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+import static net.corda.testing.node.NodeTestUtils.ledger;
+
+public class ContractTests {
+ private final MockServices ledgerServices = new MockServices(Arrays.asList("com.tutorial.contracts"));
+ TestIdentity alice = new TestIdentity(new CordaX500Name("Alice", "TestLand", "US"));
+ TestIdentity bob = new TestIdentity(new CordaX500Name("Alice", "TestLand", "US"));
+
+ //Template Tester
+ @Test
+ public void issuerAndRecipientCannotHaveSameEmail() {
+ TemplateState state = new TemplateState("Hello-World", alice.getParty(), bob.getParty());
+ ledger(ledgerServices, l -> {
+ l.transaction(tx -> {
+ tx.input(TemplateContract.ID, state);
+ tx.output(TemplateContract.ID, state);
+ tx.command(alice.getPublicKey(), new TemplateContract.Commands.Send());
+ return tx.fails(); //fails because of having inputs
+ });
+ l.transaction(tx -> {
+ tx.output(TemplateContract.ID, state);
+ tx.command(alice.getPublicKey(), new TemplateContract.Commands.Send());
+ return tx.verifies();
+ });
+ return null;
+ });
+ }
+
+ //Basket of Apple cordapp testers
+ @Test
+ public void StampIssuanceCanOnlyHaveOneOutput() {
+ AppleStamp stamp = new AppleStamp("FUji4072", alice.getParty(), bob.getParty(), new UniqueIdentifier());
+ AppleStamp stamp2 = new AppleStamp("HoneyCrispy7864", alice.getParty(), bob.getParty(), new UniqueIdentifier());
+
+ ledger(ledgerServices, l -> {
+ l.transaction(tx -> {
+ tx.output(AppleStampContract.ID, stamp);
+ tx.output(AppleStampContract.ID, stamp2);
+ tx.command(alice.getPublicKey(), new AppleStampContract.Commands.Issue());
+ return tx.fails(); //fails because of having inputs
+ });
+ l.transaction(tx -> {
+ tx.output(AppleStampContract.ID, stamp);
+ tx.command(alice.getPublicKey(), new AppleStampContract.Commands.Issue());
+ return tx.verifies();
+ });
+ return null;
+ });
+ }
+
+ @Test
+ public void StampMustHaveDescription() {
+ AppleStamp stamp = new AppleStamp("", alice.getParty(), bob.getParty(), new UniqueIdentifier());
+ AppleStamp stamp2 = new AppleStamp("FUji4072", alice.getParty(), bob.getParty(), new UniqueIdentifier());
+
+ ledger(ledgerServices, l -> {
+ l.transaction(tx -> {
+ tx.output(AppleStampContract.ID, stamp);
+ tx.command(Arrays.asList(alice.getPublicKey(), bob.getPublicKey()), new AppleStampContract.Commands.Issue());
+ return tx.fails(); //fails because of having inputs
+ });
+ l.transaction(tx -> {
+ tx.output(AppleStampContract.ID, stamp2);
+ tx.command(Arrays.asList(alice.getPublicKey(), bob.getPublicKey()), new AppleStampContract.Commands.Issue());
+ return tx.verifies();
+ });
+ return null;
+ });
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/contracts/src/test/java/com/tutorial/contracts/StateTests.java b/Basic/tutorial-applestamp/contracts/src/test/java/com/tutorial/contracts/StateTests.java
new file mode 100644
index 00000000..0166547b
--- /dev/null
+++ b/Basic/tutorial-applestamp/contracts/src/test/java/com/tutorial/contracts/StateTests.java
@@ -0,0 +1,28 @@
+package com.tutorial.contracts;
+
+import com.tutorial.states.AppleStamp;
+import com.tutorial.states.TemplateState;
+import net.corda.core.identity.Party;
+import org.junit.Test;
+
+public class StateTests {
+
+ //Mock State test check for if the state has correct parameters type
+ @Test
+ public void hasFieldOfCorrectType() throws NoSuchFieldException {
+ TemplateState.class.getDeclaredField("msg");
+ assert (TemplateState.class.getDeclaredField("msg").getType().equals(String.class));
+ }
+
+ @Test
+ public void AppleStampStateHasFieldOfCorrectType() throws NoSuchFieldException {
+ AppleStamp.class.getDeclaredField("stampDesc");
+ assert (AppleStamp.class.getDeclaredField("stampDesc").getType().equals(String.class));
+
+ AppleStamp.class.getDeclaredField("issuer");
+ assert (AppleStamp.class.getDeclaredField("issuer").getType().equals(Party.class));
+
+ AppleStamp.class.getDeclaredField("holder");
+ assert (AppleStamp.class.getDeclaredField("issuer").getType().equals(Party.class));
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/gradle.properties b/Basic/tutorial-applestamp/gradle.properties
new file mode 100644
index 00000000..ef7e526c
--- /dev/null
+++ b/Basic/tutorial-applestamp/gradle.properties
@@ -0,0 +1,3 @@
+name=Test
+group=com.tutorial
+version=0.1
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/gradle/wrapper/gradle-wrapper.jar b/Basic/tutorial-applestamp/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..99340b4a
Binary files /dev/null and b/Basic/tutorial-applestamp/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Basic/tutorial-applestamp/gradle/wrapper/gradle-wrapper.properties b/Basic/tutorial-applestamp/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..0188225a
--- /dev/null
+++ b/Basic/tutorial-applestamp/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+#Fri Aug 25 12:50:39 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+
diff --git a/Basic/tutorial-applestamp/gradlew b/Basic/tutorial-applestamp/gradlew
new file mode 100755
index 00000000..cccdd3d5
--- /dev/null
+++ b/Basic/tutorial-applestamp/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/Basic/tutorial-applestamp/gradlew.bat b/Basic/tutorial-applestamp/gradlew.bat
new file mode 100644
index 00000000..f9553162
--- /dev/null
+++ b/Basic/tutorial-applestamp/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Basic/tutorial-applestamp/repositories.gradle b/Basic/tutorial-applestamp/repositories.gradle
new file mode 100644
index 00000000..8be7b630
--- /dev/null
+++ b/Basic/tutorial-applestamp/repositories.gradle
@@ -0,0 +1,8 @@
+repositories {
+ mavenLocal()
+ mavenCentral()
+
+ maven { url 'https://jitpack.io' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+}
diff --git a/Basic/tutorial-applestamp/settings.gradle b/Basic/tutorial-applestamp/settings.gradle
new file mode 100644
index 00000000..2514aca2
--- /dev/null
+++ b/Basic/tutorial-applestamp/settings.gradle
@@ -0,0 +1,3 @@
+include 'workflows'
+include 'contracts'
+include 'clients'
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/workflows/build.gradle b/Basic/tutorial-applestamp/workflows/build.gradle
new file mode 100644
index 00000000..44d454a0
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/build.gradle
@@ -0,0 +1,64 @@
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ workflow {
+ name "4.8LTS Tutorial Flows"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src/main/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+ test {
+ java {
+ srcDir 'src/test/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/test")
+ }
+ }
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ }
+}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+dependencies {
+ testCompile "junit:junit:$junit_version"
+
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+
+ // CorDapp dependencies.
+ cordapp project(":contracts")
+}
+
+task integrationTest(type: Test, dependsOn: []) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/workflows/src/integrationTest/java/com/tutorial/DriverBasedTest.java b/Basic/tutorial-applestamp/workflows/src/integrationTest/java/com/tutorial/DriverBasedTest.java
new file mode 100644
index 00000000..5800309b
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/integrationTest/java/com/tutorial/DriverBasedTest.java
@@ -0,0 +1,48 @@
+package com.tutorial;
+
+import com.google.common.collect.ImmutableList;
+import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.driver.DriverParameters;
+import net.corda.testing.driver.NodeHandle;
+import net.corda.testing.driver.NodeParameters;
+import org.junit.Test;
+
+import java.util.List;
+
+import static net.corda.testing.driver.Driver.driver;
+import static org.junit.Assert.assertEquals;
+
+public class DriverBasedTest {
+ private final TestIdentity bankA = new TestIdentity(new CordaX500Name("BankA", "", "GB"));
+ private final TestIdentity bankB = new TestIdentity(new CordaX500Name("BankB", "", "US"));
+
+ @Test
+ public void nodeTest() {
+ driver(new DriverParameters().withIsDebug(true).withStartNodesInProcess(true), dsl -> {
+ // Start a pair of nodes and wait for them both to be ready.
+ List> handleFutures = ImmutableList.of(
+ dsl.startNode(new NodeParameters().withProvidedName(bankA.getName())),
+ dsl.startNode(new NodeParameters().withProvidedName(bankB.getName()))
+ );
+
+ try {
+ NodeHandle partyAHandle = handleFutures.get(0).get();
+ NodeHandle partyBHandle = handleFutures.get(1).get();
+
+ // From each node, make an RPC call to retrieve another node's name from the network map, to verify that the
+ // nodes have started and can communicate.
+
+ // This is a very basic test: in practice tests would be starting flows, and verifying the states in the vault
+ // and other important metrics to ensure that your CorDapp is working as intended.
+ assertEquals(partyAHandle.getRpc().wellKnownPartyFromX500Name(bankB.getName()).getName(), bankB.getName());
+ assertEquals(partyBHandle.getRpc().wellKnownPartyFromX500Name(bankA.getName()).getName(), bankA.getName());
+ } catch (Exception e) {
+ throw new RuntimeException("Caught exception during test: ", e);
+ }
+
+ return null;
+ });
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/CreateAndIssueAppleStamp.java b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/CreateAndIssueAppleStamp.java
new file mode 100644
index 00000000..1e62a117
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/CreateAndIssueAppleStamp.java
@@ -0,0 +1,101 @@
+package com.tutorial.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.tutorial.contracts.AppleStampContract;
+import com.tutorial.states.AppleStamp;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+
+import java.util.Arrays;
+
+public class CreateAndIssueAppleStamp {
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class CreateAndIssueAppleStampInitiator extends FlowLogic {
+
+ private String stampDescription;
+ private Party holder;
+
+ public CreateAndIssueAppleStampInitiator(String stampDescription, Party holder) {
+ this.stampDescription = stampDescription;
+ this.holder = holder;
+ }
+
+ @Suspendable
+ @Override
+ public SignedTransaction call() throws FlowException {
+
+ /* Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
+ //Building the output AppleStamp state
+ UniqueIdentifier uniqueID = new UniqueIdentifier();
+ AppleStamp newStamp = new AppleStamp(this.stampDescription, this.getOurIdentity(), this.holder, uniqueID);
+
+ //Compositing the transaction
+ TransactionBuilder txBuilder = new TransactionBuilder(notary)
+ .addOutputState(newStamp)
+ .addCommand(new AppleStampContract.Commands.Issue(),
+ Arrays.asList(getOurIdentity().getOwningKey(), holder.getOwningKey()));
+
+ // Verify that the transaction is valid.
+ txBuilder.verify(getServiceHub());
+
+ // Sign the transaction.
+ final SignedTransaction partSignedTx = getServiceHub().signInitialTransaction(txBuilder);
+
+ // Send the state to the counterparty, and receive it back with their signature.
+ FlowSession otherPartySession = initiateFlow(holder);
+ final SignedTransaction fullySignedTx = subFlow(
+ new CollectSignaturesFlow(partSignedTx, Arrays.asList(otherPartySession)));
+
+ // Notarise and record the transaction in both parties' vaults.
+ return subFlow(new FinalityFlow(fullySignedTx, Arrays.asList(otherPartySession)));
+ }
+ }
+
+ @InitiatedBy(CreateAndIssueAppleStampInitiator.class)
+ public static class CreateAndIssueAppleStampResponder extends FlowLogic {
+
+ //private variable
+ private FlowSession counterpartySession;
+
+ public CreateAndIssueAppleStampResponder(FlowSession counterpartySession) {
+ this.counterpartySession = counterpartySession;
+ }
+
+ @Override
+ @Suspendable
+ public Void call() throws FlowException {
+ SignedTransaction signedTransaction = subFlow(new SignTransactionFlow(counterpartySession) {
+ @Override
+ @Suspendable
+ protected void checkTransaction(SignedTransaction stx) throws FlowException {
+ /*
+ * SignTransactionFlow will automatically verify the transaction and its signatures before signing it.
+ * However, just because a transaction is contractually valid doesn’t mean we necessarily want to sign.
+ * What if we don’t want to deal with the counterparty in question, or the value is too high,
+ * or we’re not happy with the transaction’s structure? checkTransaction
+ * allows us to define these additional checks. If any of these conditions are not met,
+ * we will not sign the transaction - even if the transaction and its signatures are contractually valid.
+ * ----------
+ * For this hello-world cordapp, we will not implement any additional checks.
+ * */
+ }
+ });
+
+ //Stored the transaction into data base.
+ subFlow(new ReceiveFinalityFlow(counterpartySession, signedTransaction.getId()));
+ return null;
+ }
+ }
+}
+
+//flow start CreateAndIssueAppleStampInitiator stampDescription: Fuji0472, holder: Peter
+//run vaultQuery contractStateType: com.tutorial.states.AppleStamp
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/PackageApples.java b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/PackageApples.java
new file mode 100644
index 00000000..22c1838e
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/PackageApples.java
@@ -0,0 +1,57 @@
+package com.tutorial.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.tutorial.contracts.BasketOfApplesContract;
+import com.tutorial.states.BasketOfApples;
+import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+
+import java.util.Collections;
+
+public class PackageApples {
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class PackApplesInitiator extends FlowLogic {
+
+ private String appleDescription;
+ private int weight;
+
+ public PackApplesInitiator(String appleDescription, int weight) {
+ this.appleDescription = appleDescription;
+ this.weight = weight;
+ }
+
+ @Override
+ @Suspendable
+ public SignedTransaction call() throws FlowException {
+
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
+ //Create the output object
+ BasketOfApples basket = new BasketOfApples(this.appleDescription, this.getOurIdentity(), this.weight);
+
+ //Building transaction
+ TransactionBuilder txBuilder = new TransactionBuilder(notary)
+ .addOutputState(basket)
+ .addCommand(new BasketOfApplesContract.Commands.packBasket(), this.getOurIdentity().getOwningKey());
+
+ // Verify the transaction
+ txBuilder.verify(getServiceHub());
+
+ // Sign the transaction
+ SignedTransaction signedTransaction = getServiceHub().signInitialTransaction(txBuilder);
+
+ // Notarise the transaction and record the states in the ledger.
+ return subFlow(new FinalityFlow(signedTransaction, Collections.emptyList()));
+ }
+ }
+}
+
+//flow start PackApplesInitiator appleDescription: Fuji4072, weight: 10
+//run vaultQuery contractStateType: com.tutorial.states.BasketOfApples
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/RedeemApples.java b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/RedeemApples.java
new file mode 100644
index 00000000..08b39beb
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/RedeemApples.java
@@ -0,0 +1,107 @@
+package com.tutorial.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.tutorial.contracts.BasketOfApplesContract;
+import com.tutorial.states.AppleStamp;
+import com.tutorial.states.BasketOfApples;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.flows.*;
+import net.corda.core.identity.Party;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+
+import java.util.Arrays;
+import java.util.UUID;
+
+public class RedeemApples {
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class RedeemApplesInitiator extends FlowLogic {
+
+ private Party buyer;
+ private UniqueIdentifier stampId;
+
+ public RedeemApplesInitiator(Party buyer, UniqueIdentifier stampId) {
+ this.buyer = buyer;
+ this.stampId = stampId;
+ }
+
+ @Override
+ @Suspendable
+ public SignedTransaction call() throws FlowException {
+
+ //Query the AppleStamp
+ QueryCriteria.LinearStateQueryCriteria inputCriteria = new QueryCriteria.LinearStateQueryCriteria()
+ .withUuid(Arrays.asList(UUID.fromString(stampId.toString())))
+ .withStatus(Vault.StateStatus.UNCONSUMED)
+ .withRelevancyStatus(Vault.RelevancyStatus.RELEVANT);
+ StateAndRef appleStampStateAndRef = getServiceHub().getVaultService().queryBy(AppleStamp.class, inputCriteria).getStates().get(0);
+
+ //Query output BasketOfApples
+ QueryCriteria outputCriteria = new QueryCriteria.VaultQueryCriteria()
+ .withStatus(Vault.StateStatus.UNCONSUMED)
+ .withRelevancyStatus(Vault.RelevancyStatus.RELEVANT);
+ StateAndRef BasketOfApplesStateAndRef = getServiceHub().getVaultService().queryBy(BasketOfApples.class, outputCriteria).getStates().get(0);
+ BasketOfApples originalBasketOfApples = (BasketOfApples) BasketOfApplesStateAndRef.getState().getData();
+
+ //Modify output to address the owner change
+ BasketOfApples output = originalBasketOfApples.changeOwner(buyer);
+
+ /* Obtain a reference to a notary we wish to use.*/
+ Party notary = BasketOfApplesStateAndRef.getState().getNotary();
+
+ //Build Transaction
+ TransactionBuilder txBuilder = new TransactionBuilder(notary)
+ .addInputState(appleStampStateAndRef)
+ .addInputState(BasketOfApplesStateAndRef)
+ .addOutputState(output, BasketOfApplesContract.ID)
+ .addCommand(new BasketOfApplesContract.Commands.Redeem(),
+ Arrays.asList(getOurIdentity().getOwningKey(), this.buyer.getOwningKey()));
+
+ // Verify that the transaction is valid.
+ txBuilder.verify(getServiceHub());
+
+ // Sign the transaction.
+ final SignedTransaction partSignedTx = getServiceHub().signInitialTransaction(txBuilder);
+
+ // Send the state to the counterparty, and receive it back with their signature.
+ FlowSession otherPartySession = initiateFlow(buyer);
+ final SignedTransaction fullySignedTx = subFlow(
+ new CollectSignaturesFlow(partSignedTx, Arrays.asList(otherPartySession)));
+
+ // Notarise and record the transaction in both parties' vaults.
+ SignedTransaction result = subFlow(new FinalityFlow(fullySignedTx, Arrays.asList(otherPartySession)));
+
+ return result;
+ }
+ }
+
+ @InitiatedBy(RedeemApplesInitiator.class)
+ public static class RedeemApplesResponder extends FlowLogic {
+ //private variable
+ private FlowSession counterpartySession;
+
+ public RedeemApplesResponder(FlowSession counterpartySession) {
+ this.counterpartySession = counterpartySession;
+ }
+
+ @Override
+ @Suspendable
+ public Void call() throws FlowException {
+ SignedTransaction signedTransaction = subFlow(new SignTransactionFlow(counterpartySession) {
+ @Override
+ protected void checkTransaction(SignedTransaction stx) throws FlowException {
+ }
+ });
+
+ //Stored the transaction into data base.
+ subFlow(new ReceiveFinalityFlow(counterpartySession, signedTransaction.getId()));
+ return null;
+ }
+ }
+}
+//flow start RedeemApplesInitiator buyer: Peter, stampId:
\ No newline at end of file
diff --git a/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/TemplateInitiator.java b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/TemplateInitiator.java
new file mode 100644
index 00000000..0d0052af
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/TemplateInitiator.java
@@ -0,0 +1,79 @@
+package com.tutorial.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.tutorial.contracts.TemplateContract;
+import com.tutorial.states.TemplateState;
+import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import net.corda.core.utilities.ProgressTracker;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+// ******************
+// * TemplateInitiator flow *
+// ******************
+@InitiatingFlow
+@StartableByRPC
+public class TemplateInitiator extends FlowLogic {
+
+ // We will not use these ProgressTracker for this Hello-World sample
+ private final ProgressTracker progressTracker = new ProgressTracker();
+
+ @Override
+ public ProgressTracker getProgressTracker() {
+ return progressTracker;
+ }
+
+ //private variables
+ private Party sender;
+ private Party receiver;
+
+ //public constructor
+ public TemplateInitiator(Party sendTo) {
+ this.receiver = sendTo;
+ }
+
+ @Suspendable
+ @Override
+ public SignedTransaction call() throws FlowException {
+ //Hello World message
+ String msg = "Hello-World";
+ this.sender = getOurIdentity();
+
+ // Step 1. Get a reference to the notary service on our network and our key pair.
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
+
+ //Compose the State that carries the Hello World message
+ final TemplateState output = new TemplateState(msg, sender, receiver);
+
+ // Step 3. Create a new TransactionBuilder object.
+ final TransactionBuilder builder = new TransactionBuilder(notary);
+
+ // Step 4. Add the iou as an output state, as well as a command to the transaction builder.
+ builder.addOutputState(output);
+ builder.addCommand(new TemplateContract.Commands.Send(), Arrays.asList(this.sender.getOwningKey(), this.receiver.getOwningKey()));
+
+
+ // Step 5. Verify and sign it with our KeyPair.
+ builder.verify(getServiceHub());
+ final SignedTransaction ptx = getServiceHub().signInitialTransaction(builder);
+
+
+ // Step 6. Collect the other party's signature using the SignTransactionFlow.
+ List otherParties = output.getParticipants().stream().map(el -> (Party) el).collect(Collectors.toList());
+ otherParties.remove(getOurIdentity());
+ List sessions = otherParties.stream().map(el -> initiateFlow(el)).collect(Collectors.toList());
+
+ SignedTransaction stx = subFlow(new CollectSignaturesFlow(ptx, sessions));
+
+ // Step 7. Assuming no exceptions, we can now finalise the transaction
+ return subFlow(new FinalityFlow(stx, sessions));
+ }
+}
diff --git a/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/TemplateResponder.java b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/TemplateResponder.java
new file mode 100644
index 00000000..2bc0da62
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/main/java/com/tutorial/flows/TemplateResponder.java
@@ -0,0 +1,44 @@
+package com.tutorial.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import net.corda.core.flows.*;
+import net.corda.core.transactions.SignedTransaction;
+
+// ******************
+// * TemplateResponder flow *
+// ******************
+@InitiatedBy(TemplateInitiator.class)
+public class TemplateResponder extends FlowLogic {
+
+ //private variable
+ private FlowSession counterpartySession;
+
+ //Constructor
+ public TemplateResponder(FlowSession counterpartySession) {
+ this.counterpartySession = counterpartySession;
+ }
+
+ @Suspendable
+ @Override
+ public Void call() throws FlowException {
+ SignedTransaction signedTransaction = subFlow(new SignTransactionFlow(counterpartySession) {
+ @Suspendable
+ @Override
+ protected void checkTransaction(SignedTransaction stx) throws FlowException {
+ /*
+ * SignTransactionFlow will automatically verify the transaction and its signatures before signing it.
+ * However, just because a transaction is contractually valid doesn’t mean we necessarily want to sign.
+ * What if we don’t want to deal with the counterparty in question, or the value is too high,
+ * or we’re not happy with the transaction’s structure? checkTransaction
+ * allows us to define these additional checks. If any of these conditions are not met,
+ * we will not sign the transaction - even if the transaction and its signatures are contractually valid.
+ * ----------
+ * For this hello-world cordapp, we will not implement any aditional checks.
+ * */
+ }
+ });
+ //Stored the transaction into data base.
+ subFlow(new ReceiveFinalityFlow(counterpartySession, signedTransaction.getId()));
+ return null;
+ }
+}
diff --git a/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/CreateAndIssueAppleStampTest.java b/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/CreateAndIssueAppleStampTest.java
new file mode 100644
index 00000000..b467771d
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/CreateAndIssueAppleStampTest.java
@@ -0,0 +1,68 @@
+package com.tutorial;
+
+import com.google.common.collect.ImmutableList;
+import com.tutorial.flows.CreateAndIssueAppleStamp;
+import com.tutorial.flows.TemplateInitiator;
+import com.tutorial.states.AppleStamp;
+import com.tutorial.states.TemplateState;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.testing.node.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.Future;
+
+public class CreateAndIssueAppleStampTest {
+ private MockNetwork network;
+ private StartedMockNode a;
+ private StartedMockNode b;
+
+ @Before
+ public void setup() {
+ network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
+ TestCordapp.findCordapp("com.tutorial.contracts"),
+ TestCordapp.findCordapp("com.tutorial.flows")))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
+ );
+ a = network.createPartyNode(null);
+ b = network.createPartyNode(null);
+ network.runNetwork();
+ }
+
+ @After
+ public void tearDown() {
+ network.stopNodes();
+ }
+
+ @Test
+ public void dummyTest() {
+ TemplateInitiator flow = new TemplateInitiator(b.getInfo().getLegalIdentities().get(0));
+ Future future = a.startFlow(flow);
+ network.runNetwork();
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ QueryCriteria inputCriteria = new QueryCriteria.VaultQueryCriteria().withStatus(Vault.StateStatus.UNCONSUMED);
+ TemplateState state = b.getServices().getVaultService()
+ .queryBy(TemplateState.class, inputCriteria).getStates().get(0).getState().getData();
+ }
+
+ @Test
+ public void CreateAndIssueAppleStampTest() {
+ CreateAndIssueAppleStamp.CreateAndIssueAppleStampInitiator flow1 =
+ new CreateAndIssueAppleStamp.CreateAndIssueAppleStampInitiator(
+ "HoneyCrispy 4072", this.b.getInfo().getLegalIdentities().get(0));
+ Future future1 = a.startFlow(flow1);
+ network.runNetwork();
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ QueryCriteria inputCriteria = new QueryCriteria.VaultQueryCriteria()
+ .withStatus(Vault.StateStatus.UNCONSUMED);
+ AppleStamp state = b.getServices().getVaultService()
+ .queryBy(AppleStamp.class, inputCriteria).getStates().get(0).getState().getData();
+ assert (state.getStampDesc().equals("HoneyCrispy 4072"));
+ }
+}
diff --git a/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/FarmerSelfCreateBasketOfApplesTest.java b/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/FarmerSelfCreateBasketOfApplesTest.java
new file mode 100644
index 00000000..4365a852
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/FarmerSelfCreateBasketOfApplesTest.java
@@ -0,0 +1,56 @@
+package com.tutorial;
+
+import com.google.common.collect.ImmutableList;
+import com.tutorial.flows.PackageApples;
+import com.tutorial.states.BasketOfApples;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.testing.node.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.Future;
+
+public class FarmerSelfCreateBasketOfApplesTest {
+ private MockNetwork network;
+ private StartedMockNode a;
+ private StartedMockNode b;
+
+ @Before
+ public void setup() {
+ network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
+ TestCordapp.findCordapp("com.tutorial.contracts"),
+ TestCordapp.findCordapp("com.tutorial.flows")))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB")))));
+ a = network.createPartyNode(null);
+ b = network.createPartyNode(null);
+ network.runNetwork();
+ }
+
+ @After
+ public void tearDown() {
+ network.stopNodes();
+ }
+
+ @Test
+ public void createBasketOfApples() {
+ PackageApples.PackApplesInitiator flow1 = new PackageApples.PackApplesInitiator("Fuji4072", 10);
+ Future future = a.startFlow(flow1);
+ network.runNetwork();
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ QueryCriteria inputCriteria = new QueryCriteria.VaultQueryCriteria().withStatus(Vault.StateStatus.UNCONSUMED);
+ BasketOfApples state = a.getServices().getVaultService()
+ .queryBy(BasketOfApples.class, inputCriteria).getStates().get(0).getState().getData();
+
+ System.out.println("-------------------------");
+ System.out.println(state.getOwner());
+ System.out.println("-------------------------");
+
+ assert (state.getDescription().equals("Fuji4072"));
+ }
+}
+
diff --git a/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/FlowTests.java b/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/FlowTests.java
new file mode 100644
index 00000000..de7fc6cf
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/FlowTests.java
@@ -0,0 +1,50 @@
+package com.tutorial;
+
+import com.google.common.collect.ImmutableList;
+import com.tutorial.flows.TemplateInitiator;
+import com.tutorial.states.TemplateState;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.testing.node.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.Future;
+
+public class FlowTests {
+ private MockNetwork network;
+ private StartedMockNode a;
+ private StartedMockNode b;
+
+ @Before
+ public void setup() {
+ network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
+ TestCordapp.findCordapp("com.tutorial.contracts"),
+ TestCordapp.findCordapp("com.tutorial.flows")))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
+ );
+ a = network.createPartyNode(null);
+ b = network.createPartyNode(null);
+ network.runNetwork();
+ }
+
+ @After
+ public void tearDown() {
+ network.stopNodes();
+ }
+
+ @Test
+ public void dummyTest() {
+ TemplateInitiator flow = new TemplateInitiator(b.getInfo().getLegalIdentities().get(0));
+ Future future = a.startFlow(flow);
+ network.runNetwork();
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ QueryCriteria inputCriteria = new QueryCriteria.VaultQueryCriteria().withStatus(Vault.StateStatus.UNCONSUMED);
+ TemplateState state = b.getServices().getVaultService()
+ .queryBy(TemplateState.class, inputCriteria).getStates().get(0).getState().getData();
+ }
+}
diff --git a/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/RedeemApplesWithStampTest.java b/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/RedeemApplesWithStampTest.java
new file mode 100644
index 00000000..fc7a9dc5
--- /dev/null
+++ b/Basic/tutorial-applestamp/workflows/src/test/java/com/tutorial/RedeemApplesWithStampTest.java
@@ -0,0 +1,73 @@
+package com.tutorial;
+
+import com.google.common.collect.ImmutableList;
+import com.tutorial.flows.CreateAndIssueAppleStamp;
+import com.tutorial.flows.PackageApples;
+import com.tutorial.flows.RedeemApples;
+import com.tutorial.states.AppleStamp;
+import com.tutorial.states.BasketOfApples;
+import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.testing.node.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+public class RedeemApplesWithStampTest {
+ private MockNetwork network;
+ private StartedMockNode a;
+ private StartedMockNode b;
+
+ @Before
+ public void setup() {
+ network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
+ TestCordapp.findCordapp("com.tutorial.contracts"),
+ TestCordapp.findCordapp("com.tutorial.flows")))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
+ );
+ a = network.createPartyNode(null);
+ b = network.createPartyNode(null);
+ network.runNetwork();
+ }
+
+ @After
+ public void tearDown() {
+ network.stopNodes();
+ }
+
+ @Test
+ public void buyerRedeemBasketOfApples() throws ExecutionException, InterruptedException {
+ //Create Basket of Apples
+ PackageApples.PackApplesInitiator createBasketOfApples = new PackageApples.PackApplesInitiator("Fuji4072", 10);
+ Future future = a.startFlow(createBasketOfApples);
+ network.runNetwork();
+
+ //Issue Apple Stamp
+ CreateAndIssueAppleStamp.CreateAndIssueAppleStampInitiator issueAppleStamp =
+ new CreateAndIssueAppleStamp.CreateAndIssueAppleStampInitiator(
+ "Fuji4072", this.b.getInfo().getLegalIdentities().get(0));
+ Future future1 = a.startFlow(issueAppleStamp);
+ network.runNetwork();
+
+ AppleStamp issuedStamp = (AppleStamp) future1.get().getTx().getOutputStates().get(0);
+ UniqueIdentifier id = issuedStamp.getLinearId();
+
+ //Redeem Basket of Apples with stamp
+ RedeemApples.RedeemApplesInitiator redeemApples = new RedeemApples.RedeemApplesInitiator(b.getInfo().getLegalIdentities().get(0), id);
+ Future future2 = a.startFlow(redeemApples);
+ network.runNetwork();
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ QueryCriteria outputCriteria = new QueryCriteria.VaultQueryCriteria().withStatus(Vault.StateStatus.UNCONSUMED);
+ BasketOfApples state = b.getServices().getVaultService()
+ .queryBy(BasketOfApples.class, outputCriteria).getStates().get(0).getState().getData();
+
+ assert (state.getDescription().equals("Fuji4072"));
+ }
+}
diff --git a/Basic/tutorial-jarsigning/LICENCE b/Basic/tutorial-jarsigning/LICENCE
new file mode 100644
index 00000000..3ff572d1
--- /dev/null
+++ b/Basic/tutorial-jarsigning/LICENCE
@@ -0,0 +1,13 @@
+ Copyright 2016, R3 Limited.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/README.md b/Basic/tutorial-jarsigning/README.md
new file mode 100644
index 00000000..f0565f5b
--- /dev/null
+++ b/Basic/tutorial-jarsigning/README.md
@@ -0,0 +1,69 @@
+# Network Bootstrapper Tutorial
+
+This tutorial demonstrates how to sign a contract jar with your own keystore.
+
+A CorDapp will most likely have two jars, one contract jar and one workflow jar. Since all the data and transactional rules are defined in the contract, when transacting over the Corda Network, we will need to check the hashes of the contract jars. Hence, when speaking of signing a CorDapp, we are most likely talking about signing the contract jar.
+
+The signing option is defined in the build.gradle file of the /workflows and /contracts folder.
+```
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ workflow {
+ name "4.8LTS Tutorial Flows"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+ signing {
+ enabled false
+ }
+}
+```
+In this example, we disable the signing for the workflow jar. And, for the contract jar, we will add custom keystore to use for signing.
+```
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ contract {
+ name "4.8LTS Tutorial Contracts"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+ signing {
+ enabled true
+ options {
+ Properties constants = new Properties()
+ file("$projectDir/../gradle.properties").withInputStream { constants.load(it) }
+ keystore getProperty('jar.sign.keystore')
+ alias "cordapp-signer"
+ storepass getProperty('jar.sign.password')
+ keypass getProperty('jar.sign.password')
+ storetype "PKCS12"
+ }
+ }
+}
+```
+In the terminal, create a private key in JKS format (replace the X500 name with yours, and use the same [password] value for both storepass and keypass):
+
+```
+keytool -keystore jarSignKeystore.jks -keyalg RSA -genkey -dname "OU=, O=, L=, C=" -storepass [password] -keypass [password] -alias cordapp-signer
+```
+
+Migrate the JKS key to PKCS12 format. You will be prompted for 2 passwords, use the same value that you used to create the JKS key for both values:
+
+```
+keytool -importkeystore -srckeystore jarSignKeystore.jks -destkeystore jarSignKeystore.pkcs12 -deststoretype pkcs12
+```
+
+As you can see, we are importing in variables from the gradle.properties file in the root directory. They are the keystore path and the password for the keystore
+```
+jar.sign.keystore = path to PKCS12 file
+jar.sign.password = password of PKCS12 file
+```
+Once you have edited all the above fields, you can simply gradle task build to execute the building and signing of the jar.
+```
+./gradlew build
+```
+You will have a signed jar with your keystore.
diff --git a/Basic/tutorial-jarsigning/TRADEMARK b/Basic/tutorial-jarsigning/TRADEMARK
new file mode 100644
index 00000000..aa7e20f6
--- /dev/null
+++ b/Basic/tutorial-jarsigning/TRADEMARK
@@ -0,0 +1,4 @@
+Corda and the Corda logo are trademarks of R3CEV LLC and its affiliates. All rights reserved.
+
+For R3CEV LLC's trademark and logo usage information, please consult our Trademark Usage Policy at
+https://www.r3.com/trademark-policy/.
diff --git a/Basic/tutorial-jarsigning/build.gradle b/Basic/tutorial-jarsigning/build.gradle
new file mode 100644
index 00000000..b2dcf146
--- /dev/null
+++ b/Basic/tutorial-jarsigning/build.gradle
@@ -0,0 +1,145 @@
+buildscript { //properties that you need to build the project
+
+ Properties constants = new Properties()
+ file("$projectDir/./constants.properties").withInputStream { constants.load(it) }
+
+ ext {
+ corda_release_group = constants.getProperty("cordaReleaseGroup")
+ corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
+ corda_release_version = constants.getProperty("cordaVersion")
+ corda_core_release_version = constants.getProperty("cordaCoreVersion")
+ corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
+ kotlin_version = constants.getProperty("kotlinVersion")
+ junit_version = constants.getProperty("junitVersion")
+ quasar_version = constants.getProperty("quasarVersion")
+ log4j_version = constants.getProperty("log4jVersion")
+ slf4j_version = constants.getProperty("slf4jVersion")
+ corda_platform_version = constants.getProperty("platformVersion").toInteger()
+ //springboot
+ spring_boot_version = '2.0.2.RELEASE'
+ spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
+ }
+
+ repositories {
+ mavenLocal()
+ mavenCentral()
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
+ }
+
+ dependencies {
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+ classpath "net.corda.plugins:cordapp:$corda_gradle_plugins_version"
+ classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version"
+ classpath "net.corda.plugins:quasar-utils:$corda_gradle_plugins_version"
+ classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_gradle_plugin_version"
+ }
+}
+
+allprojects { //Properties that you need to compile your project (The application)
+ apply from: "${rootProject.projectDir}/repositories.gradle"
+ apply plugin: 'kotlin'
+
+ repositories {
+ mavenLocal()
+
+ mavenCentral()
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://jitpack.io' }
+ //SDK lib
+ maven { url 'https://download.corda.net/maven/corda-lib' }
+ }
+
+ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+ kotlinOptions {
+ languageVersion = "1.2"
+ apiVersion = "1.2"
+ jvmTarget = "1.8"
+ javaParameters = true // Useful for reflection.
+ }
+ }
+
+ jar {
+ // This makes the JAR's SHA-256 hash repeatable.
+ preserveFileTimestamps = false
+ reproducibleFileOrder = true
+ }
+}
+
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+
+sourceSets {
+ main {
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+}
+
+//Module dependencis
+dependencies {
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda-node-api:$corda_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+
+ // CorDapp dependencies.
+ cordapp project(":workflows")
+ cordapp project(":contracts")
+
+ cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
+ cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
+ cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
+
+}
+
+//Task to deploy the nodes in order to bootstrap a network
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
+ /* This property will load the CorDapps to each of the node by default, including the Notary. You can find them
+ * in the cordapps folder of the node at build/nodes/Notary/cordapps. However, the notary doesn't really understand
+ * the notion of cordapps. In production, Notary does not need cordapps as well. This is just a short cut to load
+ * the Corda network bootstrapper.
+ */
+ nodeDefaults {
+ projectCordapp {
+ deploy = false
+ }
+ cordapp project(':contracts')
+ cordapp project(':workflows')
+ runSchemaMigration = true //This configuration is for any CorDapps with custom schema, We will leave this as true to avoid
+ //problems for developers who are not familiar with Corda. If you are not using custom schemas, you can change
+ //it to false for quicker project compiling time.
+ }
+ node {
+ name "O=Notary,L=London,C=GB"
+ notary = [validating : false]
+ p2pPort 10002
+ rpcSettings {
+ address("localhost:10003")
+ adminAddress("localhost:10043")
+ }
+ }
+ node {
+ name "O=AppleFarm,L=London,C=GB"
+ p2pPort 10005
+ rpcSettings {
+ address("localhost:10006")
+ adminAddress("localhost:10046")
+ }
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+ }
+ node {
+ name "O=Peter,L=New York,C=US"
+ p2pPort 10008
+ rpcSettings {
+ address("localhost:10009")
+ adminAddress("localhost:10049")
+ }
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+ }
+
+}
diff --git a/Basic/tutorial-jarsigning/config/dev/log4j2.xml b/Basic/tutorial-jarsigning/config/dev/log4j2.xml
new file mode 100644
index 00000000..34ba4d45
--- /dev/null
+++ b/Basic/tutorial-jarsigning/config/dev/log4j2.xml
@@ -0,0 +1,59 @@
+
+
+
+
+ logs
+ node-${hostName}
+ ${log-path}/archive
+
+
+
+
+
+
+ %highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Basic/tutorial-jarsigning/config/test/log4j2.xml b/Basic/tutorial-jarsigning/config/test/log4j2.xml
new file mode 100644
index 00000000..cd9926ca
--- /dev/null
+++ b/Basic/tutorial-jarsigning/config/test/log4j2.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
+ >
+
+
+
+
+
+
+
+
+
+
diff --git a/Basic/tutorial-jarsigning/constants.properties b/Basic/tutorial-jarsigning/constants.properties
new file mode 100644
index 00000000..5a20bdc4
--- /dev/null
+++ b/Basic/tutorial-jarsigning/constants.properties
@@ -0,0 +1,12 @@
+cordaReleaseGroup=net.corda
+cordaCoreReleaseGroup=net.corda
+cordaVersion=4.9
+cordaCoreVersion=4.9
+gradlePluginsVersion=5.0.12
+kotlinVersion=1.2.71
+junitVersion=4.12
+quasarVersion=0.7.10
+log4jVersion =2.17.1
+platformVersion=10
+slf4jVersion=1.7.25
+nettyVersion=4.1.22.Final
diff --git a/Basic/tutorial-jarsigning/contracts/build.gradle b/Basic/tutorial-jarsigning/contracts/build.gradle
new file mode 100644
index 00000000..b1f81911
--- /dev/null
+++ b/Basic/tutorial-jarsigning/contracts/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'net.corda.plugins.cordapp'
+
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ contract {
+ name "4.8LTS Tutorial Contracts"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+ signing {
+ enabled true
+ options {
+ Properties constants = new Properties()
+ file("../gradle.properties").withInputStream { constants.load(it) }
+ keystore getProperty('jar.sign.keystore')
+ alias "cordapp-signer"
+ storepass getProperty('jar.sign.password')
+ keypass getProperty('jar.sign.password')
+ storetype "PKCS12"
+ }
+ }
+}
+
+dependencies {
+ compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+}
diff --git a/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/contracts/AppleStampContract.kt b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/contracts/AppleStampContract.kt
new file mode 100644
index 00000000..c9f73048
--- /dev/null
+++ b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/contracts/AppleStampContract.kt
@@ -0,0 +1,42 @@
+package com.tutorial.contracts
+
+import com.tutorial.states.AppleStamp
+import net.corda.core.contracts.CommandData
+import net.corda.core.contracts.Contract
+import net.corda.core.contracts.Requirements
+import net.corda.core.contracts.requireThat
+import net.corda.core.transactions.LedgerTransaction
+
+//Domain Specific Language
+class AppleStampContract : Contract {
+ @Throws(IllegalArgumentException::class)
+ override fun verify(tx: LedgerTransaction) {
+
+ //Extract the command from the transaction.
+ val commandData = tx.commands[0].value
+
+ //Verify the transaction according to the intention of the transaction
+ when (commandData) {
+ is Commands.Issue -> requireThat {
+ val output = tx.outputsOfType(AppleStamp::class.java)[0]
+ "This transaction should only have one AppleStamp state as output".using(tx.outputs.size == 1)
+ "The output AppleStamp state should have clear description of the type of redeemable goods".using(output.stampDesc != "")
+ null
+ }
+ is BasketOfApplesContract.Commands.Redeem-> requireThat {
+ //Transaction verification will happen in BasketOfApples Contract
+ }
+ }
+ }
+
+ // Used to indicate the transaction's intent.
+ interface Commands : CommandData {
+ //In our hello-world app, We will have two commands.
+ class Issue : Commands
+ }
+
+ companion object {
+ // This is used to identify our contract when building a transaction.
+ const val ID = "com.tutorial.contracts.AppleStampContract"
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/contracts/BasketOfApplesContract.kt b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/contracts/BasketOfApplesContract.kt
new file mode 100644
index 00000000..44052574
--- /dev/null
+++ b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/contracts/BasketOfApplesContract.kt
@@ -0,0 +1,44 @@
+package com.tutorial.contracts
+
+import com.tutorial.states.AppleStamp
+import com.tutorial.states.BasketOfApples
+import net.corda.core.contracts.CommandData
+import net.corda.core.contracts.Contract
+import net.corda.core.contracts.requireThat
+import net.corda.core.transactions.LedgerTransaction
+
+class BasketOfApplesContract : Contract {
+ @Throws(IllegalArgumentException::class)
+ override fun verify(tx: LedgerTransaction) {
+ //Extract the command from the transaction.
+ val commandData = tx.commands[0].value
+ val output = tx.outputsOfType(BasketOfApples::class.java)[0]
+
+ when (commandData) {
+ is Commands.packBasket -> requireThat {
+ "This transaction should only output one BasketOfApples state".using(tx.outputs.size == 1)
+ "The output BasketOfApples state should have clear description of Apple product".using(output.description != "")
+ "The output BasketOfApples state should have non zero weight".using(output.weight > 0)
+ null
+ }
+ is Commands.Redeem -> requireThat {
+ val input = tx.inputsOfType(AppleStamp::class.java)[0]
+ "This transaction should consume two states".using(tx.inputStates.size == 2)
+ "The issuer of the Apple stamp should be the producing farm of this basket of apple".using(input.issuer.equals(output.farm))
+ "The basket of apple has to weight more than 0".using(output.weight > 0)
+ null
+ }
+ }
+ }
+
+ // Used to indicate the transaction's intent.
+ interface Commands : CommandData {
+ class packBasket : Commands
+ class Redeem : Commands
+ }
+
+ companion object {
+ // This is used to identify our contract when building a transaction.
+ const val ID = "com.tutorial.contracts.BasketOfApplesContract"
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/contracts/TemplateContract.kt b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/contracts/TemplateContract.kt
new file mode 100644
index 00000000..e8a1d0a7
--- /dev/null
+++ b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/contracts/TemplateContract.kt
@@ -0,0 +1,36 @@
+package com.tutorial.contracts
+
+import com.tutorial.states.TemplateState
+import net.corda.core.contracts.CommandData
+import net.corda.core.contracts.Contract
+import net.corda.core.contracts.requireSingleCommand
+import net.corda.core.transactions.LedgerTransaction
+import net.corda.core.contracts.requireThat
+// ************
+// * Contract *
+// ************
+class TemplateContract : Contract {
+ companion object {
+ // Used to identify our contract when building a transaction.
+ const val ID = "com.tutorial.contracts.TemplateContract"
+ }
+
+ // A transaction is valid if the verify() function of the contract of all the transaction's input and output states
+ // does not throw an exception.
+ override fun verify(tx: LedgerTransaction) {
+ // Verification logic goes here.
+ val command = tx.commands.requireSingleCommand()
+ val output = tx.outputsOfType().first()
+ when (command.value) {
+ is Commands.Create -> requireThat {
+ "No inputs should be consumed when sending the Hello-World message.".using(tx.inputStates.isEmpty())
+ "The message must be Hello-World".using(output.msg == "Hello-World")
+ }
+ }
+ }
+
+ // Used to indicate the transaction's intent.
+ interface Commands : CommandData {
+ class Create : Commands
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/states/AppleStamp.kt b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/states/AppleStamp.kt
new file mode 100644
index 00000000..5def4572
--- /dev/null
+++ b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/states/AppleStamp.kt
@@ -0,0 +1,19 @@
+package com.tutorial.states
+
+import com.tutorial.contracts.AppleStampContract
+import net.corda.core.contracts.BelongsToContract
+import net.corda.core.contracts.LinearState
+import net.corda.core.contracts.UniqueIdentifier
+import net.corda.core.identity.AbstractParty
+import net.corda.core.identity.Party
+import net.corda.core.serialization.ConstructorForDeserialization
+import java.util.ArrayList
+
+@BelongsToContract(AppleStampContract::class)
+class AppleStamp @ConstructorForDeserialization constructor(
+ val stampDesc : String,//For example: "One stamp can exchange for a basket of HoneyCrispy Apple"
+ val issuer: Party, //The person who issued the stamp
+ val holder: Party, //The person who currently owns the stamp
+ override val linearId: UniqueIdentifier,//LinearState required variable.
+ override val participants: List = listOf(issuer,holder)
+ ) : LinearState
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/states/BasketOfApples.kt b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/states/BasketOfApples.kt
new file mode 100644
index 00000000..d1350ce9
--- /dev/null
+++ b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/states/BasketOfApples.kt
@@ -0,0 +1,29 @@
+package com.tutorial.states
+
+import com.tutorial.contracts.BasketOfApplesContract
+import net.corda.core.contracts.BelongsToContract
+import net.corda.core.contracts.ContractState
+import net.corda.core.identity.AbstractParty
+import net.corda.core.identity.Party
+
+@BelongsToContract(BasketOfApplesContract::class)
+class BasketOfApples(var description : String, //Brand or type
+ var farm : Party, //Origin of the apple
+ var owner: Party, //The person who exchange the basket of apple with the stamp.
+ var weight: Int)
+ : ContractState {
+
+ //Secondary Constructor
+ constructor(description: String, farm: Party, weight: Int) : this(
+ description = description,
+ farm = farm,
+ owner = farm,
+ weight = weight
+ )
+
+ override var participants: List = listOf(farm,owner)
+
+ fun changeOwner(buyer: Party): BasketOfApples {
+ return BasketOfApples(description, farm, buyer, weight)
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/states/TemplateState.kt b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/states/TemplateState.kt
new file mode 100644
index 00000000..d89af8a0
--- /dev/null
+++ b/Basic/tutorial-jarsigning/contracts/src/main/kotlin/com/tutorial/states/TemplateState.kt
@@ -0,0 +1,17 @@
+package com.tutorial.states
+
+import com.tutorial.contracts.TemplateContract
+import net.corda.core.contracts.BelongsToContract
+import net.corda.core.contracts.ContractState
+import net.corda.core.identity.AbstractParty
+import net.corda.core.identity.Party
+
+// *********
+// * State *
+// *********
+@BelongsToContract(TemplateContract::class)
+data class TemplateState(val msg: String,
+ val sender: Party,
+ val receiver: Party,
+ override val participants: List = listOf(sender,receiver)
+) : ContractState
diff --git a/Basic/tutorial-jarsigning/contracts/src/test/kotlin/com/tutorial/contracts/ContractTests.kt b/Basic/tutorial-jarsigning/contracts/src/test/kotlin/com/tutorial/contracts/ContractTests.kt
new file mode 100644
index 00000000..b67ac095
--- /dev/null
+++ b/Basic/tutorial-jarsigning/contracts/src/test/kotlin/com/tutorial/contracts/ContractTests.kt
@@ -0,0 +1,92 @@
+package com.tutorial.contracts
+
+import com.tutorial.states.AppleStamp
+import net.corda.core.identity.CordaX500Name
+import net.corda.testing.core.TestIdentity
+import net.corda.testing.node.MockServices
+import net.corda.testing.node.ledger
+import org.junit.Test
+import com.tutorial.states.TemplateState
+import net.corda.core.contracts.UniqueIdentifier
+import java.security.PublicKey
+import java.util.*
+
+class ContractTests {
+ private val ledgerServices: MockServices = MockServices(listOf("com.tutorial"))
+ var alice = TestIdentity(CordaX500Name("Alice", "TestLand", "US"))
+ var bob = TestIdentity(CordaX500Name("Alice", "TestLand", "US"))
+
+ @Test
+ fun issuerAndRecipientCannotHaveSameEmail() {
+ val state = TemplateState("Hello-World", alice.party, bob.party)
+ ledgerServices.ledger {
+ // Should fail bid price is equal to previous highest bid
+ transaction {
+ //failing transaction
+ input(TemplateContract.ID, state)
+ output(TemplateContract.ID, state)
+ command(alice.publicKey, TemplateContract.Commands.Create())
+ fails()
+ }
+ //pass
+ transaction {
+ //passing transaction
+ output(TemplateContract.ID, state)
+ command(alice.publicKey, TemplateContract.Commands.Create())
+ verifies()
+ }
+ }
+ }
+
+ @Test
+ fun stampIssuanceCanOnlyHaveOneOutput(){
+ val stamp = AppleStamp("FUji4072", alice.party, bob.party, UniqueIdentifier())
+ val stamp2 = AppleStamp("HoneyCrispy7864", alice.party, bob.party, UniqueIdentifier())
+
+ ledgerServices.ledger {
+ // Should fail bid price is equal to previous highest bid
+ transaction {
+ //failing transaction
+ output(AppleStampContract.ID, stamp)
+ output(AppleStampContract.ID, stamp2)
+ command(alice.publicKey, AppleStampContract.Commands.Issue())
+ fails()
+ }
+ //pass
+ transaction {
+ //passing transaction
+ output(AppleStampContract.ID, stamp)
+ command(alice.publicKey, AppleStampContract.Commands.Issue())
+ verifies()
+ }
+ }
+ }
+
+ @Test
+ fun StampMustHaveDescription(){
+ val stamp = AppleStamp("", alice.party, bob.party, UniqueIdentifier())
+ val stamp2 = AppleStamp("FUji4072", alice.party, bob.party, UniqueIdentifier())
+
+ ledgerServices.ledger {
+ // Should fail bid price is equal to previous highest bid
+ transaction {
+ //failing transaction
+ output(AppleStampContract.ID, stamp)
+ command(Arrays.asList(alice.publicKey, bob.publicKey), AppleStampContract.Commands.Issue())
+ fails()
+ }
+ //pass
+ transaction {
+ //passing transaction
+ output(AppleStampContract.ID, stamp2)
+ command(Arrays.asList(alice.publicKey, bob.publicKey), AppleStampContract.Commands.Issue())
+ verifies()
+ }
+ }
+ }
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/contracts/src/test/kotlin/com/tutorial/contracts/StateTests.kt b/Basic/tutorial-jarsigning/contracts/src/test/kotlin/com/tutorial/contracts/StateTests.kt
new file mode 100644
index 00000000..5777a684
--- /dev/null
+++ b/Basic/tutorial-jarsigning/contracts/src/test/kotlin/com/tutorial/contracts/StateTests.kt
@@ -0,0 +1,30 @@
+package com.tutorial.contracts
+
+import com.tutorial.states.AppleStamp
+import com.tutorial.states.TemplateState
+import net.corda.core.identity.Party
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class StateTests {
+ @Test
+ fun hasFieldOfCorrectType() {
+ // Does the field exist?
+ TemplateState::class.java.getDeclaredField("msg")
+ // Is the field of the correct type?
+ assertEquals(TemplateState::class.java.getDeclaredField("msg").type, String()::class.java)
+ }
+
+ @Test
+ fun AppleStampStateHasFieldOfCorrectType(){
+ AppleStamp::class.java.getDeclaredField("stampDesc")
+ assert(AppleStamp::class.java.getDeclaredField("stampDesc").type == String::class.java)
+
+ AppleStamp::class.java.getDeclaredField("issuer")
+ assert(AppleStamp::class.java.getDeclaredField("issuer").type == Party::class.java)
+
+ AppleStamp::class.java.getDeclaredField("holder")
+ assert(AppleStamp::class.java.getDeclaredField("issuer").type == Party::class.java)
+ }
+
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/gradle.properties b/Basic/tutorial-jarsigning/gradle.properties
new file mode 100644
index 00000000..be646102
--- /dev/null
+++ b/Basic/tutorial-jarsigning/gradle.properties
@@ -0,0 +1,7 @@
+name=Test
+group=com.tutorial
+version=0.1
+kotlin.incremental=false
+
+jar.sign.keystore = path to PKCS12 file
+jar.sign.password = password of PKCS12 file
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/gradle/wrapper/gradle-wrapper.jar b/Basic/tutorial-jarsigning/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..99340b4a
Binary files /dev/null and b/Basic/tutorial-jarsigning/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Basic/tutorial-jarsigning/gradle/wrapper/gradle-wrapper.properties b/Basic/tutorial-jarsigning/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..ae01072d
--- /dev/null
+++ b/Basic/tutorial-jarsigning/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Aug 25 12:50:39 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Basic/tutorial-jarsigning/gradlew b/Basic/tutorial-jarsigning/gradlew
new file mode 100755
index 00000000..cccdd3d5
--- /dev/null
+++ b/Basic/tutorial-jarsigning/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/Basic/tutorial-jarsigning/gradlew.bat b/Basic/tutorial-jarsigning/gradlew.bat
new file mode 100644
index 00000000..f9553162
--- /dev/null
+++ b/Basic/tutorial-jarsigning/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Basic/tutorial-jarsigning/repositories.gradle b/Basic/tutorial-jarsigning/repositories.gradle
new file mode 100644
index 00000000..8be7b630
--- /dev/null
+++ b/Basic/tutorial-jarsigning/repositories.gradle
@@ -0,0 +1,8 @@
+repositories {
+ mavenLocal()
+ mavenCentral()
+
+ maven { url 'https://jitpack.io' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+}
diff --git a/Basic/tutorial-jarsigning/settings.gradle b/Basic/tutorial-jarsigning/settings.gradle
new file mode 100644
index 00000000..2514aca2
--- /dev/null
+++ b/Basic/tutorial-jarsigning/settings.gradle
@@ -0,0 +1,3 @@
+include 'workflows'
+include 'contracts'
+include 'clients'
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/workflows/build.gradle b/Basic/tutorial-jarsigning/workflows/build.gradle
new file mode 100644
index 00000000..1375782f
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/build.gradle
@@ -0,0 +1,60 @@
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.quasar-utils'
+
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ workflow {
+ name "4.8LTS Tutorial Flows"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+ signing {
+ enabled false
+ }
+}
+
+sourceSets {
+ main {
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+ test {
+ resources {
+ srcDir rootProject.file("config/test")
+ }
+ }
+ integrationTest {
+ kotlin {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/kotlin')
+ }
+ }
+}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+dependencies {
+ compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+ testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+ testCompile "junit:junit:$junit_version"
+
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+
+ // CorDapp dependencies.
+ cordapp project(":contracts")
+}
+
+task integrationTest(type: Test, dependsOn: []) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/workflows/src/integrationTest/kotlin/com/tutorial/DriverBasedTest.kt b/Basic/tutorial-jarsigning/workflows/src/integrationTest/kotlin/com/tutorial/DriverBasedTest.kt
new file mode 100644
index 00000000..12388f30
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/src/integrationTest/kotlin/com/tutorial/DriverBasedTest.kt
@@ -0,0 +1,47 @@
+package com.tutorial
+
+import net.corda.core.identity.CordaX500Name
+import net.corda.core.utilities.getOrThrow
+import net.corda.testing.core.TestIdentity
+import net.corda.testing.driver.DriverDSL
+import net.corda.testing.driver.DriverParameters
+import net.corda.testing.driver.NodeHandle
+import net.corda.testing.driver.driver
+import org.junit.Test
+import java.util.concurrent.Future
+import kotlin.test.assertEquals
+
+class DriverBasedTest {
+ private val bankA = TestIdentity(CordaX500Name("BankA", "", "GB"))
+ private val bankB = TestIdentity(CordaX500Name("BankB", "", "US"))
+
+ @Test
+ fun `node test`() = withDriver {
+ // Start a pair of nodes and wait for them both to be ready.
+ val (partyAHandle, partyBHandle) = startNodes(bankA, bankB)
+
+ // From each node, make an RPC call to retrieve another node's name from the network map, to verify that the
+ // nodes have started and can communicate.
+
+ // This is a very basic test: in practice tests would be starting flows, and verifying the states in the vault
+ // and other important metrics to ensure that your CorDapp is working as intended.
+ assertEquals(bankB.name, partyAHandle.resolveName(bankB.name))
+ assertEquals(bankA.name, partyBHandle.resolveName(bankA.name))
+ }
+
+ // Runs a test inside the Driver DSL, which provides useful functions for starting nodes, etc.
+ private fun withDriver(test: DriverDSL.() -> Unit) = driver(
+ DriverParameters(isDebug = true, startNodesInProcess = true)
+ ) { test() }
+
+ // Makes an RPC call to retrieve another node's name from the network map.
+ private fun NodeHandle.resolveName(name: CordaX500Name) = rpc.wellKnownPartyFromX500Name(name)!!.name
+
+ // Resolves a list of futures to a list of the promised values.
+ private fun List>.waitForAll(): List = map { it.getOrThrow() }
+
+ // Starts multiple nodes simultaneously, then waits for them all to be ready.
+ private fun DriverDSL.startNodes(vararg identities: TestIdentity) = identities
+ .map { startNode(providedName = it.name) }
+ .waitForAll()
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/CreateAndIssueAppleStamp.kt b/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/CreateAndIssueAppleStamp.kt
new file mode 100644
index 00000000..b3afb0d3
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/CreateAndIssueAppleStamp.kt
@@ -0,0 +1,70 @@
+package com.tutorial.flows
+
+import co.paralleluniverse.fibers.Suspendable
+import com.tutorial.contracts.AppleStampContract
+import com.tutorial.states.AppleStamp
+import net.corda.core.contracts.UniqueIdentifier
+import net.corda.core.contracts.requireThat
+import net.corda.core.flows.*
+import net.corda.core.identity.Party
+import net.corda.core.transactions.SignedTransaction
+import net.corda.core.transactions.TransactionBuilder
+import java.util.*
+
+@InitiatingFlow
+@StartableByRPC
+class CreateAndIssueAppleStampInitiator(private val stampDescription: String, private val holder: Party) : FlowLogic(){
+
+ @Suspendable
+ override fun call(): SignedTransaction {
+
+ /* Obtain a reference to a notary we wish to use.
+ * METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
+ * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)
+ * * - For production you always want to1 use Method 2 as it guarantees the expected notary is returned.
+ */
+ val notary = serviceHub.networkMapCache.notaryIdentities[0] // METHOD 1
+ //final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+
+ //Building the output AppleStamp state
+ val uniqueID = UniqueIdentifier()
+ val newStamp = AppleStamp(stampDescription, ourIdentity, this.holder, uniqueID)
+
+ //Compositing the transaction
+ val txBuilder = TransactionBuilder(notary)
+ .addOutputState(newStamp)
+ .addCommand(AppleStampContract.Commands.Issue(),
+ listOf(ourIdentity.owningKey, holder.owningKey))
+
+ // Verify that the transaction is valid.
+ txBuilder.verify(serviceHub)
+
+ // Sign the transaction.
+ val partSignedTx = serviceHub.signInitialTransaction(txBuilder)
+
+ // Send the state to the counterparty, and receive it back with their signature.
+
+ // Send the state to the counterparty, and receive it back with their signature.
+ val otherPartySession = initiateFlow(holder)
+ val fullySignedTx = subFlow(
+ CollectSignaturesFlow(partSignedTx, Arrays.asList(otherPartySession)))
+
+ // Notarise and record the transaction in both parties' vaults.
+ return subFlow(FinalityFlow(fullySignedTx, Arrays.asList(otherPartySession)))
+ }
+}
+
+@InitiatedBy(CreateAndIssueAppleStampInitiator::class)
+class CreateAndIssueAppleStampResponder(val counterpartySession: FlowSession) : FlowLogic() {
+ @Suspendable
+ override fun call(): SignedTransaction {
+ val signTransactionFlow = object : SignTransactionFlow(counterpartySession) {
+ override fun checkTransaction(stx: SignedTransaction) = requireThat {
+ //Addition checks
+ }
+ }
+ val txId = subFlow(signTransactionFlow).id
+ return subFlow(ReceiveFinalityFlow(counterpartySession, expectedTxId = txId))
+ }
+}
+
diff --git a/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/Flows.kt b/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/Flows.kt
new file mode 100644
index 00000000..69e81a62
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/Flows.kt
@@ -0,0 +1,83 @@
+package com.tutorial.flows
+
+import co.paralleluniverse.fibers.Suspendable
+import net.corda.core.flows.*
+import net.corda.core.utilities.ProgressTracker
+import net.corda.core.flows.FinalityFlow
+
+import net.corda.core.flows.CollectSignaturesFlow
+
+import net.corda.core.transactions.SignedTransaction
+
+import java.util.stream.Collectors
+
+import net.corda.core.flows.FlowSession
+
+import net.corda.core.identity.Party
+
+import com.tutorial.contracts.TemplateContract
+
+import net.corda.core.transactions.TransactionBuilder
+
+import com.tutorial.states.TemplateState
+import net.corda.core.contracts.requireThat
+import net.corda.core.identity.AbstractParty
+
+
+// *********
+// * Flows *
+// *********
+@InitiatingFlow
+@StartableByRPC
+class Initiator(private val receiver: Party) : FlowLogic() {
+ override val progressTracker = ProgressTracker()
+
+ @Suspendable
+ override fun call(): SignedTransaction {
+ //Hello World message
+ val msg = "Hello-World"
+ val sender = ourIdentity
+
+ // Step 1. Get a reference to the notary service on our network and our key pair.
+ // Note: ongoing work to support multiple notary identities is still in progress.
+ val notary = serviceHub.networkMapCache.notaryIdentities[0]
+
+ //Compose the State that carries the Hello World message
+ val output = TemplateState(msg, sender, receiver)
+
+ // Step 3. Create a new TransactionBuilder object.
+ val builder = TransactionBuilder(notary)
+ .addCommand(TemplateContract.Commands.Create(), listOf(sender.owningKey, receiver.owningKey))
+ .addOutputState(output)
+
+ // Step 4. Verify and sign it with our KeyPair.
+ builder.verify(serviceHub)
+ val ptx = serviceHub.signInitialTransaction(builder)
+
+
+ // Step 6. Collect the other party's signature using the SignTransactionFlow.
+ val otherParties: MutableList = output.participants.stream().map { el: AbstractParty? -> el as Party? }.collect(Collectors.toList())
+ otherParties.remove(ourIdentity)
+ val sessions = otherParties.stream().map { el: Party? -> initiateFlow(el!!) }.collect(Collectors.toList())
+
+ val stx = subFlow(CollectSignaturesFlow(ptx, sessions))
+
+ // Step 7. Assuming no exceptions, we can now finalise the transaction
+ return subFlow(FinalityFlow(stx, sessions))
+ }
+}
+
+@InitiatedBy(Initiator::class)
+class Responder(val counterpartySession: FlowSession) : FlowLogic() {
+ @Suspendable
+ override fun call(): SignedTransaction {
+ val signTransactionFlow = object : SignTransactionFlow(counterpartySession) {
+ override fun checkTransaction(stx: SignedTransaction) = requireThat {
+ //Addition checks
+ }
+ }
+ val txId = subFlow(signTransactionFlow).id
+ return subFlow(ReceiveFinalityFlow(counterpartySession, expectedTxId = txId))
+ }
+}
+
diff --git a/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/PackageApples.kt b/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/PackageApples.kt
new file mode 100644
index 00000000..bdf1e2a0
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/PackageApples.kt
@@ -0,0 +1,43 @@
+package com.tutorial.flows
+
+import co.paralleluniverse.fibers.Suspendable
+import com.tutorial.contracts.BasketOfApplesContract.Commands.packBasket
+import com.tutorial.states.BasketOfApples
+import net.corda.core.flows.*
+import net.corda.core.identity.Party
+import net.corda.core.transactions.SignedTransaction
+import net.corda.core.transactions.TransactionBuilder
+
+@InitiatingFlow
+@StartableByRPC
+class PackApplesInitiator(private val appleDescription: String, private val weight: Int) : FlowLogic(){
+
+ @Suspendable
+ override fun call(): SignedTransaction {
+
+ /* Obtain a reference to a notary we wish to use.
+ * METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
+ * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)
+ * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
+ */
+ val notary = serviceHub.networkMapCache.notaryIdentities[0] // METHOD 1
+ //final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+
+ //Create the output object
+ val basket = BasketOfApples(description = appleDescription, farm = ourIdentity, weight = weight)
+
+ //Building transaction
+ val txBuilder = TransactionBuilder(notary)
+ .addOutputState(basket)
+ .addCommand(packBasket(), ourIdentity.owningKey)
+
+ // Verify the transaction
+ txBuilder.verify(serviceHub)
+
+ // Sign the transaction
+ val signedTransaction = serviceHub.signInitialTransaction(txBuilder)
+
+ // Notarise the transaction and record the states in the ledger.
+ return subFlow(FinalityFlow(signedTransaction, emptyList()))
+ }
+}
diff --git a/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/RedeemApples.kt b/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/RedeemApples.kt
new file mode 100644
index 00000000..9f006d78
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/src/main/kotlin/com/tutorial/flows/RedeemApples.kt
@@ -0,0 +1,89 @@
+package com.tutorial.flows
+
+import co.paralleluniverse.fibers.Suspendable
+import com.tutorial.contracts.BasketOfApplesContract
+import com.tutorial.states.AppleStamp
+import com.tutorial.states.BasketOfApples
+import net.corda.core.contracts.StateAndRef
+import net.corda.core.contracts.UniqueIdentifier
+import net.corda.core.flows.*
+import net.corda.core.identity.Party
+import net.corda.core.node.services.Vault.RelevancyStatus
+import net.corda.core.node.services.Vault.StateStatus
+import net.corda.core.node.services.vault.QueryCriteria
+import net.corda.core.transactions.SignedTransaction
+import net.corda.core.transactions.TransactionBuilder
+import java.security.PublicKey
+import java.util.*
+
+@InitiatingFlow
+@StartableByRPC
+class RedeemApplesInitiator(private val buyer: Party, private val stampId: UniqueIdentifier) : FlowLogic() {
+
+ @Suspendable
+ override fun call(): SignedTransaction {
+
+ /* Obtain a reference to a notary we wish to use.
+ * METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
+ * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)
+ * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
+ */
+ val notary = serviceHub.networkMapCache.notaryIdentities[0] // METHOD 1
+ //final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+
+ //Query the AppleStamp
+ val inputCriteria = QueryCriteria.LinearStateQueryCriteria()
+ .withUuid(listOf(UUID.fromString(stampId.toString())))
+ .withStatus(StateStatus.UNCONSUMED)
+ .withRelevancyStatus(RelevancyStatus.RELEVANT)
+ val appleStampStateAndRef: StateAndRef<*> = serviceHub.vaultService.queryBy(AppleStamp::class.java, inputCriteria).states.get(0)
+
+ //Query output BasketOfApples
+ val outputCriteria: QueryCriteria = QueryCriteria.VaultQueryCriteria()
+ .withStatus(StateStatus.UNCONSUMED)
+ .withRelevancyStatus(RelevancyStatus.RELEVANT)
+ val BasketOfApplesStateAndRef: StateAndRef<*> = serviceHub.vaultService.queryBy(BasketOfApples::class.java, outputCriteria).states[0]
+ val originalBasketOfApples = BasketOfApplesStateAndRef.state.data as BasketOfApples
+
+ //Modify output to address the owner change
+ val output = originalBasketOfApples.changeOwner(buyer)
+
+ //Build Transaction
+ val txBuilder = TransactionBuilder(notary)
+ .addInputState(appleStampStateAndRef)
+ .addInputState(BasketOfApplesStateAndRef)
+ .addOutputState(output, BasketOfApplesContract.ID)
+ .addCommand(BasketOfApplesContract.Commands.Redeem(),
+ Arrays.asList(ourIdentity.owningKey, buyer.owningKey))
+
+ // Verify that the transaction is valid.
+ txBuilder.verify(serviceHub)
+
+ // Sign the transaction.
+ val partSignedTx = serviceHub.signInitialTransaction(txBuilder)
+
+ // Send the state to the counterparty, and receive it back with their signature.
+ val otherPartySession = initiateFlow(buyer)
+ val fullySignedTx = subFlow(
+ CollectSignaturesFlow(partSignedTx, Arrays.asList(otherPartySession)))
+
+ // Notarise and record the transaction in both parties' vaults.
+ return subFlow(FinalityFlow(fullySignedTx, Arrays.asList(otherPartySession)))
+ }
+}
+
+@InitiatedBy(RedeemApplesInitiator::class)
+class RedeemApplesResponder(private val counterpartySession: FlowSession) : FlowLogic() {
+ @Suspendable
+ @Throws(FlowException::class)
+ override fun call(): SignedTransaction {
+ val signedTransaction = subFlow(object : SignTransactionFlow(counterpartySession) {
+ @Throws(FlowException::class)
+ override fun checkTransaction(stx: SignedTransaction) {
+ }
+ })
+
+ //Stored the transaction into data base.
+ return subFlow(ReceiveFinalityFlow(counterpartySession, signedTransaction.id))
+ }
+}
diff --git a/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/CreateAndIssueAppleStampTest.kt b/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/CreateAndIssueAppleStampTest.kt
new file mode 100644
index 00000000..911c04ea
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/CreateAndIssueAppleStampTest.kt
@@ -0,0 +1,67 @@
+package com.tutorial
+
+import com.google.common.collect.ImmutableList
+import com.tutorial.flows.CreateAndIssueAppleStampInitiator
+import com.tutorial.flows.Initiator
+import com.tutorial.states.AppleStamp
+import com.tutorial.states.TemplateState
+import net.corda.core.node.services.Vault.StateStatus
+import net.corda.core.node.services.vault.QueryCriteria
+import net.corda.core.transactions.SignedTransaction
+import net.corda.testing.node.MockNetwork
+import net.corda.testing.node.MockNetworkParameters
+import net.corda.testing.node.StartedMockNode
+import net.corda.testing.node.TestCordapp
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.util.concurrent.Future
+
+class CreateAndIssueAppleStampTest {
+
+ private var network: MockNetwork? = null
+ private var a: StartedMockNode? = null
+ private var b: StartedMockNode? = null
+
+ @Before
+ fun setup() {
+ network = MockNetwork(MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
+ TestCordapp.findCordapp("com.tutorial.contracts"),
+ TestCordapp.findCordapp("com.tutorial.flows"))))
+ a = network!!.createPartyNode(null)
+ b = network!!.createPartyNode(null)
+ network!!.runNetwork()
+ }
+
+ @After
+ fun tearDown() {
+ network!!.stopNodes()
+ }
+
+ @Test
+ fun dummyTest() {
+ val flow = Initiator(b!!.info.legalIdentities[0])
+ val future: Future = a!!.startFlow(flow)
+ network!!.runNetwork()
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ val inputCriteria: QueryCriteria = QueryCriteria.VaultQueryCriteria().withStatus(StateStatus.UNCONSUMED)
+ val state = b!!.services.vaultService
+ .queryBy(TemplateState::class.java, inputCriteria).states[0].state.data
+ }
+
+ @Test
+ fun CreateAndIssueAppleStampTest() {
+ val flow1 = CreateAndIssueAppleStampInitiator(
+ "HoneyCrispy 4072", b!!.info.legalIdentities[0])
+ val future1: Future = a!!.startFlow(flow1)
+ network!!.runNetwork()
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ val inputCriteria: QueryCriteria = QueryCriteria.VaultQueryCriteria()
+ .withStatus(StateStatus.UNCONSUMED)
+ val state = b!!.services.vaultService
+ .queryBy(AppleStamp::class.java, inputCriteria).states[0].state.data
+ assert(state.stampDesc == "HoneyCrispy 4072")
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/FarmerSelfCreateBasketOfApplesTest.kt b/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/FarmerSelfCreateBasketOfApplesTest.kt
new file mode 100644
index 00000000..2191cc6a
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/FarmerSelfCreateBasketOfApplesTest.kt
@@ -0,0 +1,53 @@
+package com.tutorial
+
+import com.google.common.collect.ImmutableList
+import com.tutorial.flows.PackApplesInitiator
+import com.tutorial.states.BasketOfApples
+import net.corda.core.node.services.Vault.StateStatus
+import net.corda.core.node.services.vault.QueryCriteria
+import net.corda.core.transactions.SignedTransaction
+import net.corda.testing.node.MockNetwork
+import net.corda.testing.node.MockNetworkParameters
+import net.corda.testing.node.StartedMockNode
+import net.corda.testing.node.TestCordapp
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.util.concurrent.Future
+
+class FarmerSelfCreateBasketOfApplesTest {
+ private var network: MockNetwork? = null
+ private var a: StartedMockNode? = null
+ private var b: StartedMockNode? = null
+ @Before
+ fun setup() {
+ network = MockNetwork(MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
+ TestCordapp.findCordapp("com.tutorial.contracts"),
+ TestCordapp.findCordapp("com.tutorial.flows"))))
+ a = network!!.createPartyNode(null)
+ b = network!!.createPartyNode(null)
+ network!!.runNetwork()
+ }
+
+ @After
+ fun tearDown() {
+ network!!.stopNodes()
+ }
+
+ @Test
+ fun createBasketOfApples() {
+ val flow1 = PackApplesInitiator("Fuji4072", 10)
+ val future: Future = a!!.startFlow(flow1)
+ network!!.runNetwork()
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ val inputCriteria: QueryCriteria = QueryCriteria.VaultQueryCriteria().withStatus(StateStatus.UNCONSUMED)
+ val state = a!!.services.vaultService
+ .queryBy(BasketOfApples::class.java, inputCriteria).states[0].state.data
+ println("-------------------------")
+ println(state.owner)
+ println("-------------------------")
+ assert(state.description == "Fuji4072")
+ }
+}
+
diff --git a/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/FlowTests.kt b/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/FlowTests.kt
new file mode 100644
index 00000000..743ffa84
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/FlowTests.kt
@@ -0,0 +1,45 @@
+package com.tutorial
+
+import net.corda.testing.node.*
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import com.tutorial.states.TemplateState
+import java.util.concurrent.Future;
+import net.corda.core.node.services.vault.QueryCriteria
+import net.corda.core.transactions.SignedTransaction
+import com.tutorial.flows.Initiator
+import net.corda.core.node.services.Vault.StateStatus
+
+
+class FlowTests {
+ private lateinit var network: MockNetwork
+ private lateinit var a: StartedMockNode
+ private lateinit var b: StartedMockNode
+
+ @Before
+ fun setup() {
+ network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf(
+ TestCordapp.findCordapp("com.tutorial.contracts"),
+ TestCordapp.findCordapp("com.tutorial.flows")
+ )))
+ a = network.createPartyNode()
+ b = network.createPartyNode()
+ network.runNetwork()
+ }
+
+ @After
+ fun tearDown() {
+ network.stopNodes()
+ }
+ @Test
+ fun `DummyTest`() {
+ val flow = Initiator(b.info.legalIdentities[0])
+ val future: Future = a.startFlow(flow)
+ network.runNetwork()
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ val inputCriteria: QueryCriteria = QueryCriteria.VaultQueryCriteria().withStatus(StateStatus.UNCONSUMED)
+ val state = b.services.vaultService.queryBy(TemplateState::class.java, inputCriteria).states[0].state.data
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/RedeemApplesWithStampTest.kt b/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/RedeemApplesWithStampTest.kt
new file mode 100644
index 00000000..b96454e6
--- /dev/null
+++ b/Basic/tutorial-jarsigning/workflows/src/test/kotlin/com/tutorial/RedeemApplesWithStampTest.kt
@@ -0,0 +1,69 @@
+package com.tutorial
+
+import com.google.common.collect.ImmutableList
+import com.tutorial.flows.CreateAndIssueAppleStampInitiator
+import com.tutorial.flows.PackApplesInitiator
+import com.tutorial.flows.RedeemApplesInitiator
+import com.tutorial.states.AppleStamp
+import com.tutorial.states.BasketOfApples
+import net.corda.core.contracts.UniqueIdentifier
+import net.corda.core.node.services.Vault.StateStatus
+import net.corda.core.node.services.vault.QueryCriteria
+import net.corda.core.transactions.SignedTransaction
+import net.corda.testing.node.MockNetwork
+import net.corda.testing.node.MockNetworkParameters
+import net.corda.testing.node.StartedMockNode
+import net.corda.testing.node.TestCordapp
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import java.util.concurrent.ExecutionException
+import java.util.concurrent.Future
+
+class RedeemApplesWithStampTest {
+ private var network: MockNetwork? = null
+ private var a: StartedMockNode? = null
+ private var b: StartedMockNode? = null
+ @Before
+ fun setup() {
+ network = MockNetwork(MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
+ TestCordapp.findCordapp("com.tutorial.contracts"),
+ TestCordapp.findCordapp("com.tutorial.flows"))))
+ a = network!!.createPartyNode(null)
+ b = network!!.createPartyNode(null)
+ network!!.runNetwork()
+ }
+
+ @After
+ fun tearDown() {
+ network!!.stopNodes()
+ }
+
+ @Test
+ @Throws(ExecutionException::class, InterruptedException::class)
+ fun buyerRedeemBasketOfApples() {
+ //Create Basket of Apples
+ val createBasketOfApples = PackApplesInitiator("Fuji4072", 10)
+ val future: Future = a!!.startFlow(createBasketOfApples)
+ network!!.runNetwork()
+
+ //Issue Apple Stamp
+ val issueAppleStamp = CreateAndIssueAppleStampInitiator(
+ "Fuji4072", b!!.info.legalIdentities[0])
+ val future1: Future = a!!.startFlow(issueAppleStamp)
+ network!!.runNetwork()
+ val issuedStamp = future1.get().tx.outputStates[0] as AppleStamp
+ val id = issuedStamp.linearId
+
+ //Redeem Basket of Apples with stamp
+ val redeemApples = RedeemApplesInitiator(b!!.info.legalIdentities[0], id)
+ val future2: Future = a!!.startFlow(redeemApples)
+ network!!.runNetwork()
+
+ //successful query means the state is stored at node b's vault. Flow went through.
+ val outputCriteria: QueryCriteria = QueryCriteria.VaultQueryCriteria().withStatus(StateStatus.UNCONSUMED)
+ val state = b!!.services.vaultService
+ .queryBy(BasketOfApples::class.java, outputCriteria).states[0].state.data
+ assert(state.description == "Fuji4072")
+ }
+}
\ No newline at end of file
diff --git a/Basic/tutorial-networkbootstrapper/Notary_node.conf b/Basic/tutorial-networkbootstrapper/Notary_node.conf
new file mode 100644
index 00000000..e5fc437c
--- /dev/null
+++ b/Basic/tutorial-networkbootstrapper/Notary_node.conf
@@ -0,0 +1,32 @@
+devMode=true
+myLegalName="O=Notary,L=London,C=GB"
+notary {
+ validating=false
+}
+
+//remote Vm address
+p2pAddress="20.222.71.244:10002"
+
+rpcSettings {
+ address="0.0.0.0:10003"
+ adminAddress="0.0.0.0:10103"
+ standAloneBroker=false
+ useSsl=false
+}
+security {
+ authService {
+ dataSource {
+ type=INMEMORY
+ users=[
+ {
+ password=password
+ permissions=[
+ ALL
+ ]
+ user=user1
+ }
+ ]
+ }
+ }
+}
+
diff --git a/Basic/tutorial-networkbootstrapper/PA_node.conf b/Basic/tutorial-networkbootstrapper/PA_node.conf
new file mode 100644
index 00000000..2d9f7cc5
--- /dev/null
+++ b/Basic/tutorial-networkbootstrapper/PA_node.conf
@@ -0,0 +1,33 @@
+devMode=true
+myLegalName="O=PA,L=London,C=GB"
+
+//remote VM address
+p2pAddress="13.71.147.131:10007"
+
+rpcSettings {
+ address="0.0.0.0:10008"
+ adminAddress="0.0.0.0:10108"
+ standAloneBroker=false
+ useSsl=false
+}
+security {
+ authService {
+ dataSource {
+ type=INMEMORY
+ users=[
+ {
+ password=password
+ permissions=[
+ ALL
+ ]
+ user=user1
+ }
+ ]
+ }
+ }
+}
+sshd {
+ port = 2222
+}
+
+
diff --git a/Basic/tutorial-networkbootstrapper/PB_node.conf b/Basic/tutorial-networkbootstrapper/PB_node.conf
new file mode 100644
index 00000000..8088047d
--- /dev/null
+++ b/Basic/tutorial-networkbootstrapper/PB_node.conf
@@ -0,0 +1,29 @@
+devMode=true
+myLegalName="O=PB,L=London,C=GB"
+
+//remote vm address
+p2pAddress="20.222.71.244:10009"
+
+rpcSettings {
+ address="0.0.0.0:10010"
+ adminAddress="0.0.0.0:10110"
+ standAloneBroker=false
+ useSsl=false
+}
+security {
+ authService {
+ dataSource {
+ type=INMEMORY
+ users=[
+ {
+ password=password
+ permissions=[
+ ALL
+ ]
+ user=user1
+ }
+ ]
+ }
+ }
+}
+
diff --git a/Basic/tutorial-networkbootstrapper/README.md b/Basic/tutorial-networkbootstrapper/README.md
new file mode 100644
index 00000000..6dabe46b
--- /dev/null
+++ b/Basic/tutorial-networkbootstrapper/README.md
@@ -0,0 +1,56 @@
+# Network Bootstrapper Tutorial
+
+In this tutorial, we will walk through the steps of bootstrapping a Corda Network using the Corda Network Bootstrapper. This tutorial consists of 3 node Config files and 2 shell scripts to ease up the manual copying of the files and folders.
+
+Due to the size cap of the GitHub uploaded file, you will need to manually download the Corda Network Bootstrapper (to this directory). The download link is at [here](https://software.r3.com/ui/native/corda-releases/net/corda/corda-tools-network-bootstrapper)
+
+## Deploy a local Corda Network via the bootstrapper
+With the Corda Network Bootstrapper downloaded to this directory, you can simply call: (with the version name of the bootstrapper that you downloaded)
+```
+java -jar corda-tools-network-bootstrapper-4.9.jar
+```
+This command will generate the node folders that corresponds with each node config file. You should expect some folder structure like this:
+```
+.
+├── network_Bootstrapper.jar
+├── Notary_node.conf
+├── PA_node.conf
+├── PB_node.conf
+├── cordapp-a.jar
+├── cordapp-b.jar
+├── checkpoints_xxxxxx.log //Logs of bootstrapping
+├── diagnostic-xxxxxxx.log //Logs of bootstrapping
+├── node-xxxxx.log //Logs of bootstrapping
+├── Notary //Notary's folder
+├── PA //PA's folder
+└── PB //PB's folder
+```
+Next, you will need to go into each node folder and start the node.
+```
+cd PA
+java -jar corda.jar
+```
+Then, you can go into the PB folder and Notary folder to do the same steps, and you will have a Corda network running on your local machine.
+
+## Deploy a Corda Network onto VMs via the bootstrapper
+
+When deploying a Corda network to remote VMs, you would need to do an additional step before bootstrap the node folders. You would need to go into the node.conf file and add the VM address. For example: (this is not the full config file, you still need other fields.)
+```
+//remote VM address
+p2pAddress="13.71.147.131:10007"
+rpcSettings {
+ address="0.0.0.0:10008"
+ adminAddress="0.0.0.0:10108"
+ standAloneBroker=false
+ useSsl=false
+}
+```
+After change the p2pAddress, you can now perform the bootstrapping with
+```
+java -jar corda-tools-network-bootstrapper-4.9.jar
+```
+Next, we need to drop the node folder to the remote VMs. I simply use the `scp` command. For example:
+```
+scp -r ./PartyA user@13.71.147.131:./
+```
+The steps for starting the node would be the same with doing so on a local machine.
diff --git a/Basic/tutorial-networkbootstrapper/bootstrapp.sh b/Basic/tutorial-networkbootstrapper/bootstrapp.sh
new file mode 100644
index 00000000..8b85ff13
--- /dev/null
+++ b/Basic/tutorial-networkbootstrapper/bootstrapp.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "Bootstrapping the network"
+java -jar corda-tools-network-bootstrapper-4.9.jar
+
+
diff --git a/Basic/tutorial-networkbootstrapper/clean.sh b/Basic/tutorial-networkbootstrapper/clean.sh
new file mode 100644
index 00000000..2dd973e0
--- /dev/null
+++ b/Basic/tutorial-networkbootstrapper/clean.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+echo "Remove the generated node folders."
+rm -rf ./PA
+rm -rf ./PB
+rm -rf ./Notary
+
+echo "Remove the bootstrapping log files."
+rm checkpoints*
+rm diagnostic*
+rm node-admin*
diff --git a/BusinessNetworks/constants.properties b/BusinessNetworks/constants.properties
index 1eab3f6b..2e4426cc 100644
--- a/BusinessNetworks/constants.properties
+++ b/BusinessNetworks/constants.properties
@@ -1,13 +1,13 @@
cordaReleaseGroup=net.corda
cordaCoreReleaseGroup=net.corda
-cordaVersion=4.7
-cordaCoreVersion=4.7
+cordaVersion=4.10
+cordaCoreVersion=4.10
gradlePluginsVersion=5.0.12
kotlinVersion=1.2.71
junitVersion=4.12
quasarVersion=0.7.10
-log4jVersion =2.11.2
-platformVersion=9
+log4jVersion =2.17.1
+platformVersion=12
slf4jVersion=1.7.25
nettyVersion=4.1.22.Final
corda_bn_extension_version=1.1-RC03
diff --git a/BusinessNetworks/insurancebusinessnetwork/README.md b/BusinessNetworks/insurancebusinessnetwork/README.md
index e83ea119..4890f098 100644
--- a/BusinessNetworks/insurancebusinessnetwork/README.md
+++ b/BusinessNetworks/insurancebusinessnetwork/README.md
@@ -16,13 +16,13 @@ In our sample, we will have three nodes, named as:
* Insurance <- Insurance Company that is in the network
* CarePro <- Care Provider of the network
-The NetworkOperator will be create and primarily manage the network. As introduced in the SDK docs, NetworkOperator will be the default authorized user of this global network. And the other two nodes will fill the roles which can be easily tell by its name.
+The NetworkOperator will create and primarily manage the network. As introduced in the SDK docs, NetworkOperator will be the default authorized user of this global network. And the other two nodes will fill the roles which can be easily tell by its name.
#### The corDapp will run with the following steps:
1. Network creations by NetworkOperator
2. The rest of the nodes request join the network
3. The NetworkOperator will query all the request and active the membership status for the other nodes.
-4. The NetworkOperator will then create a sub group out of the global insurance network called APAC_Insurance_Alliance, and include the two other nodes in the network.
+4. The NetworkOperator will then create a subgroup out of the global insurance network called APAC_Insurance_Alliance, and include the two other nodes in the network.
5. The NetworkOperator will then assign custom network identity to the nodes. The insurer node will get an insurance identity, the carePro node will get a health care provider identity.
6. Custom network identity comes with custom roles. We will give the insurer node a policy.
As of now, the network setup is done. The very last step is to run a transaction between the insurer and the carePro node
@@ -33,7 +33,7 @@ The NetworkOperator will be create and primarily manage the network. As introduc
Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)
```
-./gradlew clean deployNodes
+./gradlew clean build deployNodes
```
Then type: (to run the nodes)
```
@@ -41,7 +41,7 @@ Then type: (to run the nodes)
```
#### Interacting with the CorDapp
-**Step 1:** Create the network in NetwprkOperator's terminal
+**Step 1:** Create the network in NetworkOperator's terminal
```
flow start CreateNetwork
```
@@ -62,7 +62,7 @@ flow start RequestMembership authorisedParty: NetworkOperator, networkId:
diff --git a/BusinessNetworks/insurancebusinessnetwork/build.gradle b/BusinessNetworks/insurancebusinessnetwork/build.gradle
index dd83578d..77d083c8 100644
--- a/BusinessNetworks/insurancebusinessnetwork/build.gradle
+++ b/BusinessNetworks/insurancebusinessnetwork/build.gradle
@@ -24,8 +24,9 @@ buildscript {//properties that you need to build the project
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -42,9 +43,10 @@ allprojects {//Properties that you need to compile your project (The application
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://jitpack.io' }
}
@@ -87,6 +89,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
diff --git a/BusinessNetworks/insurancebusinessnetwork/repositories.gradle b/BusinessNetworks/insurancebusinessnetwork/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/BusinessNetworks/insurancebusinessnetwork/repositories.gradle
+++ b/BusinessNetworks/insurancebusinessnetwork/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/IssuePolicy.java b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/IssuePolicy.java
index 16a0d549..528af131 100644
--- a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/IssuePolicy.java
+++ b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/IssuePolicy.java
@@ -10,6 +10,7 @@
import net.corda.core.contracts.*;
import net.corda.core.crypto.SecureHash;
import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.transactions.SignedTransaction;
import net.corda.core.transactions.TransactionBuilder;
@@ -45,7 +46,9 @@ public IssuePolicyInitiator(String networkId, Party careProvider, String insuree
@Override
@Suspendable
public SignedTransaction call() throws FlowException {
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
businessNetworkFullVerification(this.networkId, getOurIdentity(), this.careProvider);
InsuranceState outputState = new InsuranceState(getOurIdentity(), this.insuree, this.careProvider, networkId, "Initiating Policy");
BNService bnService = getServiceHub().cordaService(BNService.class);
diff --git a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/ActiveMembers.java b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/ActiveMembers.java
index 457d29a2..ad0384a5 100644
--- a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/ActiveMembers.java
+++ b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/ActiveMembers.java
@@ -6,6 +6,7 @@
import net.corda.core.flows.FlowException;
import net.corda.core.flows.FlowLogic;
import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
@StartableByRPC
@@ -20,7 +21,9 @@ public ActiveMembers(UniqueIdentifier membershipId) {
@Override
@Suspendable
public String call() throws FlowException {
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
subFlow(new ActivateMembershipFlow(this.membershipId,notary));
return "\nMember("+ this.membershipId.toString()+")'s network membership has been activated.";
}
diff --git a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignBNIdentity.java b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignBNIdentity.java
index bace7edd..7f1767a6 100644
--- a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignBNIdentity.java
+++ b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignBNIdentity.java
@@ -6,6 +6,7 @@
import net.corda.core.flows.FlowException;
import net.corda.core.flows.FlowLogic;
import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.samples.businessmembership.states.CareProviderIdentity;
import net.corda.samples.businessmembership.states.InsurerIdentity;
@@ -26,7 +27,9 @@ public AssignBNIdentity(String firmType, UniqueIdentifier membershipId, String b
@Override
@Suspendable
public String call() throws FlowException {
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
if(this.firmType.equals("InsuranceFirm")){
InsurerIdentity insuranceIdty = new InsurerIdentity(bnIdentity);
if(!insuranceIdty.isValid()){
diff --git a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignOrthodonticsRole.java b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignOrthodonticsRole.java
index 882288b1..f00d5d55 100644
--- a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignOrthodonticsRole.java
+++ b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignOrthodonticsRole.java
@@ -9,6 +9,7 @@
import net.corda.core.flows.FlowException;
import net.corda.core.flows.FlowLogic;
import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.transactions.SignedTransaction;
import net.corda.samples.businessmembership.states.CareProviderIdentity;
@@ -31,7 +32,9 @@ public AssignOrthodonticsRole(UniqueIdentifier membershipId, String networkId) {
@Suspendable
public SignedTransaction call() throws FlowException {
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
BNService bnService = getServiceHub().cordaService(BNService.class);
MembershipState membershipState = bnService.getMembership(membershipId).getState().getData();
Set roles = new HashSet<>();
diff --git a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignPolicyIssuerRole.java b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignPolicyIssuerRole.java
index 53665b2b..602178e0 100644
--- a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignPolicyIssuerRole.java
+++ b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/AssignPolicyIssuerRole.java
@@ -9,6 +9,7 @@
import net.corda.core.flows.FlowException;
import net.corda.core.flows.FlowLogic;
import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.transactions.SignedTransaction;
import net.corda.samples.businessmembership.states.InsurerIdentity;
@@ -30,7 +31,9 @@ public AssignPolicyIssuerRole(UniqueIdentifier membershipId, String networkId) {
@Override
@Suspendable
public SignedTransaction call() throws FlowException {
- Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
BNService bnService = getServiceHub().cordaService(BNService.class);
MembershipState membershipState = bnService.getMembership(this.membershipId).getState().getData();
Set roles = new HashSet<>();
diff --git a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/CreateNetworkSubGroup.java b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/CreateNetworkSubGroup.java
index 82ef8ccb..72bebce8 100644
--- a/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/CreateNetworkSubGroup.java
+++ b/BusinessNetworks/insurancebusinessnetwork/workflows/src/main/java/net/corda/samples/businessmembership/flows/membershipFlows/CreateNetworkSubGroup.java
@@ -6,6 +6,7 @@
import net.corda.core.flows.FlowException;
import net.corda.core.flows.FlowLogic;
import net.corda.core.flows.StartableByRPC;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import java.util.Set;
@@ -26,7 +27,9 @@ public CreateNetworkSubGroup(String networkId, String groupName, Set
-
### [Trade Reporting -- ObservableStates](./observablestates-tradereporting):
-This CorDapp shows how Corda's [observable states](https://docs.corda.net/docs/corda-os/4.4/tutorial-observer-nodes.html#observer-nodes) feature works. Observable states is the ability for nodes who are not participants in a transaction to still store them if the transactions are sent to them.
+This CorDapp shows how Corda's observable states feature works. Observable states is the ability for nodes who are not participants in a transaction to still store them if the transactions are sent to them.
### [Prime Number -- Oracle](./oracle-primenumber):
-This CorDapp implements an [oracle service](https://training.corda.net/corda-details/oracles) that allows nodes to:
+This CorDapp implements an [oracle service](https://docs.r3.com/en/platform/corda/4.9/community/key-concepts-oracles.html) that allows nodes to:
* Request the Nth prime number
* Request the oracle's signature to prove that the number included in their transaction is actually the Nth prime number
### [Car Insurance -- QueryableState](./queryablestate-carinsurance):
-This CorDapp demonstrates [QueryableState](https://docs.corda.net/docs/corda-os/api-persistence.html) works in Corda. Corda allows developers to have the ability to expose some or all parts of their states to a custom database table using an ORM tools. To support this feature the state must implement `QueryableState`.
+This CorDapp demonstrates [QueryableState](https://docs.r3.com/en/platform/corda/4.9/enterprise/cordapps/api-states.html#the-queryablestate-and-schedulablestate-interfaces) works in Corda. Corda allows developers to have the ability to expose some or all parts of their states to a custom database table using an ORM tools. To support this feature the state must implement `QueryableState`.
### [Sanctionsbody -- ReferenceStates](./referencestates-sanctionsbody):
-This CorDapp demonstrates the use of [reference states](https://training.corda.net/corda-details/reference-states/) in a transaction and in the verification method of a contract.
+This CorDapp demonstrates the use of [reference states](https://docs.r3.com/en/platform/corda/4.9/enterprise/cordapps/api-states.html#reference-states) in a transaction and in the verification method of a contract.
This CorDapp allows two nodes to enter into an IOU agreement, but enforces that both parties belong to a list of sanctioned entities. This list of sanctioned entities is taken from a referenced SanctionedEntities state.
### [Heartbeat -- SchedulableState](./schedulablestate-heartbeat):
-This CorDapp is a simple showcase of [scheduled activities](https://docs.corda.net/docs/corda-os/event-scheduling.html#how-to-implement-scheduled-events) (i.e. activities started by a node at a specific time without direct input from the node owner).
+This CorDapp is a simple showcase of [scheduled activities](https://docs.r3.com/en/platform/corda/4.9/enterprise/cordapps/api-states.html#the-queryablestate-and-schedulablestate-interfaces) (i.e. activities started by a node at a specific time without direct input from the node owner).
-### [CustomLogging -- YoCordapp](./customlogging-yocordapp):
-This cordapp has some examples on how to setup custom logging with corda for either json logging and other tooling.
+### [CustomLogging -- YoCorDapp](./customlogging-yocordapp):
+This CorDapp has some examples on how to set up custom logging with corda for either json logging and other tooling.
diff --git a/Features/attachment-blacklist/README.md b/Features/attachment-blacklist/README.md
index 44bae370..027f0899 100644
--- a/Features/attachment-blacklist/README.md
+++ b/Features/attachment-blacklist/README.md
@@ -23,14 +23,14 @@ check that the parties to the `AgreementState` are not blacklisted. There aren't
## Pre-Requisites
-For development environment setup, please refer to: [Setup Guide](https://docs.corda.net/getting-set-up.html).
+For development environment setup, please refer to: [Setup Guide](https://docs.r3.com/en/platform/corda/4.10/community/getting-set-up.html).
### Running the CorDapp
Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)
```
-./gradlew clean deployNodes
+./gradlew clean build deployNodes
```
Then type: (to run the nodes)
```
@@ -43,7 +43,7 @@ Then type: (to run the nodes)
Note: The nodes must be running before attempting this step
Before attempting to reach any agreements, you must upload the blacklist as an attachment to each node that you want to
-be able to *initiate* an agreement. The blacklist can be uploaded via [RPC](https://docs.corda.net/docs/corda-os/api-rpc.html#api-rpc-operations) by running the following command from the
+be able to *initiate* an agreement. The blacklist can be uploaded via [RPC](https://docs.r3.com/en/platform/corda/4.9/community/api-rpc.html) by running the following command from the
project's root folder:
Java version
diff --git a/Features/attachment-blacklist/build.gradle b/Features/attachment-blacklist/build.gradle
index e22c3ff6..10b2b6f3 100644
--- a/Features/attachment-blacklist/build.gradle
+++ b/Features/attachment-blacklist/build.gradle
@@ -21,8 +21,8 @@ buildscript {
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -39,10 +39,10 @@ allprojects {
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
@@ -92,6 +92,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
diff --git a/Features/attachment-blacklist/repositories.gradle b/Features/attachment-blacklist/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/Features/attachment-blacklist/repositories.gradle
+++ b/Features/attachment-blacklist/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Features/attachment-blacklist/workflows/src/main/java/net/corda/samples/blacklist/ProposeFlow.java b/Features/attachment-blacklist/workflows/src/main/java/net/corda/samples/blacklist/ProposeFlow.java
index 84192173..0f9ded89 100644
--- a/Features/attachment-blacklist/workflows/src/main/java/net/corda/samples/blacklist/ProposeFlow.java
+++ b/Features/attachment-blacklist/workflows/src/main/java/net/corda/samples/blacklist/ProposeFlow.java
@@ -4,6 +4,7 @@
import com.google.common.collect.ImmutableSet;
import net.corda.core.crypto.SecureHash;
import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.transactions.SignedTransaction;
import net.corda.core.transactions.TransactionBuilder;
@@ -42,13 +43,8 @@ Party getFirstNotary() throws FlowException {
public SignedTransaction call() throws FlowException {
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- Party notary = getFirstNotary(); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
AgreementState agreementState = new AgreementState(getOurIdentity(), counterparty, agreementTxt);
AgreementContract.Commands.Agree agreeCmd = new AgreementContract.Commands.Agree();
diff --git a/Features/attachment-blacklist/workflows/src/test/java/net/corda/samples/blacklist/FlowTests.java b/Features/attachment-blacklist/workflows/src/test/java/net/corda/samples/blacklist/FlowTests.java
index 74ecb8fa..66ee8654 100644
--- a/Features/attachment-blacklist/workflows/src/test/java/net/corda/samples/blacklist/FlowTests.java
+++ b/Features/attachment-blacklist/workflows/src/test/java/net/corda/samples/blacklist/FlowTests.java
@@ -6,13 +6,11 @@
import net.corda.core.contracts.StateAndRef;
import net.corda.core.contracts.TransactionVerificationException;
import net.corda.core.crypto.SecureHash;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.transactions.SignedTransaction;
import net.corda.samples.blacklist.states.AgreementState;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.hamcrest.core.IsInstanceOf;
import org.junit.After;
import org.junit.Before;
@@ -43,7 +41,9 @@ public class FlowTests {
@Before
public void setup() throws FileNotFoundException {
this.network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
- TestCordapp.findCordapp("net.corda.samples.blacklist.contracts"))));
+ TestCordapp.findCordapp("net.corda.samples.blacklist.contracts")))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
+ );
this.a = this.network.createNode();
this.b = this.network.createNode();
this.aIdentity = this.a.getInfo().getLegalIdentities().get(0);
diff --git a/Features/attachment-sendfile/README.md b/Features/attachment-sendfile/README.md
index 78d727eb..78db4ca4 100644
--- a/Features/attachment-sendfile/README.md
+++ b/Features/attachment-sendfile/README.md
@@ -1,12 +1,12 @@
# Sendfile -- Attachment
-This Cordapp shows how to upload and download an [attachment](https://training.corda.net/corda-details/attachments/) via flow.
+This CorDapp shows how to upload and download an [attachment](https://docs.r3.com/en/platform/corda/4.10/community/cordapp-build-systems.html#cordapp-contract-attachments) via flow.
## Concepts
-In this Cordapp, there are two parties:
+In this CorDapp, there are two parties:
* Seller: sends an invoice (with attachment) to Buyer
-* Buyer: receive the the invoice and be able to download the attached zip file to their local machine
+* Buyer: receive the invoice and be able to download the attached zip file to their local machine
### States
@@ -28,10 +28,10 @@ The flow logic is the following:
* `sendAttachment`: send and sync the attachment between parties
1. Uploading attachment from local
- 2. Attaching the accachmentID to the transaction
- 3. Storing the attached file into attachment service at the counterparty's node (Automatically check if it already exists or not. If it does, do nothing; if not, download the attached file from the conterparty.)
+ 2. Attaching the attachmentID to the transaction
+ 3. Storing the attached file into attachment service at the counterparty's node (Automatically check if it already exists or not. If it does, do nothing; if not, download the attached file from the counterparty.)
-* `downloadAttchment`: save the attachment file from node's serviceHub to local
+* `downloadAttachment`: save the attachment file from node's serviceHub to local
1. signing the attachment service in the node to download the file via attachmentID
@@ -43,7 +43,7 @@ The flow logic is the following:
Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)
```
-./gradlew clean deployNodes
+./gradlew clean build deployNodes
```
Then type: (to run the nodes)
```
diff --git a/Features/attachment-sendfile/build.gradle b/Features/attachment-sendfile/build.gradle
index 297761b9..0997dcb1 100644
--- a/Features/attachment-sendfile/build.gradle
+++ b/Features/attachment-sendfile/build.gradle
@@ -4,28 +4,32 @@ buildscript {
ext {
corda_release_group = constants.getProperty("cordaReleaseGroup")
- corda_release_version = constants.getProperty("cordaVersion")
corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
+ corda_release_version = constants.getProperty("cordaVersion")
corda_core_release_version = constants.getProperty("cordaCoreVersion")
corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
+ kotlin_version = constants.getProperty("kotlinVersion")
junit_version = constants.getProperty("junitVersion")
quasar_version = constants.getProperty("quasarVersion")
log4j_version = constants.getProperty("log4jVersion")
slf4j_version = constants.getProperty("slf4jVersion")
corda_platform_version = constants.getProperty("platformVersion").toInteger()
+ spring_boot_version = '2.0.2.RELEASE'
+ ext.spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
}
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
classpath "net.corda.plugins:cordapp:$corda_gradle_plugins_version"
classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version"
classpath "net.corda.plugins:quasar-utils:$corda_gradle_plugins_version"
+ classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_gradle_plugin_version"
}
}
@@ -35,10 +39,19 @@ allprojects {
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
maven { url 'https://jitpack.io' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+ }
+
+ configurations {
+ compile {
+ // We want to use SLF4J's version of these bindings: jcl-over-slf4j
+ // Remove any transitive dependency on Apache's version.
+ exclude group: 'commons-logging', module: 'commons-logging'
+ }
}
tasks.withType(JavaCompile) {
@@ -49,11 +62,13 @@ allprojects {
// This makes the JAR's SHA-256 hash repeatable.
preserveFileTimestamps = false
reproducibleFileOrder = true
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
}
apply plugin: 'net.corda.plugins.cordapp'
apply plugin: 'net.corda.plugins.quasar-utils'
+apply plugin: 'net.corda.plugins.cordformation'
sourceSets {
main {
@@ -63,42 +78,24 @@ sourceSets {
}
}
+//Module dependencis
dependencies {
// Corda dependencies.
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
cordaRuntime "$corda_release_group:corda:$corda_release_version"
+ // CorDapp dependencies.
+ cordapp project(":workflows")
+ cordapp project(":contracts")
+
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
- cordapp project('contracts')
- cordapp project('workflows')
-}
-
-task installQuasar(type: Copy) {
- destinationDir rootProject.file("lib")
- from(configurations.quasar) {
- rename 'quasar-core(.*).jar', 'quasar.jar'
- }
-}
-
-cordapp {
- info {
- name "Attachment Sendfile"
- vendor "Corda Open Source"
- targetPlatformVersion corda_platform_version
- minimumPlatformVersion corda_platform_version
- }
}
-apply plugin: 'net.corda.plugins.cordapp'
-apply plugin: 'net.corda.plugins.quasar-utils'
-apply plugin: 'net.corda.plugins.cordformation'
-apply plugin: 'java'
-
-
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
nodeDefaults {
diff --git a/Features/attachment-sendfile/contracts/src/test/java/net.corda.samples.sendfile/contracts/InvoiceContractTests.java b/Features/attachment-sendfile/contracts/src/test/java/net.corda.samples.sendfile/contracts/InvoiceContractTests.java
index bc461317..c7f05118 100644
--- a/Features/attachment-sendfile/contracts/src/test/java/net.corda.samples.sendfile/contracts/InvoiceContractTests.java
+++ b/Features/attachment-sendfile/contracts/src/test/java/net.corda.samples.sendfile/contracts/InvoiceContractTests.java
@@ -13,7 +13,7 @@
import java.util.Arrays;
import static net.corda.testing.node.NodeTestUtils.transaction;
-import static org.jgroups.util.Util.assertEquals;
+import static org.junit.Assert.assertEquals;
public class InvoiceContractTests {
diff --git a/Features/attachment-sendfile/repositories.gradle b/Features/attachment-sendfile/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/Features/attachment-sendfile/repositories.gradle
+++ b/Features/attachment-sendfile/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Features/attachment-sendfile/workflows/file.zip b/Features/attachment-sendfile/workflows/file.zip
new file mode 100644
index 00000000..789ee5b4
Binary files /dev/null and b/Features/attachment-sendfile/workflows/file.zip differ
diff --git a/Features/attachment-sendfile/workflows/src/main/java/net/corda/samples/sendfile/flows/SendAttachment.java b/Features/attachment-sendfile/workflows/src/main/java/net/corda/samples/sendfile/flows/SendAttachment.java
index e03a3dde..ff2325b3 100644
--- a/Features/attachment-sendfile/workflows/src/main/java/net/corda/samples/sendfile/flows/SendAttachment.java
+++ b/Features/attachment-sendfile/workflows/src/main/java/net/corda/samples/sendfile/flows/SendAttachment.java
@@ -4,6 +4,7 @@
import com.google.common.collect.ImmutableList;
import net.corda.core.crypto.SecureHash;
import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.node.ServiceHub;
import net.corda.core.transactions.SignedTransaction;
@@ -53,14 +54,8 @@ public ProgressTracker getProgressTracker() {
public SignedTransaction call() throws FlowException {
// Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
-
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
// Initiate transaction Builder
TransactionBuilder transactionBuilder = new TransactionBuilder(notary);
diff --git a/Features/attachment-sendfile/workflows/src/test/java/net/corda/samples/sendfile/flows/FlowTests.java b/Features/attachment-sendfile/workflows/src/test/java/net/corda/samples/sendfile/flows/FlowTests.java
index c526a824..9a05e859 100644
--- a/Features/attachment-sendfile/workflows/src/test/java/net/corda/samples/sendfile/flows/FlowTests.java
+++ b/Features/attachment-sendfile/workflows/src/test/java/net/corda/samples/sendfile/flows/FlowTests.java
@@ -2,11 +2,9 @@
import com.google.common.collect.ImmutableList;
import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.transactions.SignedTransaction;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -17,7 +15,8 @@ public class FlowTests {
private final MockNetwork network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
TestCordapp.findCordapp("net.corda.samples.sendfile.contracts"),
TestCordapp.findCordapp("net.corda.samples.sendfile.flows")
- )));
+ ))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB")))));
private final StartedMockNode a = network.createNode();
private final StartedMockNode b = network.createNode();
diff --git a/Features/confidentialidentity-whistleblower/README.md b/Features/confidentialidentity-whistleblower/README.md
index a8993342..2e8a4e1f 100644
--- a/Features/confidentialidentity-whistleblower/README.md
+++ b/Features/confidentialidentity-whistleblower/README.md
@@ -1,6 +1,6 @@
# Whistleblower -- Confidential Identity
-This CorDapp is a simple showcase of [confidential identities](https://docs.corda.net/docs/corda-os/api-identity.html#confidential-identities) (i.e. anonymous public keys).
+This CorDapp is a simple showcase of [confidential identities](https://docs.r3.com/en/platform/corda/4.10/community/api-identity.html#confidential-identities) (i.e. anonymous public keys).
## Concepts
@@ -8,7 +8,7 @@ This CorDapp is a simple showcase of [confidential identities](https://docs.cord
A node (the *whistle-blower*) can whistle-blow on a company to another node (the *investigator*). Both the
whistle-blower and the investigator generate anonymous public keys for this transaction, meaning that any third-parties
-who manage to get ahold of the state cannot identity the whistle-blower or investigator. This process is handled
+who manage to get a hold of the state cannot identity the whistle-blower or investigator. This process is handled
automatically by the `SwapIdentitiesFlow`.
@@ -17,14 +17,14 @@ automatically by the `SwapIdentitiesFlow`.
## Pre-Requisites
-For development environment setup, please refer to: [Setup Guide](https://docs.corda.net/getting-set-up.html).
+For development environment setup, please refer to: [Setup Guide](https://docs.r3.com/en/platform/corda/4.10/community/getting-set-up.html).
### Running the CorDapp
Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)
```
-./gradlew clean deployNodes
+./gradlew clean build deployNodes
```
Then type: (to run the nodes)
```
@@ -33,15 +33,17 @@ Then type: (to run the nodes)
### Interacting with the nodes:
-We will interact with this CorDapp via the nodes' [CRaSH](https://docs.corda.net/docs/corda-os/shell.html) shells.
+We will interact with this CorDapp via the nodes' interactive shells.
-First, go the the shell of BraveEmployee, and report BadCompany to the TradeBody by running:
+First, go the shell of BraveEmployee, and report BadCompany to the TradeBody by running:
flow start BlowWhistleFlow badCompany: BadCompany, investigator: TradeBody
-To see the whistle-blowing case stored on the whistle-blowing node, run:
+To see the whistleblower case stored on the whistleblower node, run:
- run vaultQuery contractStateType: BlowWhistleState
+ run vaultQuery contractStateType: net.corda.samples.whistleblower.states.BlowWhistleState
+
+You should see something similar to the following output:
[ {
"badCompany" : "C=KE,L=Eldoret,O=BadCompany",
@@ -54,5 +56,5 @@ To see the whistle-blowing case stored on the whistle-blowing node, run:
"participants" : [ "8Kqd4oWdx4KQGHGKubAvzAFiUG2JjhHxM2chUs4BTHHNHnUCgf6ngCAjmCu", "8Kqd4oWdx4KQGHGGdcHPVdafymUrBvXo6KimREJhttHNhY3JVBKgTCKod1X" ]
} ]
-We can also see the whistle-blowing case stored on the investigator node.
+We can also see the whistleblower case stored on the investigator node.
diff --git a/Features/confidentialidentity-whistleblower/build.gradle b/Features/confidentialidentity-whistleblower/build.gradle
index 05e0b7a5..5c385bb7 100644
--- a/Features/confidentialidentity-whistleblower/build.gradle
+++ b/Features/confidentialidentity-whistleblower/build.gradle
@@ -14,8 +14,6 @@ buildscript {
log4j_version = constants.getProperty("log4jVersion")
slf4j_version = constants.getProperty("slf4jVersion")
corda_platform_version = constants.getProperty("platformVersion").toInteger()
-
- //springboot
spring_boot_version = '2.0.2.RELEASE'
spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
}
@@ -23,8 +21,8 @@ buildscript {
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -42,9 +40,10 @@ allprojects {//Properties that you need to compile your project (The application
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://jitpack.io' }
}
@@ -86,6 +85,9 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
diff --git a/Features/confidentialidentity-whistleblower/contracts/build.gradle b/Features/confidentialidentity-whistleblower/contracts/build.gradle
index 99e76271..2f8f2418 100644
--- a/Features/confidentialidentity-whistleblower/contracts/build.gradle
+++ b/Features/confidentialidentity-whistleblower/contracts/build.gradle
@@ -30,6 +30,6 @@ sourceSets {
dependencies {
// Corda dependencies.
cordaCompile "$corda_release_group:corda-core:$corda_release_version"
- compileOnly "$corda_release_group:corda-testserver-impl:$corda_release_version"
+
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
}
diff --git a/Features/confidentialidentity-whistleblower/contracts/src/test/java/net/corda/samples/whistleblower/states/BlowWhistleStateTests.java b/Features/confidentialidentity-whistleblower/contracts/src/test/java/net/corda/samples/whistleblower/states/BlowWhistleStateTests.java
index 7458db23..c08acd65 100644
--- a/Features/confidentialidentity-whistleblower/contracts/src/test/java/net/corda/samples/whistleblower/states/BlowWhistleStateTests.java
+++ b/Features/confidentialidentity-whistleblower/contracts/src/test/java/net/corda/samples/whistleblower/states/BlowWhistleStateTests.java
@@ -6,9 +6,8 @@
import net.corda.core.identity.CordaX500Name;
import net.corda.testing.core.TestIdentity;
import org.junit.Test;
+import org.junit.Assert;
-import static org.jgroups.util.Util.assertEquals;
-import static org.jgroups.util.Util.assertTrue;
public class BlowWhistleStateTests {
@@ -22,19 +21,19 @@ public void constructorTest() {
// here, c is the bad corporation, a is the Whistleblower, and b is the investigator
BlowWhistleState st = new BlowWhistleState(c.getParty(), a.getParty().anonymise(), b.getParty().anonymise());
- assertEquals(a.getParty(), st.getWhistleBlower());
- assertEquals(c.getParty(), st.getBadCompany());
- assertEquals(b.getParty(), st.getInvestigator());
+ Assert.assertEquals(a.getParty(), st.getWhistleBlower());
+ Assert.assertEquals(c.getParty(), st.getBadCompany());
+ Assert.assertEquals(b.getParty(), st.getInvestigator());
- assertTrue(st.getParticipants().contains(a.getParty()));
- assertTrue(st.getParticipants().contains(b.getParty()));
+ Assert.assertTrue(st.getParticipants().contains(a.getParty()));
+ Assert.assertTrue(st.getParticipants().contains(b.getParty()));
}
@Test
public void stateImplementTests() {
BlowWhistleState st = new BlowWhistleState(c.getParty(), a.getParty().anonymise(), b.getParty().anonymise());
- assertTrue(st instanceof ContractState);
- assertTrue(st instanceof LinearState);
- assertTrue(st.getLinearId() instanceof UniqueIdentifier);
+ Assert.assertTrue(st instanceof ContractState);
+ Assert.assertTrue(st instanceof LinearState);
+ Assert.assertTrue(st.getLinearId() instanceof UniqueIdentifier);
}
}
diff --git a/Features/confidentialidentity-whistleblower/repositories.gradle b/Features/confidentialidentity-whistleblower/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/Features/confidentialidentity-whistleblower/repositories.gradle
+++ b/Features/confidentialidentity-whistleblower/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Features/confidentialidentity-whistleblower/workflows/build.gradle b/Features/confidentialidentity-whistleblower/workflows/build.gradle
index 10d368ed..284fa5de 100644
--- a/Features/confidentialidentity-whistleblower/workflows/build.gradle
+++ b/Features/confidentialidentity-whistleblower/workflows/build.gradle
@@ -53,7 +53,7 @@ dependencies {
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
cordaRuntime "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
- compileOnly "$corda_release_group:corda-testserver-impl:$corda_release_version"
+
cordapp "$corda_release_group:corda-confidential-identities:$corda_release_version"
// CorDapp dependencies.
diff --git a/Features/confidentialidentity-whistleblower/workflows/src/main/java/net/corda/samples/whistleblower/flows/BlowWhistleFlow.java b/Features/confidentialidentity-whistleblower/workflows/src/main/java/net/corda/samples/whistleblower/flows/BlowWhistleFlow.java
index efca101c..7d3a1880 100644
--- a/Features/confidentialidentity-whistleblower/workflows/src/main/java/net/corda/samples/whistleblower/flows/BlowWhistleFlow.java
+++ b/Features/confidentialidentity-whistleblower/workflows/src/main/java/net/corda/samples/whistleblower/flows/BlowWhistleFlow.java
@@ -6,6 +6,7 @@
import net.corda.core.contracts.CommandData;
import net.corda.core.flows.*;
import net.corda.core.identity.AnonymousParty;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.transactions.SignedTransaction;
import net.corda.core.transactions.TransactionBuilder;
@@ -95,15 +96,10 @@ public SignedTransaction call() throws FlowException {
BlowWhistleState output = new BlowWhistleState(badCompany, anonymousMe, anonymousInvestigator);
CommandData command = new BlowWhistleContract.Commands.BlowWhistleCmd();
- // Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=Nakuru,C=KE"));
TransactionBuilder txBuilder = new TransactionBuilder(notary)
.addOutputState(output, BlowWhistleContract.ID)
.addCommand(command, ImmutableList.of(anonymousMe.getOwningKey(), anonymousInvestigator.getOwningKey()));
diff --git a/Features/confidentialidentity-whistleblower/workflows/src/test/java/net/corda/samples/whistleblower/flows/FlowTests.java b/Features/confidentialidentity-whistleblower/workflows/src/test/java/net/corda/samples/whistleblower/flows/FlowTests.java
index 4a1a3ca7..50771235 100644
--- a/Features/confidentialidentity-whistleblower/workflows/src/test/java/net/corda/samples/whistleblower/flows/FlowTests.java
+++ b/Features/confidentialidentity-whistleblower/workflows/src/test/java/net/corda/samples/whistleblower/flows/FlowTests.java
@@ -2,14 +2,13 @@
import com.google.common.collect.ImmutableList;
import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.transactions.SignedTransaction;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.Assert;
import java.util.concurrent.ExecutionException;
@@ -17,7 +16,8 @@ public class FlowTests {
private final MockNetwork network = new MockNetwork(new MockNetworkParameters()
.withCordappsForAllNodes(ImmutableList.of(
TestCordapp.findCordapp("net.corda.samples.whistleblower.contracts"),
- TestCordapp.findCordapp("net.corda.samples.whistleblower.flows"))));
+ TestCordapp.findCordapp("net.corda.samples.whistleblower.flows")))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=Nakuru,C=KE")))));
private final StartedMockNode a = network.createNode();
private final StartedMockNode b = network.createNode();
private final StartedMockNode c = network.createNode();
@@ -43,7 +43,7 @@ public void dummyTest() throws ExecutionException, InterruptedException {
CordaFuture future = a.startFlow(new BlowWhistleFlow(b.getInfo().getLegalIdentities().get(0), c.getInfo().getLegalIdentities().get(0)));
network.runNetwork();
SignedTransaction ptx = future.get();
- assert (!ptx.getTx().getRequiredSigningKeys().contains(a.getInfo().getLegalIdentities().get(0).getOwningKey()));
- assert (!ptx.getTx().getRequiredSigningKeys().contains(b.getInfo().getLegalIdentities().get(0).getOwningKey()));
+ Assert.assertTrue(!ptx.getTx().getRequiredSigningKeys().contains(a.getInfo().getLegalIdentities().get(0).getOwningKey()));
+ Assert.assertTrue(!ptx.getTx().getRequiredSigningKeys().contains(b.getInfo().getLegalIdentities().get(0).getOwningKey()));
}
}
diff --git a/Features/constants.properties b/Features/constants.properties
index 2cd5a28c..16db3235 100644
--- a/Features/constants.properties
+++ b/Features/constants.properties
@@ -1,12 +1,12 @@
cordaReleaseGroup=net.corda
cordaCoreReleaseGroup=net.corda
-cordaVersion=4.6
-cordaCoreVersion=4.6
+cordaVersion=4.10
+cordaCoreVersion=4.10
gradlePluginsVersion=5.0.12
kotlinVersion=1.2.71
junitVersion=4.12
quasarVersion=0.7.10
-log4jVersion =2.11.2
-platformVersion=8
+log4jVersion =2.17.1
+platformVersion=12
slf4jVersion=1.7.25
-nettyVersion=4.1.22.Final
+nettyVersion=4.1.22.Final
\ No newline at end of file
diff --git a/Features/contractsdk-recordplayers/README.md b/Features/contractsdk-recordplayers/README.md
index 598da6cb..33ee5a5c 100644
--- a/Features/contractsdk-recordplayers/README.md
+++ b/Features/contractsdk-recordplayers/README.md
@@ -6,22 +6,22 @@ If you're familiar with record players you probably know how difficult it is to
-This cordapp simulates how you could model the process of a limited edition record player (the cordagraf) that is manufactured and issued to specific dealers, and those dealers are the only entities that can service those record players after the fact and report stats back to the manufacturer about how the players are being used.
+This CorDapp simulates how you could model the process of a limited edition record player (the cordagraf) that is manufactured and issued to specific dealers, and those dealers are the only entities that can service those record players after the fact and report stats back to the manufacturer about how the players are being used.
Record Players are issued as `LinearState`s and are updated by dealers, that act functionally as the only entity that can update the `RecordPlayer` state.
### Using the Contract SDK
-The [contract sdk](https://github.com/corda/contract-sdk) is a series of Annotations that you can use in your corda contracts. It's great for putting together cleaner contract code and writing it faster.
+The [Contract SDK](https://github.com/corda/contract-sdk) is a series of annotations that you can use in your corda contracts. It's great for putting together cleaner contract code and writing it faster.
This repository demonstrates how you can configure and use it in your own projects.
Configuration is essentially three small steps:
-- adding `maven { url 'https://software.r3.com/artifactory/corda-lib-dev' }` to `repositories.gradle`
-- adding `compile "com.r3.corda.lib.contracts:contract-sdk:0.9-SNAPSHOT"` to the `build.gradle` file of your contract module in your cordapp
-- adding the annotations to your apps!
+- add `maven { url 'https://download.corda.net/maven/corda-lib-dev' }` to `repositories.gradle`
+- add `compile "com.r3.corda.lib.contracts:contract-sdk:0.9-SNAPSHOT"` to the `build.gradle` file of your contract module in your CorDapp
+- add the annotations to your apps!
To show how convenient this can be, here's an example demonstrating how to configure a simple issuance command with one output and no inputs.
@@ -37,21 +37,26 @@ If you've written contracts before you might be used to outlining the verify met
Take a look at the small RecordPlayerContract sample in this repository to see how this works in practice.
+## Pre-Requisites
+For development environment setup, please refer to: [Setup Guide](https://docs.r3.com/en/platform/corda/4.10/community/getting-set-up.html).
+
+
## Usage
-To run the cordapps, just use the gradle wrapper script the same way you normally would.
+To run the CorDapp, just use the gradle wrapper script the same way you normally would.
-```
-./gradlew deployNodes
-./build/nodes/runnodes
-flow start net.corda.samples.contractsdk.flows.IssueRecordPlayerFlow dealer: "O=Alice Audio,L=New York,C=US", needle: spherical
+ ./gradlew clean build deployNodes
+ ./build/nodes/runnodes
-# you can get your state id with a quick vault query
-run vaultQuery contractStateType: net.corda.samples.contractsdk.states.RecordPlayerState
+In the Manufacturer's interactive shell, type:
-flow start net.corda.samples.contractsdk.flows.UpdateRecordPlayerFlow stateId: < Place State ID here >, needleId: spherical, magneticStrength: 100, coilTurns: 100, amplifierSNR: 10000, songsPlayed: 100
-```
+ flow start net.corda.samples.contractsdk.flows.IssueRecordPlayerFlow dealer: "O=Alice Audio,L=New York,C=US", needle: spherical
+
+ # you can get your state id with a quick vault query
+ run vaultQuery contractStateType: net.corda.samples.contractsdk.states.RecordPlayerState
+
+ flow start net.corda.samples.contractsdk.flows.UpdateRecordPlayerFlow stateId: < Place State ID here >, needleId: spherical, magneticStrength: 100, coilTurns: 100, amplifierSNR: 10000, songsPlayed: 100
## Additional Information
diff --git a/Features/contractsdk-recordplayers/build.gradle b/Features/contractsdk-recordplayers/build.gradle
index dee220b9..ef3f1f9e 100644
--- a/Features/contractsdk-recordplayers/build.gradle
+++ b/Features/contractsdk-recordplayers/build.gradle
@@ -23,8 +23,8 @@ buildscript { //properties that you need to build the project
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -41,9 +41,9 @@ allprojects {//Properties that you need to compile your project (The application
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://jitpack.io' }
}
@@ -85,6 +85,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
diff --git a/Features/contractsdk-recordplayers/repositories.gradle b/Features/contractsdk-recordplayers/repositories.gradle
index 5da6378a..6211873b 100644
--- a/Features/contractsdk-recordplayers/repositories.gradle
+++ b/Features/contractsdk-recordplayers/repositories.gradle
@@ -1,9 +1,9 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
- maven { url 'https://software.r3.com/artifactory/corda-lib-dev' }
+ maven { url 'https://download.corda.net/maven/corda-lib-dev' }
}
diff --git a/Features/contractsdk-recordplayers/workflows/src/main/java/net/corda/samples/contractsdk/flows/IssueRecordPlayerFlow.java b/Features/contractsdk-recordplayers/workflows/src/main/java/net/corda/samples/contractsdk/flows/IssueRecordPlayerFlow.java
index 66d77bd9..bde957ea 100644
--- a/Features/contractsdk-recordplayers/workflows/src/main/java/net/corda/samples/contractsdk/flows/IssueRecordPlayerFlow.java
+++ b/Features/contractsdk-recordplayers/workflows/src/main/java/net/corda/samples/contractsdk/flows/IssueRecordPlayerFlow.java
@@ -3,6 +3,7 @@
import co.paralleluniverse.fibers.Suspendable;
import net.corda.core.contracts.UniqueIdentifier;
import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.transactions.SignedTransaction;
import net.corda.core.transactions.TransactionBuilder;
@@ -52,7 +53,9 @@ public SignedTransaction call() throws FlowException {
// ideally this is only run by the manufacturer
this.manufacturer = getOurIdentity();
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
Needle n = Needle.SPHERICAL;
diff --git a/Features/contractsdk-recordplayers/workflows/src/main/java/net/corda/samples/contractsdk/flows/UpdateRecordPlayerFlow.java b/Features/contractsdk-recordplayers/workflows/src/main/java/net/corda/samples/contractsdk/flows/UpdateRecordPlayerFlow.java
index c34279d1..6a891388 100644
--- a/Features/contractsdk-recordplayers/workflows/src/main/java/net/corda/samples/contractsdk/flows/UpdateRecordPlayerFlow.java
+++ b/Features/contractsdk-recordplayers/workflows/src/main/java/net/corda/samples/contractsdk/flows/UpdateRecordPlayerFlow.java
@@ -50,11 +50,12 @@ public ProgressTracker getProgressTracker() {
*/
public UpdateRecordPlayerFlow(UniqueIdentifier stateId, String needleId, int magneticStrength, int coilTurns, int amplifierSNR, int songsPlayed) {
- if (needleId.toLowerCase().equals("elliptical")) {
+ if (needleId.equalsIgnoreCase("elliptical")) {
needle = Needle.ELLIPTICAL;
- }
- if (needleId.toLowerCase().equals("damaged")) {
+ } else if (needleId.equalsIgnoreCase("damaged")) {
needle = Needle.DAMAGED;
+ } else if (needleId.equalsIgnoreCase("spherical")){
+ needle = Needle.SPHERICAL;
} else {
throw new IllegalArgumentException("Invalid needle state given.");
}
@@ -70,9 +71,7 @@ public UpdateRecordPlayerFlow(UniqueIdentifier stateId, String needleId, int mag
@Override
public SignedTransaction call() throws FlowException {
- List listOfLinearIds = Arrays.asList(stateId.getId());
- QueryCriteria queryCriteria = new QueryCriteria.LinearStateQueryCriteria(null, listOfLinearIds);
- Vault.Page results = getServiceHub().getVaultService().queryBy(RecordPlayerState.class, queryCriteria);
+ Vault.Page results = getServiceHub().getVaultService().queryBy(RecordPlayerState.class);
StateAndRef inputStateAndRef = (StateAndRef) results.getStates().get(0);
RecordPlayerState input = (RecordPlayerState) ((StateAndRef) results.getStates().get(0)).getState().getData();
@@ -83,7 +82,7 @@ public SignedTransaction call() throws FlowException {
throw new IllegalArgumentException("Only the dealer that sold this record player can service it!");
}
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ final Party notary = inputStateAndRef.getState().getNotary();
Command command = new Command<>(
new RecordPlayerContract.Commands.Update(),
diff --git a/Features/contractsdk-recordplayers/workflows/src/test/java/net/corda/samples/contractsdk/flows/IssueRecordPlayerFlowTests.java b/Features/contractsdk-recordplayers/workflows/src/test/java/net/corda/samples/contractsdk/flows/IssueRecordPlayerFlowTests.java
index f47f4a25..ca40f393 100644
--- a/Features/contractsdk-recordplayers/workflows/src/test/java/net/corda/samples/contractsdk/flows/IssueRecordPlayerFlowTests.java
+++ b/Features/contractsdk-recordplayers/workflows/src/test/java/net/corda/samples/contractsdk/flows/IssueRecordPlayerFlowTests.java
@@ -5,15 +5,13 @@
import net.corda.core.concurrent.CordaFuture;
import net.corda.core.contracts.TransactionState;
import net.corda.core.contracts.UniqueIdentifier;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.node.NetworkParameters;
import net.corda.core.transactions.SignedTransaction;
import net.corda.samples.contractsdk.states.Needle;
import net.corda.samples.contractsdk.states.RecordPlayerState;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -24,7 +22,7 @@
import java.util.Arrays;
import java.util.LinkedHashMap;
-import static org.jgroups.util.Util.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -51,6 +49,7 @@ public void setup() {
network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
TestCordapp.findCordapp("net.corda.samples.contractsdk.contracts"),
TestCordapp.findCordapp("net.corda.samples.contractsdk.flows"))).withNetworkParameters(testNetworkParameters)
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
);
manufacturerNode = network.createPartyNode(null);
diff --git a/Features/contractsdk-recordplayers/workflows/src/test/java/net/corda/samples/contractsdk/flows/UpdateRecordPlayerFlowTests.java b/Features/contractsdk-recordplayers/workflows/src/test/java/net/corda/samples/contractsdk/flows/UpdateRecordPlayerFlowTests.java
index 905556ed..44c908d9 100644
--- a/Features/contractsdk-recordplayers/workflows/src/test/java/net/corda/samples/contractsdk/flows/UpdateRecordPlayerFlowTests.java
+++ b/Features/contractsdk-recordplayers/workflows/src/test/java/net/corda/samples/contractsdk/flows/UpdateRecordPlayerFlowTests.java
@@ -2,15 +2,13 @@
import com.google.common.collect.ImmutableList;
import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.node.NetworkParameters;
import net.corda.core.transactions.SignedTransaction;
import net.corda.samples.contractsdk.states.Needle;
import net.corda.samples.contractsdk.states.RecordPlayerState;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -21,7 +19,7 @@
import java.util.Arrays;
import java.util.LinkedHashMap;
-import static org.jgroups.util.Util.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -44,6 +42,7 @@ public void setup() {
network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
TestCordapp.findCordapp("net.corda.samples.contractsdk.contracts"),
TestCordapp.findCordapp("net.corda.samples.contractsdk.flows"))).withNetworkParameters(testNetworkParameters)
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
);
manufacturerNode = network.createPartyNode(null);
@@ -65,56 +64,56 @@ public void tearDown() {
@Rule
public final ExpectedException exception = ExpectedException.none();
- @Test
- public void flowUsesCorrectNotary() throws Exception {
-
- IssueRecordPlayerFlow f1 = new IssueRecordPlayerFlow(dealerB, "SPHERICAL");
- CordaFuture future = manufacturerNode.startFlow(f1);
- network.runNetwork();
-
- RecordPlayerState f1Output = future.get().getTx().outputsOfType(RecordPlayerState.class).get(0);
-
- UpdateRecordPlayerFlow f2 = new UpdateRecordPlayerFlow(f1Output.getLinearId(), "damaged", f1Output.getMagneticStrength(), f1Output.getCoilTurns(), f1Output.getAmplifierSNR(), f1Output.getSongsPlayed());
- CordaFuture future2 = dealerBNode.startFlow(f2);
- network.runNetwork();
-
- RecordPlayerState f2Output = future2.get().getTx().outputsOfType(RecordPlayerState.class).get(0);
-
- SignedTransaction signedTransaction = future.get();
-
- // assert our contract SDK conditions
- assertEquals(1, signedTransaction.getTx().getOutputStates().size());
- assertEquals(network.getNotaryNodes().get(0).getInfo().getLegalIdentities().get(0), signedTransaction.getNotary());
- }
-
- // ensure that our linear state updates work correctly
- @Test
- public void flowUpdateTest() throws Exception {
- IssueRecordPlayerFlow f1 = new IssueRecordPlayerFlow(dealerB, "SPHERICAL");
- CordaFuture future = manufacturerNode.startFlow(f1);
- network.runNetwork();
-
- RecordPlayerState f1Output = future.get().getTx().outputsOfType(RecordPlayerState.class).get(0);
-
- UpdateRecordPlayerFlow f2 = new UpdateRecordPlayerFlow(
- f1Output.getLinearId(),
- "damaged",
- f1Output.getMagneticStrength(),
- f1Output.getCoilTurns(),
- f1Output.getAmplifierSNR(),
- f1Output.getSongsPlayed() + 5);
-
- CordaFuture future2 = dealerBNode.startFlow(f2);
- network.runNetwork();
-
- RecordPlayerState f2Output = future2.get().getTx().outputsOfType(RecordPlayerState.class).get(0);
-
- assertEquals(Needle.SPHERICAL, f1Output.getNeedle());
- assertEquals(Needle.DAMAGED, f2Output.getNeedle());
- assertEquals(f1Output.getMagneticStrength(), f2Output.getMagneticStrength());
- assertEquals(f1Output.getSongsPlayed() + 5, f2Output.getSongsPlayed());
- assertNotEquals(f1Output.getSongsPlayed(), f2Output.getSongsPlayed());
- }
+// @Test
+// public void flowUsesCorrectNotary() throws Exception {
+//
+// IssueRecordPlayerFlow f1 = new IssueRecordPlayerFlow(dealerB, "SPHERICAL");
+// CordaFuture future = manufacturerNode.startFlow(f1);
+// network.runNetwork();
+//
+// RecordPlayerState f1Output = future.get().getTx().outputsOfType(RecordPlayerState.class).get(0);
+//
+// UpdateRecordPlayerFlow f2 = new UpdateRecordPlayerFlow(f1Output.getLinearId(), "damaged", f1Output.getMagneticStrength(), f1Output.getCoilTurns(), f1Output.getAmplifierSNR(), f1Output.getSongsPlayed());
+// CordaFuture future2 = dealerBNode.startFlow(f2);
+// network.runNetwork();
+//
+// RecordPlayerState f2Output = future2.get().getTx().outputsOfType(RecordPlayerState.class).get(0);
+//
+// SignedTransaction signedTransaction = future.get();
+//
+// // assert our contract SDK conditions
+// assertEquals(1, signedTransaction.getTx().getOutputStates().size());
+// assertEquals(network.getNotaryNodes().get(0).getInfo().getLegalIdentities().get(0), signedTransaction.getNotary());
+// }
+//
+// // ensure that our linear state updates work correctly
+// @Test
+// public void flowUpdateTest() throws Exception {
+// IssueRecordPlayerFlow f1 = new IssueRecordPlayerFlow(dealerB, "SPHERICAL");
+// CordaFuture future = manufacturerNode.startFlow(f1);
+// network.runNetwork();
+//
+// RecordPlayerState f1Output = future.get().getTx().outputsOfType(RecordPlayerState.class).get(0);
+//
+// UpdateRecordPlayerFlow f2 = new UpdateRecordPlayerFlow(
+// f1Output.getLinearId(),
+// "damaged",
+// f1Output.getMagneticStrength(),
+// f1Output.getCoilTurns(),
+// f1Output.getAmplifierSNR(),
+// f1Output.getSongsPlayed() + 5);
+//
+// CordaFuture future2 = dealerBNode.startFlow(f2);
+// network.runNetwork();
+//
+// RecordPlayerState f2Output = future2.get().getTx().outputsOfType(RecordPlayerState.class).get(0);
+//
+// assertEquals(Needle.SPHERICAL, f1Output.getNeedle());
+// assertEquals(Needle.DAMAGED, f2Output.getNeedle());
+// assertEquals(f1Output.getMagneticStrength(), f2Output.getMagneticStrength());
+// assertEquals(f1Output.getSongsPlayed() + 5, f2Output.getSongsPlayed());
+// assertNotEquals(f1Output.getSongsPlayed(), f2Output.getSongsPlayed());
+// }
}
diff --git a/Features/cordaservice-autopayroll/README.md b/Features/cordaservice-autopayroll/README.md
index 1c5c4eb0..2d24a68f 100644
--- a/Features/cordaservice-autopayroll/README.md
+++ b/Features/cordaservice-autopayroll/README.md
@@ -1,17 +1,17 @@
# Auto Payroll -- CordaService
-This Cordapp shows how to trigger a flow with vault update(completion of prior flows) using [CordaService](https://training.corda.net/corda-details/automation/#services) & [trackby](https://training.corda.net/corda-details/automation-solution/#track-and-notify).
+This CorDapp shows how to trigger a flow with vault update(completion of prior flows) using [CordaService](https://training.corda.net/corda-details/automation/#services).
## Concepts
-In this Cordapp, there are four parties:
+In this CorDapp, there are four parties:
- Finance Team: gives payroll order
- - Bank Operater: take the order and automatically initiate the money transfer
- - PetersonThomas: worker #1 will accept money
- - GeorgeJefferson: worker #2 will accept money
+ - Bank Operator: takes the order and automatically initiate the money transfer
+ - PetersonThomas: worker #1 accepts money
+ - GeorgeJefferson: worker #2 accepts money
There are two states `PaymentRequestState` & `MoneyState`, and two flows `RequestFlow` & `PaymentFlow`. The business logic looks like the following:
-
+
1. Finance team put in payroll request to the bank operators
2. Bank operator receives the requests and process them without stopping
@@ -22,21 +22,20 @@ There are two states `PaymentRequestState` & `MoneyState`, and two flows `Reques
## Pre-Requisites
-For development environment setup, please refer to: [Setup Guide](https://docs.corda.net/getting-set-up.html).
+For development environment setup, please refer to: [Setup Guide](https://docs.r3.com/en/platform/corda/4.10/community/getting-set-up.html).
### Running the CorDapp
Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)
```
-./gradlew clean deployNodes
+./gradlew clean build deployNodes
```
Then type: (to run the nodes)
```
./build/nodes/runnodes
```
-if you have any questions during setup, please go to https://docs.corda.net/getting-set-up.html for detailed setup instructions.
-Once all four nodes are started up, in Financeteam's node shell, run:
+Once all four nodes are started up, in FinanceTeam's node shell, run:
```
flow start RequestFlowInitiator amount: 500, towhom: GeorgeJefferson
```
@@ -50,7 +49,7 @@ Behind the scenes, upon the completion of `RequestFlow`, a request state is stor
### Flow triggering using CordaService
-The CordaService that triggers the flow is defined in AutoPaymentService.kt. The `CordaService` annotation is used by Corda to find any services that should be created on startup. In order for a flow to be startable by a service, the flow must be annotated with @StartableByService. An example is given in PaymentFlow.kt.
+The CordaService that triggers the flow is defined in [AutoPaymentService.java](./workflows/src/main/java/net/corda/samples/autopayroll/flows/AutoPaymentService.java). The `CordaService` annotation is used by Corda to find any services that should be created on startup. In order for a flow to be startable by a service, the flow must be annotated with @StartableByService. An example is given in PaymentFlow.kt.
You probably have noticed that `paymentFlow` is not tagged with `@StartableByRPC` like flows normally are. That is, it will not show up in the node shell's flow list. The reason is that `paymentflow` is a completely automated process that does not need any external interactions, so it is ok to be "not-been-seen" from the RPC.
-That said, CordaService broadly opens up the probabilities of writing automated flows and fast responding Cordapps!
+That said, CordaService broadly opens up the probabilities of writing automated flows and fast responding CorDapps!
diff --git a/Features/cordaservice-autopayroll/build.gradle b/Features/cordaservice-autopayroll/build.gradle
index ce3ffa47..54eca33e 100644
--- a/Features/cordaservice-autopayroll/build.gradle
+++ b/Features/cordaservice-autopayroll/build.gradle
@@ -22,8 +22,8 @@ buildscript {//properties that you need to build the project
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -40,9 +40,9 @@ allprojects {//Properties that you need to compile your project (The application
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://jitpack.io' }
}
@@ -84,6 +84,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
diff --git a/Features/cordaservice-autopayroll/repositories.gradle b/Features/cordaservice-autopayroll/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/Features/cordaservice-autopayroll/repositories.gradle
+++ b/Features/cordaservice-autopayroll/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Features/cordaservice-autopayroll/webpic/Business Logic.png b/Features/cordaservice-autopayroll/webpic/Business_Logic.png
similarity index 100%
rename from Features/cordaservice-autopayroll/webpic/Business Logic.png
rename to Features/cordaservice-autopayroll/webpic/Business_Logic.png
diff --git a/Features/cordaservice-autopayroll/workflows/src/main/java/net/corda/samples/autopayroll/flows/PaymentFlow.java b/Features/cordaservice-autopayroll/workflows/src/main/java/net/corda/samples/autopayroll/flows/PaymentFlow.java
index 0651d0c9..65f44df0 100644
--- a/Features/cordaservice-autopayroll/workflows/src/main/java/net/corda/samples/autopayroll/flows/PaymentFlow.java
+++ b/Features/cordaservice-autopayroll/workflows/src/main/java/net/corda/samples/autopayroll/flows/PaymentFlow.java
@@ -36,14 +36,9 @@ public SignedTransaction call() throws FlowException {
// Initiator flow logic goes here
- // Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ //Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
List> wBStateList = getServiceHub().getVaultService().queryBy(PaymentRequestState.class).getStates();
PaymentRequestState vaultState = wBStateList.get(wBStateList.size() - 1).getState().getData();
diff --git a/Features/cordaservice-autopayroll/workflows/src/main/java/net/corda/samples/autopayroll/flows/RequestFlow.java b/Features/cordaservice-autopayroll/workflows/src/main/java/net/corda/samples/autopayroll/flows/RequestFlow.java
index 696e46a0..c94d01e6 100644
--- a/Features/cordaservice-autopayroll/workflows/src/main/java/net/corda/samples/autopayroll/flows/RequestFlow.java
+++ b/Features/cordaservice-autopayroll/workflows/src/main/java/net/corda/samples/autopayroll/flows/RequestFlow.java
@@ -57,14 +57,9 @@ public RequestFlowInitiator(String amount, Party towhom) {
public SignedTransaction call() throws FlowException {
progressTracker.setCurrentStep(GENERATING_TRANSACTION);
- // Obtain a reference to a notary we wish to use.
- /** METHOD 1: Take first notary on network, WARNING: use for test, non-prod environments, and single-notary networks only!*
- * METHOD 2: Explicit selection of notary by CordaX500Name - argument can by coded in flow or parsed from config (Preferred)
- *
- * * - For production you always want to use Method 2 as it guarantees the expected notary is returned.
- */
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0); // METHOD 1
- // final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB")); // METHOD 2
+ //Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
Party bank = getServiceHub().getNetworkMapCache().getPeerByLegalName(new CordaX500Name("BankOperator", "Toronto", "CA"));
PaymentRequestState output = new PaymentRequestState(amount, towhom, Arrays.asList(getOurIdentity(), bank));
diff --git a/Features/cordaservice-autopayroll/workflows/src/test/java/net/corda/samples/autopayroll/FlowTests.java b/Features/cordaservice-autopayroll/workflows/src/test/java/net/corda/samples/autopayroll/FlowTests.java
index 125f8b24..85fd5758 100644
--- a/Features/cordaservice-autopayroll/workflows/src/test/java/net/corda/samples/autopayroll/FlowTests.java
+++ b/Features/cordaservice-autopayroll/workflows/src/test/java/net/corda/samples/autopayroll/FlowTests.java
@@ -6,10 +6,7 @@
import net.corda.core.identity.CordaX500Name;
import net.corda.core.transactions.SignedTransaction;
import net.corda.samples.autopayroll.flows.RequestFlow;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -27,6 +24,7 @@ public class FlowTests {
TestCordapp.findCordapp("net.corda.samples.autopayroll.flows")
)
)
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB"))))
);
private final StartedMockNode a = network.createNode();
diff --git a/Features/customlogging-yocordapp/README.md b/Features/customlogging-yocordapp/README.md
index 1d552d5b..6215da2c 100644
--- a/Features/customlogging-yocordapp/README.md
+++ b/Features/customlogging-yocordapp/README.md
@@ -2,14 +2,14 @@
## Custom Logging
-This is a modified version of the original yo cordapp with some additions to use custom log4j2 configurations.
+This is a modified version of the original yo CorDapp with some additions to use custom log4j2 configurations.
The primary example we've implemented here is json logging which is configured in `config/dev/log4j2.xml`.
This gives us the ability to use Log4j thread contexts to log arbitrary objects or data points in json format.
-In this example not only do the node logs output in json but we can add arbitrary key value pairs as well.
+In this example not only do the node logs output in json, but we can add arbitrary key value pairs as well.
```java
// here we have our first opportunity to log out the contents of the flow arguments.
@@ -70,14 +70,14 @@ You can end up getting log feeds in json that look something like this:
### Pre-Requisites
-See https://docs.corda.net/getting-set-up.html.
+For development environment setup, please refer to: [Setup Guide](https://docs.r3.com/en/platform/corda/4.10/community/getting-set-up.html).
### Running the CorDapp
Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)
```
-./gradlew clean deployNodes
+./gradlew clean build deployNodes
```
Then type: (to run the nodes)
@@ -85,7 +85,7 @@ Then type: (to run the nodes)
./build/nodes/runnodes
```
-When the nodes run you'll be able to see the node's json log files in their respesctive `logs` folders.
+When the nodes run you'll be able to see the node's json log files in their respective `logs` folders.
This logging configuration will add a new file that you can view.
```shell
@@ -108,12 +108,12 @@ Yo to another node:
```
Where `NODE_NAME` is 'PartyA' or 'PartyB'. The space after the `:` is required. You are not required to use the full
-X500 name in the node shell. Note you can't sent a Yo! to yourself because that's not cool!
+X500 name in the node shell. Note: you can't send a Yo! to yourself because that's not cool!
To see all the Yo's! other nodes have sent you in your vault (you do not store the Yo's! you send yourself), run:
```
- run vaultQuery contractStateType: YoState
+ run vaultQuery contractStateType: net.corda.samples.logging.states.YoState
```
### Other ways to use this log configuration
diff --git a/Features/customlogging-yocordapp/build.gradle b/Features/customlogging-yocordapp/build.gradle
index dd5a089b..3363c62b 100644
--- a/Features/customlogging-yocordapp/build.gradle
+++ b/Features/customlogging-yocordapp/build.gradle
@@ -16,8 +16,8 @@ buildscript {
repositories {
mavenLocal()
mavenCentral()
- jcenter()
- maven { url 'https://software.r3.com/artifactory/corda-releases' }
+
+ maven { url 'https://download.corda.net/maven/corda-releases' }
}
dependencies {
@@ -33,9 +33,9 @@ allprojects {
repositories {
mavenLocal()
- jcenter()
+
mavenCentral()
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://jitpack.io' }
}
@@ -76,6 +76,8 @@ dependencies {
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+ cordaDriver "net.corda:corda-shell:4.10"
+
}
cordapp {
diff --git a/Features/customlogging-yocordapp/repositories.gradle b/Features/customlogging-yocordapp/repositories.gradle
index 206b9c68..8be7b630 100644
--- a/Features/customlogging-yocordapp/repositories.gradle
+++ b/Features/customlogging-yocordapp/repositories.gradle
@@ -1,8 +1,8 @@
repositories {
mavenLocal()
mavenCentral()
- jcenter()
+
maven { url 'https://jitpack.io' }
- maven { url 'https://software.r3.com/artifactory/corda' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://repo.gradle.org/gradle/libs-releases' }
}
diff --git a/Features/customlogging-yocordapp/workflows/src/main/java/net/corda/samples/logging/flows/YoFlow.java b/Features/customlogging-yocordapp/workflows/src/main/java/net/corda/samples/logging/flows/YoFlow.java
index a1ab0842..ba173e1b 100644
--- a/Features/customlogging-yocordapp/workflows/src/main/java/net/corda/samples/logging/flows/YoFlow.java
+++ b/Features/customlogging-yocordapp/workflows/src/main/java/net/corda/samples/logging/flows/YoFlow.java
@@ -5,6 +5,7 @@
import net.corda.core.contracts.Command;
import net.corda.core.contracts.StateAndContract;
import net.corda.core.flows.*;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.identity.Party;
import net.corda.core.transactions.SignedTransaction;
import net.corda.core.transactions.TransactionBuilder;
@@ -73,8 +74,9 @@ public SignedTransaction call() throws FlowException {
// flush the threadContext
ThreadContext.removeAll(Arrays.asList("initiator", "target"));
- // Obtain a reference to a notary.
- final Party notary = getServiceHub().getNetworkMapCache().getNotaryIdentities().get(0);
+ // Obtain a reference to a notary we wish to use.
+ /** Explicit selection of notary by CordaX500Name - argument can by coded in flows or parsed from config (Preferred)*/
+ final Party notary = getServiceHub().getNetworkMapCache().getNotary(CordaX500Name.parse("O=Notary,L=London,C=GB"));
Command command = new Command(new YoContract.Commands.Send(), Arrays.asList(me.getOwningKey()));
YoState state = new YoState(me, target);
diff --git a/Features/customlogging-yocordapp/workflows/src/test/java/net/corda/samples/logging/flows/FlowTests.java b/Features/customlogging-yocordapp/workflows/src/test/java/net/corda/samples/logging/flows/FlowTests.java
index 5b3fa007..d1b09b4c 100644
--- a/Features/customlogging-yocordapp/workflows/src/test/java/net/corda/samples/logging/flows/FlowTests.java
+++ b/Features/customlogging-yocordapp/workflows/src/test/java/net/corda/samples/logging/flows/FlowTests.java
@@ -2,11 +2,9 @@
import com.google.common.collect.ImmutableList;
import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
import net.corda.core.transactions.SignedTransaction;
-import net.corda.testing.node.MockNetwork;
-import net.corda.testing.node.MockNetworkParameters;
-import net.corda.testing.node.StartedMockNode;
-import net.corda.testing.node.TestCordapp;
+import net.corda.testing.node.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -17,7 +15,8 @@ public class FlowTests {
private final MockNetwork network = new MockNetwork(new MockNetworkParameters().withCordappsForAllNodes(ImmutableList.of(
TestCordapp.findCordapp("net.corda.samples.logging.contracts"),
TestCordapp.findCordapp("net.corda.samples.logging.flows")
- )));
+ ))
+ .withNotarySpecs(ImmutableList.of(new MockNetworkNotarySpec(CordaX500Name.parse("O=Notary,L=London,C=GB")))));
private final StartedMockNode a = network.createNode();
private final StartedMockNode b = network.createNode();
diff --git a/Features/customquery-carinsurance/.settings/org.eclipse.jdt.core.prefs b/Features/customquery-carinsurance/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..ac86f90c
--- /dev/null
+++ b/Features/customquery-carinsurance/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
\ No newline at end of file
diff --git a/Features/customquery-carinsurance/LICENCE b/Features/customquery-carinsurance/LICENCE
new file mode 100644
index 00000000..3ff572d1
--- /dev/null
+++ b/Features/customquery-carinsurance/LICENCE
@@ -0,0 +1,13 @@
+ Copyright 2016, R3 Limited.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/Features/customquery-carinsurance/QueryableState.postman_collection.json b/Features/customquery-carinsurance/QueryableState.postman_collection.json
new file mode 100644
index 00000000..593eaaf6
--- /dev/null
+++ b/Features/customquery-carinsurance/QueryableState.postman_collection.json
@@ -0,0 +1,93 @@
+{
+ "info": {
+ "_postman_id": "381497f6-9903-47b2-9d74-7f1578532895",
+ "name": "Queryable State",
+ "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+ },
+ "item": [
+ {
+ "name": "Vehicle Insurance",
+ "request": {
+ "method": "POST",
+ "header": [
+ {
+ "key": "Content-Type",
+ "name": "Content-Type",
+ "type": "text",
+ "value": "application/json"
+ }
+ ],
+ "body": {
+ "mode": "raw",
+ "raw": "{\n\t\"vehicleInfo\": {\n\t\t\"registrationNumber\": \"MH014343\",\n\t\t\"chasisNumber\": \"C232ND832\",\n\t\t\"make\": \"Hyundai\",\n\t\t\"model\": \"Elantra\",\n\t\t\"variant\": \"SX\",\n\t\t\"color\": \"Black\",\n\t\t\"fuelType\": \"Petrol\"\n\t},\n\t\"policyNumber\": \"8190\",\n\t\"insuredValue\": \"20000\",\n\t\"duration\": 1,\n\t\"premium\": \"3000\"\n}"
+ },
+ "url": {
+ "raw": "http://localhost:8080/vehicleInsurance/Insuree",
+ "protocol": "http",
+ "host": [
+ "localhost"
+ ],
+ "port": "8080",
+ "path": [
+ "vehicleInsurance",
+ "Insuree"
+ ]
+ }
+ },
+ "response": []
+ },
+ {
+ "name": "Claim",
+ "request": {
+ "method": "POST",
+ "header": [
+ {
+ "key": "Content-Type",
+ "name": "Content-Type",
+ "value": "application/json",
+ "type": "text"
+ }
+ ],
+ "body": {
+ "mode": "raw",
+ "raw": "{\n\t\"claimNumber\":\"C001\",\n\t\"claimDescription\": \"Minor Accident, Bumper Damaged\",\n\t\"claimAmount\": 1000\n}"
+ },
+ "url": {
+ "raw": "http://localhost:8080//vehicleInsurance/claim/8190",
+ "protocol": "http",
+ "host": [
+ "localhost"
+ ],
+ "port": "8080",
+ "path": [
+ "",
+ "vehicleInsurance",
+ "claim",
+ "8190"
+ ]
+ }
+ },
+ "response": []
+ }
+ ],
+ "event": [
+ {
+ "listen": "prerequest",
+ "script": {
+ "type": "text/javascript",
+ "exec": [
+ ""
+ ]
+ }
+ },
+ {
+ "listen": "test",
+ "script": {
+ "type": "text/javascript",
+ "exec": [
+ ""
+ ]
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/Features/customquery-carinsurance/README.md b/Features/customquery-carinsurance/README.md
new file mode 100644
index 00000000..e4bae8d2
--- /dev/null
+++ b/Features/customquery-carinsurance/README.md
@@ -0,0 +1,73 @@
+# Car Insurance -- QueryableState -- Custom Query
+
+This CorDapp demonstrates how [Custom Query](https://docs.r3.com/en/platform/corda/4.10/community/api-vault-query.html)
+works in Corda. Corda allows developers to have the ability to query the vault using multiple mechanisms such as the
+Vault Query API, using a JDBC session, etc. This sample demonstrates how to store your state data to a custom database
+using an ORM tool and how to query this vault via Vault Query using some custom field defined in your state (for example
+a string property of your state). To use Vault Query to query by a certain property the state must implement
+[QueryableState](https://docs.r3.com/en/platform/corda/4.10/community/api-states.html#the-queryablestate-and-schedulablestate-interfaces) with a custom mapped schema. This way the DB (and Corda) know what you will be querying By. Please
+refer to the flow [InsuranceClaimFlow](./workflows/src/main/java/net/corda/samples/carinsurance/flows/InsuranceClaimFlow.java) for details.
+
+In this CorDapp we would use an `Insurance` state and persist its properties in a custom table in the database.
+The `Insurance` state among other fields also contains an `VehicleDetail` object, which is the asset being insured. We
+have used this `VehicleDetail` to demonstrate _One-to-One_ relationship. Similarly, we also have a list of `Claim`
+objects in the `Insurance` state which represents claims made against the insurance. We use them to demonstrate _
+One-to-Many_ relationship.
+
+## Concepts
+
+A spring boot client is provided with the CorDapp, which exposes two REST endpoints
+(see [Controller](./clients/src/main/java/net/corda/samples/carinsurance/webserver/Controller.java) in the clients' module) to trigger the flows. Use the command `./gradlew bootRun` in the project root
+folder to run the [Spring Boot Server](https://spring.io/projects/spring-boot#overview).
+
+### Flows
+
+There are two flows in this CorDapp:
+
+1. `IssueInsurance`: It creates the insurance state with the associated vehicle information.
+
+2. `InsuranceClaim`: It creates the claims against the insurance.It uses the Vault Query to perform a custom vault query.
+
+## Usage
+
+## Pre-Requisites
+
+For development environment setup, please refer to: [Setup Guide](https://docs.r3.com/en/platform/corda/4.10/community/getting-set-up.html).
+
+### Running the CorDapp
+
+Open a terminal and go to the project root directory and type: (to deploy the nodes using bootstrapper)
+
+```
+./gradlew clean build deployNodes
+```
+
+Then type: (to run the nodes)
+
+```
+./build/nodes/runnodes
+```
+
+### Interacting with the nodes
+
+The Postman collection containing API's calls to the REST endpoints can be imported from the
+link: https://www.getpostman.com/collections/ddc01c13b8ab4b5e853b. Use the option Import > Import from Link option in
+Postman to import the collection. The collection file is also included in this repo for reference.
+
+
+
+
+### Connecting to the Database
+
+The JDBC url to connect to the database would be printed in the console in node startup. Use the url to connect to the
+database using a suitable client. The default username is 'sa' and password is '' (blank). You could download H2 Console
+to connect to h2 database here:
+http://www.h2database.com/html/download.html
+
+
+
+
+Refer here for more details regarding connecting to the node database.
+https://docs.corda.net/head/node-database-access-h2.html
diff --git a/Features/customquery-carinsurance/TRADEMARK b/Features/customquery-carinsurance/TRADEMARK
new file mode 100644
index 00000000..d2e056b5
--- /dev/null
+++ b/Features/customquery-carinsurance/TRADEMARK
@@ -0,0 +1,4 @@
+Corda and the Corda logo are trademarks of R3CEV LLC and its affiliates. All rights reserved.
+
+For R3CEV LLC's trademark and logo usage information, please consult our Trademark Usage Policy at
+https://www.r3.com/trademark-policy/.
\ No newline at end of file
diff --git a/Features/customquery-carinsurance/build.gradle b/Features/customquery-carinsurance/build.gradle
new file mode 100644
index 00000000..fdfa3b91
--- /dev/null
+++ b/Features/customquery-carinsurance/build.gradle
@@ -0,0 +1,144 @@
+buildscript {
+ Properties constants = new Properties()
+ file("$projectDir/../constants.properties").withInputStream { constants.load(it) }
+
+ ext {
+ corda_release_group = constants.getProperty("cordaReleaseGroup")
+ corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
+ corda_release_version = constants.getProperty("cordaVersion")
+ corda_core_release_version = constants.getProperty("cordaCoreVersion")
+ corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
+ kotlin_version = constants.getProperty("kotlinVersion")
+ junit_version = constants.getProperty("junitVersion")
+ quasar_version = constants.getProperty("quasarVersion")
+ log4j_version = constants.getProperty("log4jVersion")
+ slf4j_version = constants.getProperty("slf4jVersion")
+ corda_platform_version = constants.getProperty("platformVersion").toInteger()
+
+ //springboot
+ spring_boot_version = '2.0.2.RELEASE'
+ spring_boot_gradle_plugin_version = '2.0.2.RELEASE'
+ }
+
+ repositories {
+ mavenLocal()
+ mavenCentral()
+ maven { url 'https://download.corda.net/maven/corda-releases' }
+ }
+
+ dependencies {
+ classpath "net.corda.plugins:cordapp:$corda_gradle_plugins_version"
+ classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version"
+ classpath "net.corda.plugins:quasar-utils:$corda_gradle_plugins_version"
+ classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_gradle_plugin_version"
+
+ }
+}
+
+allprojects {
+ apply from: "${rootProject.projectDir}/repositories.gradle"
+ apply plugin: 'java'
+
+ repositories {
+ mavenLocal()
+
+ mavenCentral()
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://jitpack.io' }
+ }
+
+ tasks.withType(JavaCompile) {
+ options.compilerArgs << "-parameters" // Required by Corda's serialisation framework.
+ }
+
+ jar {
+ // This makes the JAR's SHA-256 hash repeatable.
+ preserveFileTimestamps = false
+ reproducibleFileOrder = true
+ }
+}
+
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+
+sourceSets {
+ main {
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+}
+
+dependencies {
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+
+ // CorDapp dependencies.
+ cordapp project(":workflows")
+ cordapp project(":contracts")
+
+ cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
+ cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
+ cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
+
+ cordaDriver "net.corda:corda-shell:4.10"
+
+}
+
+cordapp {
+ info {
+ name "Queryablestate Car Insurance"
+ vendor "Corda Open Source"
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ }
+}
+
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
+ nodeDefaults {
+ projectCordapp {
+ deploy = false
+ }
+ cordapp project(":workflows")
+ cordapp project(":contracts")
+ runSchemaMigration = true //This configuration is for any CorDapps with custom schema, We will leave this as true to avoid
+ //problems for developers who are not familiar with Corda. If you are not using custom schemas, you can change
+ //it to false for quicker project compiling time.
+ }
+
+ node {
+ name "O=Notary,L=London,C=GB"
+ notary = [validating : false]
+ p2pPort 10002
+ rpcSettings {
+ address("localhost:10003")
+ adminAddress("localhost:10043")
+ }
+ cordapps.clear()
+ }
+
+ node {
+ name "O=Insurer,L=London,C=GB"
+ p2pPort 10005
+ rpcSettings {
+ address("localhost:10006")
+ adminAddress("localhost:10046")
+ }
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+ extraConfig = ['h2Settings.address' : 'localhost:20041']
+ }
+
+ node {
+ name "O=Insuree,L=New York,C=US"
+ p2pPort 10008
+ rpcSettings {
+ address("localhost:10009")
+ adminAddress("localhost:10049")
+ }
+ rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
+ extraConfig = ['h2Settings.address' : 'localhost:20042']
+ }
+}
diff --git a/Features/customquery-carinsurance/clients/build.gradle b/Features/customquery-carinsurance/clients/build.gradle
new file mode 100644
index 00000000..069ee7c4
--- /dev/null
+++ b/Features/customquery-carinsurance/clients/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'org.springframework.boot'
+
+sourceSets {
+ main {
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+}
+
+dependencies {
+ // Corda dependencies.
+ compile "$corda_release_group:corda-rpc:$corda_release_version"
+
+ // CorDapp dependencies.
+ compile project(":workflows")
+
+ compile("org.springframework.boot:spring-boot-starter-websocket:$spring_boot_version") {
+ exclude group: "org.springframework.boot", module: "spring-boot-starter-logging"
+ }
+
+ compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
+ compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
+ compile "org.slf4j:jul-to-slf4j:$slf4j_version"
+}
+
+springBoot {
+ mainClassName = "net.corda.samples.carinsurance.webserver.Starter"
+}
+
+// Note that the bootRun task is built into gradle so there is no webserver task defined here.
diff --git a/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/Client.java b/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/Client.java
new file mode 100644
index 00000000..3f484f6e
--- /dev/null
+++ b/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/Client.java
@@ -0,0 +1,36 @@
+package net.corda.samples.carinsurance;
+
+import net.corda.client.rpc.CordaRPCClient;
+import net.corda.core.messaging.CordaRPCOps;
+import net.corda.core.node.NodeInfo;
+import net.corda.core.utilities.NetworkHostAndPort;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+import static net.corda.core.utilities.NetworkHostAndPort.parse;
+
+/**
+ * Connects to a Corda node via RPC and performs RPC operations on the node.
+ *
+ * The RPC connection is configured using command line arguments.
+ */
+public class Client {
+ private static final Logger logger = LoggerFactory.getLogger(Client.class);
+
+ public static void main(String[] args) {
+ // Create an RPC connection to the node.
+ if (args.length != 3) throw new IllegalArgumentException("Usage: Client ");
+ final NetworkHostAndPort nodeAddress = parse(args[0]);
+ final String rpcUsername = args[1];
+ final String rpcPassword = args[2];
+ final CordaRPCClient client = new CordaRPCClient(nodeAddress);
+ final CordaRPCOps proxy = client.start(rpcUsername, rpcPassword).getProxy();
+
+ // Interact with the node.
+ // For example, here we print the nodes on the network.
+ final List nodes = proxy.networkMapSnapshot();
+ logger.info("{}", nodes);
+ }
+}
diff --git a/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/webserver/Controller.java b/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/webserver/Controller.java
new file mode 100644
index 00000000..7ab53779
--- /dev/null
+++ b/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/webserver/Controller.java
@@ -0,0 +1,54 @@
+package net.corda.samples.carinsurance.webserver;
+
+import net.corda.core.identity.Party;
+import net.corda.core.messaging.CordaRPCOps;
+import net.corda.samples.carinsurance.flows.ClaimInfo;
+import net.corda.samples.carinsurance.flows.InsuranceClaimFlow;
+import net.corda.samples.carinsurance.flows.InsuranceInfo;
+import net.corda.samples.carinsurance.flows.IssueInsuranceFlow;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Set;
+
+/**
+ * Define your API endpoints here.
+ */
+@RestController
+@RequestMapping("/") // The paths for HTTP requests are relative to this base path.
+public class Controller {
+ private final CordaRPCOps proxy;
+ private final static Logger logger = LoggerFactory.getLogger(Controller.class);
+
+ public Controller(NodeRPCConnection rpc) {
+ this.proxy = rpc.proxy;
+ }
+
+ /*
+ * API to trigger the Insurance Issuance flow.
+ **/
+ @PostMapping(value = "/vehicleInsurance/{insuree}")
+ private String vehicleSale(@RequestBody InsuranceInfo insuranceInfo, @PathVariable String insuree) {
+
+ // Get the Party object from the partyName.
+ Set matchingParties = proxy.partiesFromName(insuree, false);
+
+ // Trigger IssueInsuranceInitiator flow.
+ proxy.startFlowDynamic(IssueInsuranceFlow.IssueInsuranceInitiator.class, insuranceInfo,
+ matchingParties.iterator().next());
+ return "Issue Insurance Completed";
+ }
+
+ /*
+ * API to trigger the Insurance Claim flow. It accepts the claim containing details of the claim and the
+ * policyNumber of the insurance in passed as path variable.
+ **/
+ @PostMapping(value = "/vehicleInsurance/claim/{policyNumber}")
+ private String claim(@RequestBody ClaimInfo claimInfo, @PathVariable String policyNumber) {
+
+ // Trigger InsuranceClaimInitiator flow.
+ proxy.startFlowDynamic(InsuranceClaimFlow.InsuranceClaimInitiator.class, claimInfo, policyNumber);
+ return "Insurance Claim Completed";
+ }
+}
diff --git a/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/webserver/NodeRPCConnection.java b/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/webserver/NodeRPCConnection.java
new file mode 100644
index 00000000..807b1f9e
--- /dev/null
+++ b/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/webserver/NodeRPCConnection.java
@@ -0,0 +1,48 @@
+package net.corda.samples.carinsurance.webserver;
+
+import net.corda.client.rpc.CordaRPCClient;
+import net.corda.client.rpc.CordaRPCConnection;
+import net.corda.core.messaging.CordaRPCOps;
+import net.corda.core.utilities.NetworkHostAndPort;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+/**
+ * Wraps an RPC connection to a Corda node.
+ *
+ * The RPC connection is configured using command line arguments.
+ */
+@Component
+public class NodeRPCConnection implements AutoCloseable {
+ // The host of the node we are connecting to.
+ @Value("${config.rpc.host}")
+ private String host;
+ // The RPC port of the node we are connecting to.
+ @Value("${config.rpc.username}")
+ private String username;
+ // The username for logging into the RPC client.
+ @Value("${config.rpc.password}")
+ private String password;
+ // The password for logging into the RPC client.
+ @Value("${config.rpc.port}")
+ private int rpcPort;
+
+ private CordaRPCConnection rpcConnection;
+ CordaRPCOps proxy;
+
+ @PostConstruct
+ public void initialiseNodeRPCConnection() {
+ NetworkHostAndPort rpcAddress = new NetworkHostAndPort(host, rpcPort);
+ CordaRPCClient rpcClient = new CordaRPCClient(rpcAddress);
+ rpcConnection = rpcClient.start(username, password);
+ proxy = rpcConnection.getProxy();
+ }
+
+ @PreDestroy
+ public void close() {
+ rpcConnection.notifyServerAndClose();
+ }
+}
diff --git a/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/webserver/Starter.java b/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/webserver/Starter.java
new file mode 100644
index 00000000..7388e816
--- /dev/null
+++ b/Features/customquery-carinsurance/clients/src/main/java/net/corda/samples/carinsurance/webserver/Starter.java
@@ -0,0 +1,23 @@
+package net.corda.samples.carinsurance.webserver;
+
+import org.springframework.boot.Banner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import static org.springframework.boot.WebApplicationType.SERVLET;
+
+/**
+ * Our Spring Boot application.
+ */
+@SpringBootApplication
+public class Starter {
+ /**
+ * Starts our Spring Boot application.
+ */
+ public static void main(String[] args) {
+ SpringApplication app = new SpringApplication(Starter.class);
+ app.setBannerMode(Banner.Mode.OFF);
+ app.setWebApplicationType(SERVLET);
+ app.run(args);
+ }
+}
diff --git a/Features/customquery-carinsurance/clients/src/main/resources/application.yml b/Features/customquery-carinsurance/clients/src/main/resources/application.yml
new file mode 100644
index 00000000..bc335169
--- /dev/null
+++ b/Features/customquery-carinsurance/clients/src/main/resources/application.yml
@@ -0,0 +1,5 @@
+config.rpc:
+ host: localhost
+ username: user1
+ password: test
+ port: 10006
\ No newline at end of file
diff --git a/Features/customquery-carinsurance/clients/src/main/resources/static/JDBC-url.png b/Features/customquery-carinsurance/clients/src/main/resources/static/JDBC-url.png
new file mode 100644
index 00000000..d40b1ae6
Binary files /dev/null and b/Features/customquery-carinsurance/clients/src/main/resources/static/JDBC-url.png differ
diff --git a/Features/customquery-carinsurance/clients/src/main/resources/static/Postman_screenshot.png b/Features/customquery-carinsurance/clients/src/main/resources/static/Postman_screenshot.png
new file mode 100644
index 00000000..c71e3f67
Binary files /dev/null and b/Features/customquery-carinsurance/clients/src/main/resources/static/Postman_screenshot.png differ
diff --git a/Features/customquery-carinsurance/clients/src/main/resources/static/app.js b/Features/customquery-carinsurance/clients/src/main/resources/static/app.js
new file mode 100644
index 00000000..c58d2de8
--- /dev/null
+++ b/Features/customquery-carinsurance/clients/src/main/resources/static/app.js
@@ -0,0 +1,3 @@
+"use strict";
+
+// Define your client-side logic here.
\ No newline at end of file
diff --git a/Features/customquery-carinsurance/clients/src/main/resources/static/index.html b/Features/customquery-carinsurance/clients/src/main/resources/static/index.html
new file mode 100644
index 00000000..758501dd
--- /dev/null
+++ b/Features/customquery-carinsurance/clients/src/main/resources/static/index.html
@@ -0,0 +1,10 @@
+
+
+
+ Example front-end.
+
+
+ Define your front-end here.
+
+
\ No newline at end of file
diff --git a/Features/customquery-carinsurance/config/dev/log4j2.xml b/Features/customquery-carinsurance/config/dev/log4j2.xml
new file mode 100644
index 00000000..34ba4d45
--- /dev/null
+++ b/Features/customquery-carinsurance/config/dev/log4j2.xml
@@ -0,0 +1,59 @@
+
+
+
+
+ logs
+ node-${hostName}
+ ${log-path}/archive
+
+
+
+
+
+
+ %highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Features/customquery-carinsurance/config/test/log4j2.xml b/Features/customquery-carinsurance/config/test/log4j2.xml
new file mode 100644
index 00000000..cd9926ca
--- /dev/null
+++ b/Features/customquery-carinsurance/config/test/log4j2.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ [%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
+ >
+
+
+
+
+
+
+
+
+
+
diff --git a/Features/customquery-carinsurance/contracts/build.gradle b/Features/customquery-carinsurance/contracts/build.gradle
new file mode 100644
index 00000000..6e7348cc
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/build.gradle
@@ -0,0 +1,49 @@
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+
+cordapp {
+ targetPlatformVersion corda_platform_version.toInteger()
+ minimumPlatformVersion corda_platform_version.toInteger()
+ contract {
+ name "Queryablestate Car Insurance"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src/main/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+ test {
+ java {
+ srcDir 'src/test/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/test")
+ }
+ }
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ }
+}
+
+dependencies {
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+}
diff --git a/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/contracts/InsuranceContract.java b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/contracts/InsuranceContract.java
new file mode 100644
index 00000000..966b0b25
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/contracts/InsuranceContract.java
@@ -0,0 +1,51 @@
+package net.corda.samples.carinsurance.contracts;
+
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.CommandWithParties;
+import net.corda.core.contracts.Contract;
+import net.corda.core.contracts.ContractState;
+import net.corda.core.transactions.LedgerTransaction;
+
+import java.util.List;
+
+import static net.corda.core.contracts.ContractsDSL.requireSingleCommand;
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+// ************
+// * Contract *
+// ************
+public class InsuranceContract implements Contract {
+ // This is used to identify our contract when building a transaction.
+ public static final String ID = "net.corda.samples.carinsurance.contracts.InsuranceContract";
+
+ // A transaction is valid if the verify() function of the contract of all the transaction's input and output states
+ // does not throw an exception.
+ @Override
+ public void verify(LedgerTransaction tx) {
+ CommandWithParties command = requireSingleCommand(tx.getCommands(), InsuranceContract.Commands.class);
+ List inputs = tx.getInputStates();
+
+ if (command.getValue() instanceof InsuranceContract.Commands.IssueInsurance) {
+ requireThat(req -> {
+ req.using("Transaction must have no input states.", inputs.isEmpty());
+ return null;
+ });
+ } else if (command.getValue() instanceof InsuranceContract.Commands.AddClaim) {
+ requireThat(req -> {
+ req.using("Insurance transaction must have input states, the insurance police", (!inputs.isEmpty()));
+ return null;
+ });
+ } else {
+ throw new IllegalArgumentException("Unrecognized command");
+ }
+ }
+
+ // Used to indicate the transaction's intent.
+ public interface Commands extends CommandData {
+ class IssueInsurance implements Commands {
+ }
+
+ class AddClaim implements Commands {
+ }
+ }
+}
diff --git a/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/InsuranceSchemaFamily.java b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/InsuranceSchemaFamily.java
new file mode 100644
index 00000000..aa28dce4
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/InsuranceSchemaFamily.java
@@ -0,0 +1,9 @@
+package net.corda.samples.carinsurance.schema;
+
+/**
+ * Schema Family for Insurance Mapped Schema
+ *
+ * MappedSchema should be associated with a schema family which is consistent across versions of the schema.
+ * It allows the SchemaService to select the appropriate version of the schema if it has evolved over time.
+ */
+public class InsuranceSchemaFamily { }
diff --git a/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/InsuranceSchemaV1.java b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/InsuranceSchemaV1.java
new file mode 100644
index 00000000..7ac11897
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/InsuranceSchemaV1.java
@@ -0,0 +1,26 @@
+package net.corda.samples.carinsurance.schema;
+
+import com.google.common.collect.ImmutableList;
+import net.corda.core.schemas.MappedSchema;
+//4.6 changes
+import org.jetbrains.annotations.Nullable;
+/**
+ * MappedSchema subclass representing the custom schema for the Insurance QueryableState.
+ */
+public class InsuranceSchemaV1 extends MappedSchema {
+
+ /**
+ * The constructor of the MappedSchema requires the schemafamily, verison, and a list of all JPA entity classes for
+ * the Schema.
+ */
+ public InsuranceSchemaV1() {
+ super(InsuranceSchemaFamily.class, 1, ImmutableList.of(PersistentInsurance.class,
+ PersistentVehicle.class, PersistentClaim.class));
+ }
+
+ @Nullable
+ @Override
+ public String getMigrationResource() {
+ return "insurance.changelog-master";
+ }
+}
diff --git a/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/PersistentClaim.java b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/PersistentClaim.java
new file mode 100644
index 00000000..861e102f
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/PersistentClaim.java
@@ -0,0 +1,53 @@
+package net.corda.samples.carinsurance.schema;
+
+import javax.persistence.*;
+import java.util.UUID;
+//4.6 changes
+import org.hibernate.annotations.Type;
+
+
+/**
+ * JPA Entity for saving claim details to the database table
+ */
+@Entity
+@Table(name = "CLAIM_DETAIL")
+public class PersistentClaim {
+
+ @Id @Type (type = "uuid-char") private final UUID id;
+ @Column private final String claimNumber;
+ @Column private final String claimDescription;
+ @Column private final Integer claimAmount;
+
+ /**
+ * Default constructor required by Hibernate
+ */
+ public PersistentClaim() {
+ this.id = null;
+ this.claimNumber = null;
+ this.claimDescription = null;
+ this.claimAmount = null;
+ }
+
+ public PersistentClaim(String claimNumber, String claimDescription, Integer claimAmount) {
+ this.id = UUID.randomUUID();
+ this.claimNumber = claimNumber;
+ this.claimDescription = claimDescription;
+ this.claimAmount = claimAmount;
+ }
+
+ public UUID getId() {
+ return id;
+ }
+
+ public String getClaimNumber() {
+ return claimNumber;
+ }
+
+ public String getClaimDescription() {
+ return claimDescription;
+ }
+
+ public Integer getClaimAmount() {
+ return claimAmount;
+ }
+}
diff --git a/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/PersistentInsurance.java b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/PersistentInsurance.java
new file mode 100644
index 00000000..dda536b1
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/PersistentInsurance.java
@@ -0,0 +1,81 @@
+package net.corda.samples.carinsurance.schema;
+
+import net.corda.core.schemas.PersistentState;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * JPA Entity for saving insurance details to the database table
+ */
+@Entity
+@Table(name = "INSURANCE_DETAIL")
+public class PersistentInsurance extends PersistentState implements Serializable {
+
+ @Column private final String policyNumber;
+ @Column private final Long insuredValue;
+ @Column private final Integer duration;
+ @Column private final Integer premium;
+
+ @OneToOne(cascade = CascadeType.PERSIST)
+ @JoinColumns({
+ @JoinColumn(name = "id", referencedColumnName = "id"),
+ @JoinColumn(name = "registrationNumber", referencedColumnName = "registrationNumber"),
+ })
+ private final PersistentVehicle vehicle;
+
+ @OneToMany(cascade = CascadeType.PERSIST)
+ @JoinColumns({
+ @JoinColumn(name = "output_index", referencedColumnName = "output_index"),
+ @JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id"),
+ })
+ private List claims;
+
+ /**
+ * Default constructor required by Hibernate
+ */
+ public PersistentInsurance() {
+ this.policyNumber = null;
+ this.insuredValue = null;
+ this.duration = null;
+ this.premium = null;
+ this.vehicle = null;
+ this.claims = null;
+ }
+
+ public PersistentInsurance(String policyNumber, Long insuredValue, Integer duration, Integer premium, PersistentVehicle vehicle,
+ List claims) {
+ this.policyNumber = policyNumber;
+ this.insuredValue = insuredValue;
+ this.duration = duration;
+ this.premium = premium;
+ this.vehicle = vehicle;
+ this.claims = claims;
+ }
+
+ public String getPolicyNumber() {
+ return policyNumber;
+ }
+
+ public Long getInsuredValue() {
+ return insuredValue;
+ }
+
+ public Integer getPremium() {
+ return premium;
+ }
+
+ public Integer getDuration() {
+ return duration;
+ }
+
+ public PersistentVehicle getVehicle() {
+ return vehicle;
+ }
+
+ public List getClaims() {
+ return claims;
+ }
+}
diff --git a/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/PersistentVehicle.java b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/PersistentVehicle.java
new file mode 100644
index 00000000..06076919
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/schema/PersistentVehicle.java
@@ -0,0 +1,87 @@
+package net.corda.samples.carinsurance.schema;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.UUID;
+//4.6 changes
+import org.hibernate.annotations.Type;
+
+
+/**
+ * JPA Entity for saving vehicle details to the database table
+ */
+@Entity
+@Table(name = "VEHICLE_DETAIL")
+public class PersistentVehicle implements Serializable {
+
+ @Id @Type (type = "uuid-char") private final UUID id;
+ @Column private final String registrationNumber;
+ @Column private final String chasisNumber;
+ @Column private final String make;
+ @Column private final String model;
+ @Column private final String variant;
+ @Column private final String color;
+ @Column private final String fuelType;
+
+ /**
+ * Default constructor required by Hibernate
+ */
+ public PersistentVehicle() {
+ this.id = null;
+ this.registrationNumber = null;
+ this.chasisNumber = null;
+ this.make = null;
+ this.model = null;
+ this.variant = null;
+ this.color = null;
+ this.fuelType = null;
+ }
+
+ public PersistentVehicle(String registrationNumber, String chasisNumber, String make, String model, String variant,
+ String color, String fuelType) {
+ this.id = UUID.randomUUID();
+ this.registrationNumber = registrationNumber;
+ this.chasisNumber = chasisNumber;
+ this.make = make;
+ this.model = model;
+ this.variant = variant;
+ this.color = color;
+ this.fuelType = fuelType;
+ }
+
+ public UUID getId() {
+ return id;
+ }
+
+ public String getRegistrationNumber() {
+ return registrationNumber;
+ }
+
+ public String getChasisNumber() {
+ return chasisNumber;
+ }
+
+ public String getMake() {
+ return make;
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public String getVariant() {
+ return variant;
+ }
+
+ public String getColor() {
+ return color;
+ }
+
+ public String getFuelType() {
+ return fuelType;
+ }
+
+}
diff --git a/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/states/Claim.java b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/states/Claim.java
new file mode 100644
index 00000000..156393f9
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/states/Claim.java
@@ -0,0 +1,34 @@
+package net.corda.samples.carinsurance.states;
+
+import net.corda.core.serialization.CordaSerializable;
+
+/**
+ * Simple POJO class for the claim details.
+ * Corda uses its own serialization framework hence the class needs to be annotated with @CordaSerializable, so that
+ * the objects of the class can be serialized to be passed across different nodes.
+ */
+@CordaSerializable
+public class Claim {
+
+ private final String claimNumber;
+ private final String claimDescription;
+ private final int claimAmount;
+
+ public Claim(String claimNumber, String claimDescription, int claimAmount) {
+ this.claimNumber = claimNumber;
+ this.claimDescription = claimDescription;
+ this.claimAmount = claimAmount;
+ }
+
+ public String getClaimNumber() {
+ return claimNumber;
+ }
+
+ public String getClaimDescription() {
+ return claimDescription;
+ }
+
+ public int getClaimAmount() {
+ return claimAmount;
+ }
+}
diff --git a/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/states/InsuranceState.java b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/states/InsuranceState.java
new file mode 100644
index 00000000..b2a0cb5d
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/states/InsuranceState.java
@@ -0,0 +1,151 @@
+package net.corda.samples.carinsurance.states;
+
+import com.google.common.collect.ImmutableList;
+import net.corda.core.contracts.BelongsToContract;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.Party;
+import net.corda.core.schemas.MappedSchema;
+import net.corda.core.schemas.PersistentState;
+import net.corda.core.schemas.QueryableState;
+import net.corda.samples.carinsurance.contracts.InsuranceContract;
+import net.corda.samples.carinsurance.schema.InsuranceSchemaV1;
+import net.corda.samples.carinsurance.schema.PersistentClaim;
+import net.corda.samples.carinsurance.schema.PersistentInsurance;
+import net.corda.samples.carinsurance.schema.PersistentVehicle;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Insurance State
+ * The state should implement the QueryableState to support custom schema development.
+ */
+@BelongsToContract(InsuranceContract.class)
+public class InsuranceState implements QueryableState {
+
+ // Represents the asset which is insured.
+ // This will be used to demonstrate one-to-one relationship
+ private final VehicleDetail vehicleDetail;
+
+ // Fields related to the insurance state.
+ private final String policyNumber;
+ private final long insuredValue;
+ private final int duration;
+ private final int premium;
+
+ private final Party insurer;
+ private final Party insuree;
+
+ // Insurance claims made against the insurace policy
+ // This will be used to demonstrate one-to-many relationship
+ private final List claims;
+
+ public InsuranceState(String policyNumber, long insuredValue, int duration, int premium, Party insurer,
+ Party insuree, VehicleDetail vehicleDetail, List claims) {
+ this.policyNumber = policyNumber;
+ this.insuredValue = insuredValue;
+ this.duration = duration;
+ this.premium = premium;
+ this.insurer = insurer;
+ this.insuree = insuree;
+ this.vehicleDetail = vehicleDetail;
+ this.claims = claims;
+ }
+
+ /**
+ * Used to Generate the Entity for this Queryable State.
+ * This method is called by the SchemaService of the node, and the returned entity is handed over to the ORM tool
+ * to be persisted in custom database table.
+ *
+ * @param schema
+ * @return PersistentState
+ */
+ @NotNull
+ @Override
+ public PersistentState generateMappedObject(@NotNull MappedSchema schema) {
+ if(schema instanceof InsuranceSchemaV1){
+
+ // Create list of PersistentClaim entity against every Claims object.
+ List persistentClaims = new ArrayList<>();
+ if(claims != null && claims.size() > 0) {
+ for(Claim claim: claims){
+ PersistentClaim persistentClaim = new PersistentClaim(
+ claim.getClaimNumber(),
+ claim.getClaimDescription(),
+ claim.getClaimAmount()
+ );
+ persistentClaims.add(persistentClaim);
+ }
+ }
+
+ return new PersistentInsurance(
+ this.policyNumber,
+ this.insuredValue,
+ this.duration,
+ this.premium,
+ this.vehicleDetail==null ? null : new PersistentVehicle(
+ vehicleDetail.getRegistrationNumber(),
+ vehicleDetail.getChasisNumber(),
+ vehicleDetail.getMake(),
+ vehicleDetail.getModel(),
+ vehicleDetail.getVariant(),
+ vehicleDetail.getColor(),
+ vehicleDetail.getFuelType()
+ ),
+ this.claims == null? null: persistentClaims
+ );
+ }else{
+ throw new IllegalArgumentException("Unsupported Schema");
+ }
+ }
+
+ /**
+ * Returns a list of supported Schemas by this Queryable State.
+ *
+ * @return Iterable
+ */
+ @NotNull
+ @Override
+ public Iterable supportedSchemas() {
+ return ImmutableList.of(new InsuranceSchemaV1());
+ }
+
+ @NotNull
+ @Override
+ public List getParticipants() {
+ return ImmutableList.of(insuree, insurer);
+ }
+
+ public String getPolicyNumber() {
+ return policyNumber;
+ }
+
+ public long getInsuredValue() {
+ return insuredValue;
+ }
+
+ public int getDuration() {
+ return duration;
+ }
+
+ public int getPremium() {
+ return premium;
+ }
+
+ public Party getInsurer() {
+ return insurer;
+ }
+
+ public Party getInsuree() {
+ return insuree;
+ }
+
+ public VehicleDetail getVehicleDetail() {
+ return vehicleDetail;
+ }
+
+ public List getClaims() {
+ return claims;
+ }
+}
diff --git a/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/states/VehicleDetail.java b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/states/VehicleDetail.java
new file mode 100644
index 00000000..cdbf911e
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/main/java/net/corda/samples/carinsurance/states/VehicleDetail.java
@@ -0,0 +1,60 @@
+package net.corda.samples.carinsurance.states;
+
+
+import net.corda.core.serialization.CordaSerializable;
+
+/**
+ * Simple POJO class for the vehicle details.
+ * Corda uses its own serialization framework hence the class needs to be annotated with @CordaSerializable, so that
+ * the objects of the class can be serialized to be passed across different nodes.
+ */
+@CordaSerializable
+public class VehicleDetail {
+
+ private final String registrationNumber;
+ private final String chasisNumber;
+ private final String make;
+ private final String model;
+ private final String variant;
+ private final String color;
+ private final String fuelType;
+
+ public VehicleDetail(String registrationNumber, String chasisNumber, String make, String model, String variant,
+ String color, String fuelType) {
+ this.registrationNumber = registrationNumber;
+ this.chasisNumber = chasisNumber;
+ this.make = make;
+ this.model = model;
+ this.variant = variant;
+ this.color = color;
+ this.fuelType = fuelType;
+ }
+
+ public String getRegistrationNumber() {
+ return registrationNumber;
+ }
+
+ public String getChasisNumber() {
+ return chasisNumber;
+ }
+
+ public String getMake() {
+ return make;
+ }
+
+ public String getModel() {
+ return model;
+ }
+
+ public String getVariant() {
+ return variant;
+ }
+
+ public String getColor() {
+ return color;
+ }
+
+ public String getFuelType() {
+ return fuelType;
+ }
+}
diff --git a/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/contracts/InsuranceContractTests.java b/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/contracts/InsuranceContractTests.java
new file mode 100644
index 00000000..b2db25db
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/contracts/InsuranceContractTests.java
@@ -0,0 +1,119 @@
+package net.corda.samples.carinsurance.contracts;
+
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.Contract;
+import net.corda.core.contracts.TypeOnlyCommandData;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.samples.carinsurance.states.Claim;
+import net.corda.samples.carinsurance.states.InsuranceState;
+import net.corda.samples.carinsurance.states.VehicleDetail;
+import net.corda.testing.core.DummyCommandData;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.node.MockServices;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+import static net.corda.testing.node.NodeTestUtils.transaction;
+
+public class InsuranceContractTests {
+
+ // A pre-defined dummy command.
+ public interface Commands extends CommandData {
+ class DummyCommand extends TypeOnlyCommandData implements Commands {
+ }
+ }
+
+ private MockServices ledgerServices = new MockServices(
+ Arrays.asList("net.corda.samples.carinsurance.contracts")
+ );
+
+ private TestIdentity a = new TestIdentity(new CordaX500Name("Alice", "", "GB"));
+ private TestIdentity b = new TestIdentity(new CordaX500Name("Bob", "", "GB"));
+
+ String registrationNumber = "registration number: 2ds9Fvk";
+ String chassisNum = "chassis# aedl3sc";
+ String make = "Toyota";
+ String model = "Corolla";
+ String variant = "SE";
+ String color = "hot rod beige";
+ String fuelType = "regular";
+
+ VehicleDetail vd = new VehicleDetail(
+ registrationNumber,
+ chassisNum,
+ make,
+ model,
+ variant,
+ color,
+ fuelType);
+
+ String desc = "claim description: my car was hit by a blockchain";
+ String claimNumber = "B-132022";
+ int claimAmount = 3000;
+
+ Claim c = new Claim(claimNumber, desc, claimAmount);
+
+ // in this test scenario, alice is our insurer.
+ String policyNum = "R3-Policy-A4byCd";
+ long insuredValue = 100000L;
+ int duration = 50;
+ int premium = 5;
+ Party insurer = a.getParty();
+ Party insuree = b.getParty();
+
+ InsuranceState st = new InsuranceState(
+ policyNum,
+ insuredValue,
+ duration,
+ premium,
+ insurer,
+ insuree,
+ vd,
+ Arrays.asList(c));
+
+ @Test
+ public void contractImplementsContract() {
+ assert (new InsuranceContract() instanceof Contract);
+ }
+
+ @Test
+ public void contractRequiresOneCommandInTheTransaction() {
+ transaction(ledgerServices, tx -> {
+ tx.output(InsuranceContract.ID, st);
+ // Has two commands, will fail.
+ tx.command(Arrays.asList(a.getPublicKey(), b.getPublicKey()), new InsuranceContract.Commands.IssueInsurance());
+ tx.command(Arrays.asList(a.getPublicKey(), b.getPublicKey()), new InsuranceContract.Commands.IssueInsurance());
+ tx.fails();
+ return null;
+ });
+
+ transaction(ledgerServices, tx -> {
+ tx.output(InsuranceContract.ID, st);
+ // Has one command, will verify.
+ tx.command(Arrays.asList(a.getPublicKey(), b.getPublicKey()), new InsuranceContract.Commands.IssueInsurance());
+ tx.verifies();
+ return null;
+ });
+ }
+
+ @Test
+ public void contractRequiresTheTransactionsCommandToBeAnIssueCommand() {
+ transaction(ledgerServices, tx -> {
+ // Has wrong command type, will fail.
+ tx.output(InsuranceContract.ID, st);
+ tx.command(Arrays.asList(a.getPublicKey()), DummyCommandData.INSTANCE);
+ tx.fails();
+ return null;
+ });
+
+ transaction(ledgerServices, tx -> {
+ // Has correct command type, will verify.
+ tx.output(InsuranceContract.ID, st);
+ tx.command(Arrays.asList(a.getPublicKey(), b.getPublicKey()), new InsuranceContract.Commands.IssueInsurance());
+ tx.verifies();
+ return null;
+ });
+ }
+}
diff --git a/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/states/ClaimTests.java b/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/states/ClaimTests.java
new file mode 100644
index 00000000..7cff18a2
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/states/ClaimTests.java
@@ -0,0 +1,22 @@
+package net.corda.samples.carinsurance.states;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ClaimTests {
+
+ private final String desc = "claim description: my car was hit by a blockchain";
+ private final String claimNumber = "B-132022";
+ private final int claimAmount = 3000;
+
+ @Test
+ public void constructorTest() {
+ Claim st = new Claim(claimNumber, desc, claimAmount);
+
+ assertEquals(claimNumber, st.getClaimNumber());
+ assertEquals(desc, st.getClaimDescription());
+ assertEquals(claimAmount, st.getClaimAmount());
+ }
+
+}
diff --git a/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/states/InsuranceStateTests.java b/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/states/InsuranceStateTests.java
new file mode 100644
index 00000000..8fbe5552
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/states/InsuranceStateTests.java
@@ -0,0 +1,73 @@
+package net.corda.samples.carinsurance.states;
+
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.testing.core.TestIdentity;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+public class InsuranceStateTests {
+
+ TestIdentity a = new TestIdentity(new CordaX500Name("Alice", "", "GB"));
+ TestIdentity b = new TestIdentity(new CordaX500Name("Bob", "", "GB"));
+
+ @Test
+ public void constructorTest() {
+
+ String registrationNumber = "registration number: 2ds9Fvk";
+ String chassisNum = "chassis# aedl3sc";
+ String make = "Toyota";
+ String model = "Corolla";
+ String variant = "SE";
+ String color = "hot rod beige";
+ String fuelType = "regular";
+
+ VehicleDetail vd = new VehicleDetail(
+ registrationNumber,
+ chassisNum,
+ make,
+ model,
+ variant,
+ color,
+ fuelType);
+
+ String desc = "claim description: my car was hit by a blockchain";
+ String claimNumber = "B-132022";
+ int claimAmount = 3000;
+
+ Claim c = new Claim(claimNumber, desc, claimAmount);
+
+ // in this test scenario, alice is our insurer.
+ String policyNum = "R3-Policy-A4byCd";
+ long insuredValue = 100000L;
+ int duration = 50;
+ int premium = 5;
+ Party insurer = a.getParty();
+ Party insuree = b.getParty();
+
+ InsuranceState st = new InsuranceState(
+ policyNum,
+ insuredValue,
+ duration,
+ premium,
+ insurer,
+ insuree,
+ vd,
+ Arrays.asList(c));
+
+ assertEquals(policyNum, st.getPolicyNumber());
+ assertEquals(insuredValue, st.getInsuredValue());
+ assertEquals(duration, st.getDuration());
+ assertEquals(premium, st.getPremium());
+ assertEquals(insurer, st.getInsurer());
+ assertEquals(insuree, st.getInsuree());
+ assertEquals(vd, st.getVehicleDetail());
+
+ assertTrue(st.getParticipants().contains(a.getParty()));
+ assertTrue(st.getParticipants().contains(b.getParty()));
+ }
+
+}
diff --git a/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/states/VehicleDetailTests.java b/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/states/VehicleDetailTests.java
new file mode 100644
index 00000000..e8d55cb1
--- /dev/null
+++ b/Features/customquery-carinsurance/contracts/src/test/java/net/corda/samples/carinsurance/states/VehicleDetailTests.java
@@ -0,0 +1,43 @@
+package net.corda.samples.carinsurance.states;
+
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.core.TestIdentity;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+public class VehicleDetailTests {
+
+ TestIdentity a = new TestIdentity(new CordaX500Name("Alice", "", "GB"));
+ TestIdentity b = new TestIdentity(new CordaX500Name("Bob", "", "GB"));
+
+
+ @Test
+ public void constructorTest() {
+
+ String registrationNumber = "registration number: 2ds9Fvk";
+ String chassisNum = "chassis# aedl3sc";
+ String make = "Toyota";
+ String model = "Corolla";
+ String variant = "SE";
+ String color = "hot rod beige";
+ String fuelType = "regular";
+
+ VehicleDetail vd = new VehicleDetail(
+ registrationNumber,
+ chassisNum,
+ make,
+ model,
+ variant,
+ color,
+ fuelType);
+
+ assertEquals(registrationNumber, vd.getRegistrationNumber());
+ assertEquals(chassisNum, vd.getChasisNumber());
+ assertEquals(make, vd.getMake());
+ assertEquals(model, vd.getModel());
+ assertEquals(variant, vd.getVariant());
+ assertEquals(color, vd.getColor());
+ assertEquals(fuelType, vd.getFuelType());
+ }
+
+}
diff --git a/Features/customquery-carinsurance/gradle.properties b/Features/customquery-carinsurance/gradle.properties
new file mode 100644
index 00000000..9e31391f
--- /dev/null
+++ b/Features/customquery-carinsurance/gradle.properties
@@ -0,0 +1,3 @@
+name=Queryablestate Car Insurance
+group=com.carinsurance
+version=0.1
diff --git a/Features/customquery-carinsurance/gradle/wrapper/gradle-wrapper.jar b/Features/customquery-carinsurance/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..99340b4a
Binary files /dev/null and b/Features/customquery-carinsurance/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Features/customquery-carinsurance/gradle/wrapper/gradle-wrapper.properties b/Features/customquery-carinsurance/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..ae01072d
--- /dev/null
+++ b/Features/customquery-carinsurance/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Aug 25 12:50:39 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Features/customquery-carinsurance/gradlew b/Features/customquery-carinsurance/gradlew
new file mode 100755
index 00000000..cccdd3d5
--- /dev/null
+++ b/Features/customquery-carinsurance/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/Features/customquery-carinsurance/gradlew.bat b/Features/customquery-carinsurance/gradlew.bat
new file mode 100644
index 00000000..f9553162
--- /dev/null
+++ b/Features/customquery-carinsurance/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Features/customquery-carinsurance/repositories.gradle b/Features/customquery-carinsurance/repositories.gradle
new file mode 100644
index 00000000..8be7b630
--- /dev/null
+++ b/Features/customquery-carinsurance/repositories.gradle
@@ -0,0 +1,8 @@
+repositories {
+ mavenLocal()
+ mavenCentral()
+
+ maven { url 'https://jitpack.io' }
+ maven { url 'https://download.corda.net/maven/corda-dependencies' }
+ maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+}
diff --git a/Features/customquery-carinsurance/settings.gradle b/Features/customquery-carinsurance/settings.gradle
new file mode 100644
index 00000000..2514aca2
--- /dev/null
+++ b/Features/customquery-carinsurance/settings.gradle
@@ -0,0 +1,3 @@
+include 'workflows'
+include 'contracts'
+include 'clients'
\ No newline at end of file
diff --git a/Features/customquery-carinsurance/workflows/build.gradle b/Features/customquery-carinsurance/workflows/build.gradle
new file mode 100644
index 00000000..e53991a3
--- /dev/null
+++ b/Features/customquery-carinsurance/workflows/build.gradle
@@ -0,0 +1,65 @@
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
+apply plugin: 'net.corda.plugins.quasar-utils'
+
+cordapp {
+ targetPlatformVersion corda_platform_version
+ minimumPlatformVersion corda_platform_version
+ workflow {
+ name "Queryablestate Car Insurance"
+ vendor "Corda Open Source"
+ licence "Apache License, Version 2.0"
+ versionId 1
+ }
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src/main/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/dev")
+ }
+ }
+ test {
+ java {
+ srcDir 'src/test/java'
+ java.outputDir = file('bin/main')
+ }
+ resources {
+ srcDir rootProject.file("config/test")
+ }
+ }
+ integrationTest {
+ java {
+ compileClasspath += main.output + test.output
+ runtimeClasspath += main.output + test.output
+ srcDir file('src/integrationTest/java')
+ }
+ }
+}
+
+configurations {
+ integrationTestCompile.extendsFrom testCompile
+ integrationTestRuntime.extendsFrom testRuntime
+}
+
+dependencies {
+ testCompile "junit:junit:$junit_version"
+
+ // Corda dependencies.
+ cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
+ cordaRuntime "$corda_release_group:corda:$corda_release_version"
+
+ testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+
+ // CorDapp dependencies.
+ cordapp project(":contracts")
+}
+
+task integrationTest(type: Test, dependsOn: []) {
+ testClassesDirs = sourceSets.integrationTest.output.classesDirs
+ classpath = sourceSets.integrationTest.runtimeClasspath
+}
diff --git a/Features/customquery-carinsurance/workflows/src/integrationTest/java/net/corda/samples/carinsurance/DriverBasedTest.java b/Features/customquery-carinsurance/workflows/src/integrationTest/java/net/corda/samples/carinsurance/DriverBasedTest.java
new file mode 100644
index 00000000..c01ffacd
--- /dev/null
+++ b/Features/customquery-carinsurance/workflows/src/integrationTest/java/net/corda/samples/carinsurance/DriverBasedTest.java
@@ -0,0 +1,48 @@
+package net.corda.samples.carinsurance;
+
+import com.google.common.collect.ImmutableList;
+import net.corda.core.concurrent.CordaFuture;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.testing.core.TestIdentity;
+import net.corda.testing.driver.DriverParameters;
+import net.corda.testing.driver.NodeHandle;
+import net.corda.testing.driver.NodeParameters;
+import org.junit.Test;
+
+import java.util.List;
+
+import static net.corda.testing.driver.Driver.driver;
+import static org.junit.Assert.assertEquals;
+
+public class DriverBasedTest {
+ private final TestIdentity bankA = new TestIdentity(new CordaX500Name("BankA", "", "GB"));
+ private final TestIdentity bankB = new TestIdentity(new CordaX500Name("BankB", "", "US"));
+
+ @Test
+ public void nodeTest() {
+ driver(new DriverParameters().withIsDebug(true).withStartNodesInProcess(true), dsl -> {
+ // Start a pair of nodes and wait for them both to be ready.
+ List> handleFutures = ImmutableList.of(
+ dsl.startNode(new NodeParameters().withProvidedName(bankA.getName())),
+ dsl.startNode(new NodeParameters().withProvidedName(bankB.getName()))
+ );
+
+ try {
+ NodeHandle partyAHandle = handleFutures.get(0).get();
+ NodeHandle partyBHandle = handleFutures.get(1).get();
+
+ // From each node, make an RPC call to retrieve another node's name from the network map, to verify that the
+ // nodes have started and can communicate.
+
+ // This is a very basic test: in practice tests would be starting flows, and verifying the states in the vault
+ // and other important metrics to ensure that your CorDapp is working as intended.
+ assertEquals(partyAHandle.getRpc().wellKnownPartyFromX500Name(bankB.getName()).getName(), bankB.getName());
+ assertEquals(partyBHandle.getRpc().wellKnownPartyFromX500Name(bankA.getName()).getName(), bankA.getName());
+ } catch (Exception e) {
+ throw new RuntimeException("Caught exception during test: ", e);
+ }
+
+ return null;
+ });
+ }
+}
diff --git a/Features/customquery-carinsurance/workflows/src/main/java/net/corda/samples/carinsurance/flows/ClaimInfo.java b/Features/customquery-carinsurance/workflows/src/main/java/net/corda/samples/carinsurance/flows/ClaimInfo.java
new file mode 100644
index 00000000..26a47000
--- /dev/null
+++ b/Features/customquery-carinsurance/workflows/src/main/java/net/corda/samples/carinsurance/flows/ClaimInfo.java
@@ -0,0 +1,28 @@
+package net.corda.samples.carinsurance.flows;
+
+import net.corda.core.serialization.CordaSerializable;
+
+@CordaSerializable
+public class ClaimInfo {
+ private final String claimNumber;
+ private final String claimDescription;
+ private final int claimAmount;
+
+ public ClaimInfo(String claimNumber, String claimDescription, int claimAmount) {
+ this.claimNumber = claimNumber;
+ this.claimDescription = claimDescription;
+ this.claimAmount = claimAmount;
+ }
+
+ public String getClaimNumber() {
+ return claimNumber;
+ }
+
+ public String getClaimDescription() {
+ return claimDescription;
+ }
+
+ public int getClaimAmount() {
+ return claimAmount;
+ }
+}
diff --git a/Features/customquery-carinsurance/workflows/src/main/java/net/corda/samples/carinsurance/flows/InsuranceClaimFlow.java b/Features/customquery-carinsurance/workflows/src/main/java/net/corda/samples/carinsurance/flows/InsuranceClaimFlow.java
new file mode 100644
index 00000000..d0c2d034
--- /dev/null
+++ b/Features/customquery-carinsurance/workflows/src/main/java/net/corda/samples/carinsurance/flows/InsuranceClaimFlow.java
@@ -0,0 +1,122 @@
+package net.corda.samples.carinsurance.flows;
+
+import co.paralleluniverse.fibers.Suspendable;
+import com.google.common.collect.ImmutableList;
+import net.corda.core.contracts.StateAndRef;
+import net.corda.core.flows.*;
+import net.corda.core.internal.FetchDataFlow;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.Builder;
+import net.corda.core.node.services.vault.CriteriaExpression;
+import net.corda.core.node.services.vault.FieldInfo;
+import net.corda.core.node.services.vault.PageSpecification;
+import net.corda.core.node.services.vault.Sort;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.transactions.SignedTransaction;
+import net.corda.core.transactions.TransactionBuilder;
+import net.corda.samples.carinsurance.contracts.InsuranceContract;
+import net.corda.samples.carinsurance.schema.InsuranceSchemaV1;
+import net.corda.samples.carinsurance.schema.PersistentInsurance;
+import net.corda.samples.carinsurance.states.Claim;
+import net.corda.samples.carinsurance.states.InsuranceState;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Collections;
+
+public class InsuranceClaimFlow {
+
+ private InsuranceClaimFlow(){}
+
+ @InitiatingFlow
+ @StartableByRPC
+ public static class InsuranceClaimInitiator extends FlowLogic{
+
+ private final ClaimInfo claimInfo;
+ private final String policyNumber;
+
+ public InsuranceClaimInitiator(ClaimInfo claimInfo, String policyNumber) {
+ this.claimInfo = claimInfo;
+ this.policyNumber = policyNumber;
+ }
+
+ @Override
+ @Suspendable
+ public SignedTransaction call() throws FlowException{
+ /*************************************************************************************
+ * This section is the custom query code. Instead of query out all the insurance state and filter by their policy number,
+ * custom query will only retrieve the insurance state that matched the policy number. The filtering will happen behind the scene.
+ * **/
+ Field valueField = null;
+ try{
+ valueField = PersistentInsurance.class.getDeclaredField("policyNumber");
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ }
+ QueryCriteria insuranceQuery = new QueryCriteria.VaultCustomQueryCriteria(Builder.equal(valueField, policyNumber));
+ /** And you can have joint custom criteria as well. Simply add additional criteria and add it to the criteria object by using and().
+ * QueryCriteria insuranceQuery = new QueryCriteria.VaultCustomQueryCriteria(Builder.equal(valueField, insuredValue));
+ * **/
+ QueryCriteria generalCriteria = new QueryCriteria.VaultQueryCriteria(Vault.StateStatus.UNCONSUMED).and(insuranceQuery);
+ Vault.Page insuranceStateAndRefs = getServiceHub().getVaultService().queryBy(InsuranceState.class, generalCriteria );
+ /***************************************************************************************/
+
+ if(insuranceStateAndRefs.getStates().isEmpty()){
+ throw new IllegalArgumentException("Policy not found");
+ }
+
+ StateAndRef 
+ 
+