Merge pull request #34 from corda/accountrevamp

merge Accountrevamp into Q4 clean up

Author: peterli-r3

Accounts/README.md

@@ -1,18 +1,17 @@
-## samples-java/Accounts
+## Accounts CorDapp Samples 
 
 This folder features Corda Accounts sample projects. Learn more about [Accounts](https://training.corda.net/libraries/accounts-lib/).
 
 ### [Supply Chain](./supplychain):
 
 This CorDapp mimics a supply chain transaction, where the deal is incorporated among different teams in the companies on both side of the trade.  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Accounts/supplychain)
+<p align="center">
+  <img src="./supplychain/Business%20Flow.png" alt="Corda" width="700">
+</p>
 
 ### [Tic Tac Thor](./tictacthor):
 
-This CorDapp recreates the game of Tic Tac Toe via Corda. It primarily demonstrates how you can have [LinearState](https://docs.corda.net/docs/corda-os/api-states.html#linearstate) transactions between cross-node accounts.  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Accounts/tictacthor)
-
-### [Worldcup Ticket Booking](./worldcupticketbooking):
-This CorDapp demonstrates an ticket booking system with a collaboration of Corda [Accounts](https://training.corda.net/libraries/accounts-lib/) and [Tokens](https://training.corda.net/libraries/tokens-sdk/).  
-[<img src="../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Accounts/worldcupticketbooking)
-
+This CorDapp recreates the game of Tic Tac Toe via Corda. It primarily demonstrates how you can have LinearState transactions between cross-node accounts.  
+<p align="center">
+  <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/32/Tic_tac_toe.svg/1024px-Tic_tac_toe.svg.png" alt="Corda" width="200">
+</p>

Accounts/supplychain/README.md

@@ -1,4 +1,4 @@
-# Accounts_SupplyChain [<img src="../../webIDE.png" height=25 />](https://ide.corda.net/?folder=/home/coder/samples-java/Accounts/supplychain)
+# Accounts_SupplyChain
 
 For More information regarding the Accounts Library, please read at: https://github.com/corda/accounts/blob/master/docs.md
 
@@ -89,7 +89,7 @@ Navigate to Seller's node terminal and type in
 ```
 flow start SendShippingRequest whoAmI: SellerInventory, whereTo: BuyerWarehouse, shipper: ShippingCo, Cargo: 10 boxes of Books
 ```
-[Optional verification]: run ```run vaultQuery contractStateType: com.supplychain.states.ShippingRequestState``` at ShippingCo's node terminal 
+[Optional verification]: run ```run vaultQuery contractStateType: ShippingRequestState``` at ShippingCo's node terminal 
 
 ## Step 6: Shipping company sends the cargo to Buyer's warehouse
 Navigate to ShippingCo's node terminal and type in

Accounts/supplychain/build.gradle

@@ -3,7 +3,6 @@ buildscript {
     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")
@@ -15,9 +14,11 @@ buildscript {
         log4j_version = constants.getProperty("log4jVersion")
         slf4j_version = constants.getProperty("slf4jVersion")
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
-        //accounts
-        accounts_release_version = '1.0'
+
+        //account
         accounts_release_group = 'com.r3.corda.lib.accounts'
+        accounts_release_version = '1.0'
+        //CI
         confidential_id_release_group = "com.r3.corda.lib.ci"
         confidential_id_release_version = "1.0"
     }
@@ -45,9 +46,11 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url 'https://software.r3.com/artifactory/corda' }
+        maven { url 'https://jitpack.io' }
+        //SDK lib
         maven { url 'https://software.r3.com/artifactory/corda-lib' }
-        maven { url 'https://software.r3.com/artifactory/corda-lib-dev' }
-        maven { url "https://repo.gradle.org/gradle/libs-releases-local" }
+        //Gradle Plugins
+        maven { url 'https://repo.gradle.org/gradle/libs-releases' }
     }
 
     tasks.withType(JavaCompile) {
@@ -62,9 +65,6 @@ allprojects {
     }
 }
 
-
-
-
 apply plugin: 'net.corda.plugins.cordapp'
 apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'net.corda.plugins.quasar-utils'
@@ -97,29 +97,6 @@ dependencies {
     cordapp "$accounts_release_group:accounts-workflows:$accounts_release_version"
 }
 
-cordapp {
-    info {
-        name "CorDapp supplychain"
-        vendor "Corda Open Source"
-        targetPlatformVersion corda_platform_version
-        minimumPlatformVersion corda_platform_version
-    }
-}
-
-task ganache {
-    subprojects {
-        if (it.project.name != "clients") {
-            dependsOn jar
-            doLast {
-                copy {
-                    from "${buildDir}/libs"
-                    into "${rootDir}/build/libs"
-                }
-            }
-        }
-    }
-}
-
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         projectCordapp {

Accounts/supplychain/contracts/src/main/java/com/supplychain/contracts/InvoiceStateContract.java

@@ -1,4 +1,4 @@
-package com.supplychain.contracts;
+package net.corda.samples.supplychain.contracts;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.Contract;
@@ -9,7 +9,7 @@
 // ************
 public class CargoStateContract implements Contract {
     // This is used to identify our contract when building a transaction.
-    public static final String ID = "com.supplychain.contracts.CargoStateContract";
+    public static final String ID = "net.corda.samples.supplychain.contracts.CargoStateContract";
 
     // 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.

…ychain/contracts/CargoStateContract.java …ychain/contracts/CargoStateContract.javaAccounts/supplychain/contracts/src/main/java/com/supplychain/contracts/CargoStateContract.java renamed to Accounts/supplychain/contracts/src/main/java/net/corda/samples/supplychain/contracts/CargoStateContract.java Accounts/supplychain/contracts/src/main/java/com/supplychain/contracts/CargoStateContract.java renamed to Accounts/supplychain/contracts/src/main/java/net/corda/samples/supplychain/contracts/CargoStateContract.java

@@ -1,4 +1,4 @@
-package com.supplychain.contracts;
+package net.corda.samples.supplychain.contracts;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.Contract;
@@ -9,7 +9,7 @@
 // ************
 public class InternalMessageStateContract implements Contract {
     // This is used to identify our contract when building a transaction.
-    public static final String ID = "com.supplychain.contracts.InternalMessageStateContract";
+    public static final String ID = "net.corda.samples.supplychain.contracts.InternalMessageStateContract";
 
     // 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.

…tracts/InternalMessageStateContract.java …tracts/InternalMessageStateContract.javaAccounts/supplychain/contracts/src/main/java/com/supplychain/contracts/InternalMessageStateContract.java renamed to Accounts/supplychain/contracts/src/main/java/net/corda/samples/supplychain/contracts/InternalMessageStateContract.java Accounts/supplychain/contracts/src/main/java/com/supplychain/contracts/InternalMessageStateContract.java renamed to Accounts/supplychain/contracts/src/main/java/net/corda/samples/supplychain/contracts/InternalMessageStateContract.java

@@ -0,0 +1,56 @@
+package net.corda.samples.supplychain.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 net.corda.samples.supplychain.states.InvoiceState;
+
+import java.util.List;
+
+import static net.corda.core.contracts.ContractsDSL.requireSingleCommand;
+import static net.corda.core.contracts.ContractsDSL.requireThat;
+
+// ************
+// * Contract *
+// ************
+public class InvoiceStateContract implements Contract {
+    // This is used to identify our contract when building a transaction.
+    public static final String ID = "net.corda.samples.supplychain.contracts.InvoiceStateContract";
+
+    // 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) throws IllegalArgumentException {
+        /*
+         * We can use the requireSingleCommand function to extract command data from transaction.
+         * However, it is possible to have multiple commands in a signle transaction.
+         */
+        final CommandWithParties<InvoiceStateContract.Commands> command = requireSingleCommand(tx.getCommands(), InvoiceStateContract.Commands.class);
+
+        List<ContractState> inputs = tx.getInputStates();
+        List<ContractState> outputs = tx.getOutputStates();
+
+        if (command.getValue() instanceof InvoiceStateContract.Commands.Create) {
+
+            // Using Corda DSL function requireThat to replicate conditions-checks
+            requireThat(require -> {
+                require.using("No inputs should be consumed when creating a new Invoice State.", inputs.isEmpty());
+                require.using("Transaction must have exactly one output.", outputs.size() == 1);
+                InvoiceState output = (InvoiceState) outputs.get(0);
+                require.using("Invoice amount must be a valid number (Greater than zero)", output.getAmount() > 0);
+                return null;
+            });
+
+        } else {
+            throw new IllegalArgumentException("Command not found!");
+        }
+
+    }
+
+    // Used to indicate the transaction's intent.
+    public interface Commands extends CommandData {
+        class Create implements Commands {}
+    }
+}

Accounts/supplychain/contracts/src/main/java/net/corda/samples/supplychain/contracts/InvoiceStateContract.java

@@ -1,4 +1,4 @@
-package com.supplychain.contracts;
+package net.corda.samples.supplychain.contracts;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.Contract;
@@ -9,7 +9,7 @@
 // ************
 public class PaymentStateContract implements Contract {
     // This is used to identify our contract when building a transaction.
-    public static final String ID = "com.supplychain.contracts.PaymentStateContract";
+    public static final String ID = "net.corda.samples.supplychain.contracts.PaymentStateContract";
 
     // 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.

…hain/contracts/PaymentStateContract.java …hain/contracts/PaymentStateContract.javaAccounts/supplychain/contracts/src/main/java/com/supplychain/contracts/PaymentStateContract.java renamed to Accounts/supplychain/contracts/src/main/java/net/corda/samples/supplychain/contracts/PaymentStateContract.java Accounts/supplychain/contracts/src/main/java/com/supplychain/contracts/PaymentStateContract.java renamed to Accounts/supplychain/contracts/src/main/java/net/corda/samples/supplychain/contracts/PaymentStateContract.java

@@ -1,4 +1,4 @@
-package com.supplychain.contracts;
+package net.corda.samples.supplychain.contracts;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.Contract;
@@ -9,7 +9,7 @@
 // ************
 public class ShippingRequestStateContract implements Contract {
     // This is used to identify our contract when building a transaction.
-    public static final String ID = "com.supplychain.contracts.ShippingRequestStateContract";
+    public static final String ID = "net.corda.samples.supplychain.contracts.ShippingRequestStateContract";
 
     // 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.

…tracts/ShippingRequestStateContract.java …tracts/ShippingRequestStateContract.javaAccounts/supplychain/contracts/src/main/java/com/supplychain/contracts/ShippingRequestStateContract.java renamed to Accounts/supplychain/contracts/src/main/java/net/corda/samples/supplychain/contracts/ShippingRequestStateContract.java Accounts/supplychain/contracts/src/main/java/com/supplychain/contracts/ShippingRequestStateContract.java renamed to Accounts/supplychain/contracts/src/main/java/net/corda/samples/supplychain/contracts/ShippingRequestStateContract.java

@@ -1,6 +1,6 @@
-package com.supplychain.states;
+package net.corda.samples.supplychain.states;
 
-import com.supplychain.contracts.CargoStateContract;
+import net.corda.samples.supplychain.contracts.CargoStateContract;
 import net.corda.core.contracts.BelongsToContract;
 import net.corda.core.contracts.ContractState;
 import net.corda.core.identity.AbstractParty;