diff --git a/Basic/constants.properties b/Basic/constants.properties index 2cd5a28c..84884e51 100644 --- a/Basic/constants.properties +++ b/Basic/constants.properties @@ -1,7 +1,7 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.6 -cordaCoreVersion=4.6 +cordaVersion=4.8 +cordaCoreVersion=4.8 gradlePluginsVersion=5.0.12 kotlinVersion=1.2.71 junitVersion=4.12 diff --git a/Basic/ping-pong/README.md b/Basic/ping-pong/README.md index e61f1985..999eded2 100644 --- a/Basic/ping-pong/README.md +++ b/Basic/ping-pong/README.md @@ -108,3 +108,10 @@ You should see the following message, indicating that PartyB responded to your p `Successfully pinged O=PartyB,L=New York,C=US.`. +### Appendix - Signing jar +Refer to: [https://training.corda.net/operations/package-jar/](https://training.corda.net/operations/package-jar/) +Generate key +``` +keytool -keystore jar-sign-keystore.jks -keyalg RSA -genkey -dname "OU=Corda Network, O=Corda Consortium, L=New York, C=US" -storepass password -keypass password -alias awesome-cordapp-signer -validity 3650 +keytool -importkeystore -srckeystore jar-sign-keystore.jks -destkeystore jar-sign-keystore.pkcs12 -deststoretype pkcs12 +``` \ No newline at end of file diff --git a/Basic/ping-pong/jar-sign-keystore.jks b/Basic/ping-pong/jar-sign-keystore.jks new file mode 100644 index 00000000..bd0ba469 Binary files /dev/null and b/Basic/ping-pong/jar-sign-keystore.jks differ diff --git a/Basic/ping-pong/jar-sign-keystore.pkcs12 b/Basic/ping-pong/jar-sign-keystore.pkcs12 new file mode 100644 index 00000000..77cf0972 Binary files /dev/null and b/Basic/ping-pong/jar-sign-keystore.pkcs12 differ diff --git a/Basic/ping-pong/workflows/build.gradle b/Basic/ping-pong/workflows/build.gradle index a555eff6..d931b3e7 100644 --- a/Basic/ping-pong/workflows/build.gradle +++ b/Basic/ping-pong/workflows/build.gradle @@ -1,15 +1,27 @@ apply plugin: 'net.corda.plugins.cordapp' apply plugin: 'net.corda.plugins.quasar-utils' +def keystoreFile = new File('../jar-sign-keystore.pkcs12') + cordapp { targetPlatformVersion corda_platform_version minimumPlatformVersion corda_platform_version workflow { - name "Pingpng Flows" + name "Pingpong Flows" vendor "Corda Open Source" licence "Apache License, Version 2.0" versionId 1 } + signing { + enabled true + options { + keystore keystoreFile.absolutePath + alias "awesome-cordapp-signer" + storepass "password" + keypass "password" + storetype "PKCS12" + } + } } sourceSets { diff --git a/Basic/ping-pong/workflows/src/main/java/net/corda/samples/pingpong/flows/Ping.java b/Basic/ping-pong/workflows/src/main/java/net/corda/samples/pingpong/flows/Ping.java index b70ef4ed..774b3f6f 100644 --- a/Basic/ping-pong/workflows/src/main/java/net/corda/samples/pingpong/flows/Ping.java +++ b/Basic/ping-pong/workflows/src/main/java/net/corda/samples/pingpong/flows/Ping.java @@ -19,8 +19,10 @@ public Ping(Party counterparty) { @Override public Void call() throws FlowException { final FlowSession counterpartySession = initiateFlow(counterparty); + getLogger().info("Pinging "+counterparty); final UntrustworthyData counterpartyData = counterpartySession.sendAndReceive(String.class, "ping"); counterpartyData.unwrap( msg -> { + getLogger().info("Received "+msg+" from "+counterpartySession.getCounterparty().getName()); assert(msg.equals("pong")); return true; }); diff --git a/Basic/ping-pong/workflows/src/main/java/net/corda/samples/pingpong/flows/Pong.java b/Basic/ping-pong/workflows/src/main/java/net/corda/samples/pingpong/flows/Pong.java index 972b149e..687df621 100644 --- a/Basic/ping-pong/workflows/src/main/java/net/corda/samples/pingpong/flows/Pong.java +++ b/Basic/ping-pong/workflows/src/main/java/net/corda/samples/pingpong/flows/Pong.java @@ -22,9 +22,11 @@ public Pong(FlowSession counterpartySession) { public Void call() throws FlowException { UntrustworthyData counterpartyData = counterpartySession.receive(String.class); counterpartyData.unwrap(msg -> { + getLogger().info("Received "+msg + " from "+counterpartySession.getCounterparty().getName()); assert (msg.equals("ping")); return true; }); + getLogger().info("Ponging "+counterpartySession.getCounterparty().getName()); counterpartySession.send("pong"); return null; }