Merge pull request #26 from corda/2020Q4CodeCleanUp

2020 Q4 code clean up

Author: peterli-r3

.gitignore

@@ -7,6 +7,7 @@
 */.idea/*
 **/.vscode/*
 **/out/
+&&/node_modules/
 **/logs/
 corda-nodeinfo/corda-nodeinfo.iml
 *~*

Accounts/README.md

@@ -1,14 +1,18 @@
-## samples-kotlin/Accounts
+## Accounts CorDapp Samples 
 
-This folder features Corda Accounts sample projects.
+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.
 
-### [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.  
+This CorDapp mimics a supply chain transaction, where the deal is incorporated among different teams in the companies on both side of the trade.  
+<p align="center">
+  <img src="./supplychain/Business%20Flow.png" alt="Corda" width="700">
+</p>
 
+### [Tic Tac Thor](./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/). 
+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/build.gradle

@@ -13,9 +13,7 @@ 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'
+
         //account
         accounts_release_group = 'com.r3.corda.lib.accounts'
         accounts_release_version = '1.0'
@@ -28,18 +26,15 @@ buildscript {
         mavenLocal()
         mavenCentral()
         jcenter()
-        maven { url 'https://software.r3.com/artifactory/corda-lib' }
-        maven { url 'https://software.r3.com/artifactory/corda' }
-        // 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://software.r3.com/artifactory/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"
     }
 }
 
@@ -51,11 +46,11 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url 'https://software.r3.com/artifactory/corda' }
-        // 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://jitpack.io' }
-        maven { url "https://repo.gradle.org/gradle/libs-releases-local" }
+        //SDK lib
+        maven { url 'https://software.r3.com/artifactory/corda-lib' }
+        //Gradle Plugins
+        maven { url 'https://repo.gradle.org/gradle/libs-releases' }
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
@@ -109,11 +104,6 @@ dependencies {
     cordapp "$confidential_id_release_group:ci-workflows:$confidential_id_release_version"
     cordapp "$accounts_release_group:accounts-contracts:$accounts_release_version"
     cordapp "$accounts_release_group:accounts-workflows:$accounts_release_version"
-    
-    
-    
-    
-    
 }
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
@@ -127,7 +117,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
 
         cordapp project(":contracts")
         cordapp project(":workflows")
-	runSchemaMigration = true
+	    runSchemaMigration = true
     }
     node {
         name "O=Notary,L=London,C=GB"

Accounts/supplychain/contracts/build.gradle

@@ -5,7 +5,7 @@ cordapp {
     targetPlatformVersion 4
     minimumPlatformVersion 4
     contract {
-        name "accounts_SupplyChain Contract"
+        name "supplychain Contract"
         vendor "Corda Open Source"
         licence "A liberal, open source licence"
         versionId 1

Accounts/supplychain/contracts/src/main/kotlin/com/accounts_SupplyChain/contracts/InvoiceStateContract.kt

@@ -1,12 +1,12 @@
-package com.accounts_SupplyChain.contracts
+package net.corda.samples.supplychain.contracts
 
 import net.corda.core.contracts.*
 import net.corda.core.transactions.LedgerTransaction
 
 class CargoStateContract : Contract{
 
     companion object{
-        const val ID = "com.accounts_SupplyChain.contracts.CargoStateContract"
+        const val ID = "net.corda.samples.supplychain.contracts.CargoStateContract"
     }
 
 
@@ -21,6 +21,6 @@ class CargoStateContract : Contract{
     }
 
     interface Commands : CommandData {
-        class Create : Commands
+        class Create : CargoStateContract.Commands
     }
 }

Accounts/supplychain/contracts/src/main/kotlin/com/accounts_SupplyChain/contracts/CargoStateContract.kt renamed to Accounts/supplychain/contracts/src/main/kotlin/net/corda/samples/supplychain/contracts/CargoStateContract.kt

@@ -1,12 +1,12 @@
-package com.accounts_SupplyChain.contracts
+package net.corda.samples.supplychain.contracts
 
 import net.corda.core.contracts.*
 import net.corda.core.transactions.LedgerTransaction
 
 class InternalMessageStateContract : Contract{
 
     companion object{
-        const val ID = "com.accounts_SupplyChain.contracts.InternalMessageStateContract"
+        const val ID = "net.corda.samples.supplychain.contracts.InternalMessageStateContract"
     }
 
 

Accounts/supplychain/contracts/src/main/kotlin/com/accounts_SupplyChain/contracts/InternalMessageStateContract.kt renamed to Accounts/supplychain/contracts/src/main/kotlin/net/corda/samples/supplychain/contracts/InternalMessageStateContract.kt

@@ -0,0 +1,39 @@
+package net.corda.samples.supplychain.contracts
+
+
+import net.corda.core.contracts.*
+import net.corda.core.transactions.LedgerTransaction
+import net.corda.samples.supplychain.states.InvoiceState
+
+class InvoiceStateContract : Contract{
+
+    companion object{
+        const val ID = "net.corda.samples.supplychain.contracts.InvoiceStateContract"
+    }
+
+    override fun verify(tx: LedgerTransaction) { /*
+         * We can use the requireSingleCommand function to extract command data from transaction.
+         * However, it is possible to have multiple commands in a signle transaction.
+         */
+        val command = tx.commands.requireSingleCommand<Commands>()
+        when (command.value) {
+            is Commands.Create -> requireThat {
+                val inputs = tx.inputStates
+                val outputs = tx.outputStates
+
+                // no inputs to the transaction
+                "No inputs should be consumed when creating a new SantaSession.".using(inputs.isEmpty())
+                "Transaction must have exactly one output.".using(outputs.size == 1)
+
+                val output = outputs[0] as InvoiceState
+                // must be three or more players
+                "Invoice amount must be a valid number (Greater than zero)".using(output.amount > 0)
+                null
+            }
+        }
+    }
+
+    interface Commands : CommandData {
+        class Create : Commands
+    }
+}

Accounts/supplychain/contracts/src/main/kotlin/net/corda/samples/supplychain/contracts/InvoiceStateContract.kt

@@ -1,12 +1,12 @@
-package com.accounts_SupplyChain.contracts
+package net.corda.samples.supplychain.contracts
 
 import net.corda.core.contracts.*
 import net.corda.core.transactions.LedgerTransaction
 
 class PaymentStateContract : Contract{
 
     companion object{
-        const val ID = "com.accounts_SupplyChain.contracts.PaymentStateContract"
+        const val ID = "net.corda.samples.supplychain.contracts.PaymentStateContract"
     }
 
 

Accounts/supplychain/contracts/src/main/kotlin/com/accounts_SupplyChain/contracts/PaymentStateContract.kt renamed to Accounts/supplychain/contracts/src/main/kotlin/net/corda/samples/supplychain/contracts/PaymentStateContract.kt

@@ -1,12 +1,12 @@
-package com.accounts_SupplyChain.contracts
+package net.corda.samples.supplychain.contracts
 
 import net.corda.core.contracts.*
 import net.corda.core.transactions.LedgerTransaction
 
 class ShippingRequestStateContract : Contract {
 
     companion object {
-        const val ID = "com.accounts_SupplyChain.contracts.ShippingRequestStateContract"
+        const val ID = "net.corda.samples.supplychain.contracts.ShippingRequestStateContract"
     }