observablecordapp revamp

Author: peterli-r3

Features/cordaservice-autopayroll/contracts/src/test/java/net/corda/samples/autopayroll/contracts/ContractTests.java

@@ -17,7 +17,7 @@ public class ContractTests {
     TestIdentity partyb = new TestIdentity(new CordaX500Name("Bob",  "TestLand",  "US"));
 
     @Test
-    public void GameCanOnlyCreatedWhenTwoDifferentPlayerPresented() {
+    public void NoNegativePayCheckValue() {
         MoneyState tokenPass = new MoneyState(10,partyb.getParty());
         MoneyState tokenfail = new MoneyState(-10,partyb.getParty());
 

Features/observablestates-tradereporting/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-# observable states cordapp [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Features/observablestates-tradereporting)
+# observable states cordapp
 
 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.
@@ -14,7 +14,7 @@ and national regulators. There are two ways to use observable states:
 
 The two approaches are functionally identical.
 
-In this CorDapp, the seller runs [the `TradeAndReport` flow](./workflows/src/main/java/com/observable/flows/TradeAndReport.java#L30-L48) to create [a new `HighlyRegulatedState`](./contracts/src/main/java/com/observable/states/HighlyRegulatedState.java#L19-L22). Then we can see that the seller will:
+In this CorDapp, the seller runs [the `TradeAndReport` flow](./workflows-kotlin/src/main/kotlin/com/observable/flows/TradeAndReport.kt) to create [a new `HighlyRegulatedState`](./contracts-kotlin/src/main/kotlin/com/observable/states/HighlyRegulatedState.kt). Then we can see that the seller will:
 
 * Distribute the state to the buyer and the `state regulator` using `FinalityFlow`
 * Distribute the state to the `national regulator` manually using the `ReportManually` flow
@@ -26,17 +26,12 @@ In this CorDapp, the seller runs [the `TradeAndReport` flow](./workflows/src/mai
 
 See https://docs.corda.net/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)
+### Deploy and run the node
 ```
-./gradlew clean deployNodes
+./greadlew deployNodes
+./build/node/runnodes
 ```
-Then type: (to run the nodes)
-```
-./build/nodes/runnodes
-```
-
 
 ### Interacting with the nodes:
 
@@ -47,6 +42,6 @@ Go to the [CRaSH](https://docs.corda.net/docs/corda-os/shell.html) shell of Sell
 The state will be automatically reported to StateRegulator and NationalRegulator, even though they are not
 participants. Check this by going to the shell of either node and running:
 
-    run vaultQuery contractStateType: com.observable.states.HighlyRegulatedState
+    run vaultQuery contractStateType: net.corda.samples.observable.states.HighlyRegulatedState
 
 You will see the new `HighlyRegulatedState` in the vault of both nodes.

Features/observablestates-tradereporting/README.md

@@ -1,4 +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/.
+https://www.r3.com/trademark-policy/.

Features/observablestates-tradereporting/TRADEMARK

@@ -1,18 +1,19 @@
-buildscript {
+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_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")
+        corda_platform_version = constants.getProperty("platformVersion").toInteger()
     }
 
     repositories {
@@ -29,56 +30,107 @@ buildscript {
     }
 }
 
-apply from: './repositories.gradle'
+allprojects {//Properties that you need to compile your project (The application)
+    apply from: "${rootProject.projectDir}/repositories.gradle"
+    apply plugin: 'java'
 
-allprojects {
+    repositories {
+        mavenLocal()
+        jcenter()
+        mavenCentral()
+        maven { url 'https://software.r3.com/artifactory/corda' }
+        maven { url 'https://jitpack.io' }
+    }
 
-    apply plugin: 'java'
-    apply plugin: 'net.corda.plugins.cordapp'
-    apply plugin: 'net.corda.plugins.cordformation'
-    apply plugin: 'net.corda.plugins.quasar-utils'
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-parameters" // Required by Corda's serialisation framework.
+    }
 
     jar {
-        // CorDapps do not configure the Node's logging.
-        exclude '**/log4j2*.xml'
+        // This makes the JAR's SHA-256 hash repeatable.
+        preserveFileTimestamps = false
+        reproducibleFileOrder = true
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
+}
 
-    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'
+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"
 
-    dependencies {
-        testCompile "junit:junit:$junit_version"
+    // CorDapp dependencies.
+    cordapp project(":workflows")
+    cordapp project(":contracts")
 
-        // Corda dependencies.
-        cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
-        cordaCompile "$corda_release_group:corda-jackson:$corda_release_version"
-        cordaCompile "$corda_release_group:corda-rpc:$corda_release_version"
-        cordaCompile "$corda_release_group:corda-node-api:$corda_release_version"
-        cordaRuntime "$corda_release_group:corda:$corda_release_version"
+    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"
+}
 
-        testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
-        cordaRuntime "org.apache.logging.log4j:log4j-slf4j-impl:$log4j_version"
+task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
+    nodeDefaults {
+        projectCordapp {
+            deploy = true
+        }
+        cordapp project(':contracts')
+        cordapp project(':workflows')
+        runSchemaMigration = true
+        rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
     }
-
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-parameters" // Required for shell commands.
+    node {
+        name "O=Notary,L=London,C=GB"
+        notary = [validating : false]
+        p2pPort 10002
+        rpcSettings {
+            address("localhost:10003")
+            adminAddress("localhost:10004")
+        }
+        cordapps.clear()
     }
-
-
-    cordapp {
-        targetPlatformVersion corda_platform_version.toInteger()
-        minimumPlatformVersion corda_platform_version.toInteger()
-        workflow {
-            name "CorDapp Name"
-            vendor "Corda Open Source"
-            licence "Apache License, Version 2.0"
-            versionId 1
+    node {
+        name "O=Seller,L=London,C=GB"
+        p2pPort 10005
+        rpcSettings {
+            address("localhost:10006")
+            adminAddress("localhost:10007")
+        }
+    }
+    node {
+        name "O=Buyer,L=New York,C=US"
+        p2pPort 10008
+        rpcSettings {
+            address("localhost:10009")
+            adminAddress("localhost:10010")
+        }
+    }
+    node {
+        name "O=StateRegulator,L=New York,C=US"
+        p2pPort 10011
+        rpcSettings {
+            address("localhost:10012")
+            adminAddress("localhost:10013")
+        }
+    }
+    node {
+        name "O=NationalRegulator,L=New York,C=US"
+        p2pPort 10014
+        rpcSettings {
+            address("localhost:10015")
+            adminAddress("localhost:10016")
         }
     }
-
 }

Features/observablestates-tradereporting/build.gradle

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="info">
-    <Properties>
-        <Property name="log-path">build/logs</Property>
-        <Property name="log-name">node-${hostName}</Property>
-    </Properties>
-
     <Appenders>
         <Console name="Console-Appender" target="SYSTEM_OUT">
             <PatternLayout>
@@ -13,19 +8,13 @@
                 </pattern>>
             </PatternLayout>
         </Console>
-        <File name="File-Appender"
-              fileName="${log-path}/${log-name}.log" immediateFlush="false" append="true">
-            <PatternLayout pattern="[%-5level] %d{ISO8601}{GMT+0} [%t] %c{1} - %msg%n"/>
-        </File>
     </Appenders>
     <Loggers>
         <Root level="info">
             <AppenderRef ref="Console-Appender"/>
-            <AppenderRef ref="File-Appender"/>
         </Root>
         <Logger name="net.corda" level="info" additivity="false">
             <AppenderRef ref="Console-Appender"/>
-            <AppenderRef ref="File-Appender"/>
         </Logger>
     </Loggers>
 </Configuration>

…adereporting/config/test/log4j2-test.xml …es-tradereporting/config/test/log4j2.xmlFeatures/observablestates-tradereporting/config/test/log4j2-test.xml renamed to Features/observablestates-tradereporting/config/test/log4j2.xml Features/observablestates-tradereporting/config/test/log4j2-test.xml renamed to Features/observablestates-tradereporting/config/test/log4j2.xml

@@ -1,12 +1,35 @@
-apply from: '../repositories.gradle'
+apply plugin: 'net.corda.plugins.cordapp'
+apply plugin: 'net.corda.plugins.cordformation'
 
 cordapp {
-    targetPlatformVersion corda_platform_version.toInteger()
-    minimumPlatformVersion corda_platform_version.toInteger()
+    targetPlatformVersion corda_platform_version
+    minimumPlatformVersion corda_platform_version
     contract {
-        name "Observable States"
+        name "Template Contracts"
         vendor "Corda Open Source"
-        licence "A liberal, open source licence"
+        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"
+}

Features/observablestates-tradereporting/contracts/build.gradle

@@ -0,0 +1,34 @@
+package net.corda.samples.observable.contracts;
+
+import net.corda.core.contracts.CommandData;
+import net.corda.core.contracts.CommandWithParties;
+import net.corda.core.contracts.Contract;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.transactions.LedgerTransaction;
+import net.corda.samples.observable.states.HighlyRegulatedState;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.stream.Collectors;
+
+import static net.corda.core.contracts.ContractsDSL.requireSingleCommand;
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+public class HighlyRegulatedContract implements Contract {
+    public static final String ID = "net.corda.samples.observable.contracts.HighlyRegulatedContract";
+
+    @Override
+    public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
+        final CommandWithParties<Commands.Trade> command = requireSingleCommand(tx.getCommands(), Commands.Trade.class);
+        requireThat(require -> {
+
+            final HighlyRegulatedState out = tx.outputsOfType(HighlyRegulatedState.class).get(0);
+            require.using("The Buyer and the seller cannot be the same entity.",
+                    !out.getBuyer().equals(out.getSeller()));
+            return null;
+        });
+    }
+
+    public interface Commands extends CommandData {
+        class Trade implements Commands {}
+    }
+}

Features/observablestates-tradereporting/contracts/src/main/java/com/observable/contracts/HighlyRegulatedContract.java

@@ -1,10 +1,10 @@
-package com.observable.states;
+package net.corda.samples.observable.states;
 
-import com.observable.contracts.HighlyRegulatedContract;
 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.samples.observable.contracts.HighlyRegulatedContract;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;