From fb5de99db31d7247fb9cffd4af46deb9047e405f Mon Sep 17 00:00:00 2001 From: gldeng Date: Sat, 26 Jun 2021 12:03:25 +0800 Subject: [PATCH 1/3] Add logging --- .../src/main/java/net/corda/samples/pingpong/flows/Ping.java | 2 ++ .../src/main/java/net/corda/samples/pingpong/flows/Pong.java | 2 ++ 2 files changed, 4 insertions(+) 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; } From 61dc87c9a00381958f9d3eeb2c3257db330cbfa6 Mon Sep 17 00:00:00 2001 From: gldeng Date: Sat, 26 Jun 2021 12:04:00 +0800 Subject: [PATCH 2/3] Use 4.8 --- Basic/constants.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 02c09148370afbd6fe77b3c1fb9b1f4beb4b5365 Mon Sep 17 00:00:00 2001 From: gldeng Date: Sat, 26 Jun 2021 12:05:09 +0800 Subject: [PATCH 3/3] Add signing of jars --- Basic/ping-pong/README.md | 7 +++++++ Basic/ping-pong/jar-sign-keystore.jks | Bin 0 -> 2211 bytes Basic/ping-pong/jar-sign-keystore.pkcs12 | Bin 0 -> 2599 bytes Basic/ping-pong/workflows/build.gradle | 14 +++++++++++++- 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Basic/ping-pong/jar-sign-keystore.jks create mode 100644 Basic/ping-pong/jar-sign-keystore.pkcs12 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 0000000000000000000000000000000000000000..bd0ba4697959b92058eb9dbe44008993e06b85a2 GIT binary patch literal 2211 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 literal 0 HcmV?d00001 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 {