chore: downgrade kotlin version 1.4 to 1.3

Signed-off-by: Sandeep Nishad <[email protected]>
sandeepnRES · Apr 3, 2024 · 430bde1 · 430bde1
1 parent 49a9c3d
commit 430bde1
Show file tree

Hide file tree

Showing 18 changed files with 320 additions and 27 deletions.
diff --git a/weaver/common/protos-java-kt/build.gradle b/weaver/common/protos-java-kt/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     ext.protobuf_version = "3.11.1"
     ext.grpc_version = "1.29.0" // CURRENT_GRPC_VERSION
     ext.grpc_kotlin_version = "0.1.4" // CURRENT_GRPC_KOTLIN_VERSION
-    ext.kotlin_version = "1.4.32"
+    ext.kotlin_version = "1.3.72"
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -31,8 +31,8 @@ apply plugin: 'kotlin'
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
     kotlinOptions {
-        languageVersion = "1.4"
-        apiVersion = "1.4"
+        languageVersion = "1.3"
+        apiVersion = "1.3"
         jvmTarget = "1.8"
         javaParameters = true   // Useful for reflection.
     }
@@ -60,7 +60,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "io.grpc:grpc-kotlin-stub:$grpc_kotlin_version"
-    compile "com.google.protobuf:protobuf-java:$protobuf_version"
+    implementation "com.google.protobuf:protobuf-java:$protobuf_version"
     implementation "com.google.protobuf:protobuf-java-util:$protobuf_version"
     implementation "io.grpc:grpc-netty-shaded:$grpc_version"
     implementation "io.grpc:grpc-protobuf:$grpc_version"

diff --git a/weaver/core/drivers/corda-driver/build.gradle b/weaver/core/drivers/corda-driver/build.gradle
@@ -123,8 +123,8 @@ dependencies {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
     kotlinOptions {
-        languageVersion = "1.4"
-        apiVersion = "1.4"
+        languageVersion = "1.3"
+        apiVersion = "1.3"
         jvmTarget = "1.8"
         javaParameters = true
     }

diff --git a/weaver/core/drivers/corda-driver/constants.properties b/weaver/core/drivers/corda-driver/constants.properties
@@ -2,7 +2,7 @@ cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
 cordaVersion=4.11.2
 cordaCoreVersion=4.11.2
-kotlinVersion=1.4.32
+kotlinVersion=1.3.72
 junitVersion=4.12
 log4jVersion=2.17.1
 slf4jVersion=1.7.25

diff --git a/weaver/core/drivers/corda-driver/corda-driver.out b/weaver/core/drivers/corda-driver/corda-driver.out
@@ -0,0 +1,4 @@
+SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
+SLF4J: Defaulting to no-operation (NOP) logger implementation
+SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
+Corda driver gRPC server started. Listening on port 9099
diff --git a/weaver/core/drivers/corda-driver/corda2-driver.out b/weaver/core/drivers/corda-driver/corda2-driver.out
@@ -0,0 +1,58 @@
+SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
+SLF4J: Defaulting to no-operation (NOP) logger implementation
+SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
+Corda driver gRPC server started. Listening on port 9098
+Request received with request: policy: "PartyA"
+address: "localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H"
+requesting_relay: "Corda_Relay"
+requesting_network: "Corda_Network"
+certificate: "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQbegAkzWcX6OtUTjSxUFqDzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDQwMzAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8dXDfPWS+bdtEos6Qfdn3JF+4HPK1awT2ZxDTOatbJqjgYkwgYYwHQYDVR0O\nBBYEFHs332oSTBtWVMUUvbUIlvseMMhFMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFPsSlKzW4bnK\nIvXuCXfQ7DNG4PnGMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhANlDCcnECJlBJg2/8DMQHzgdmfmpmDRZUN9PrrFwsG/VAiEA\n22e5ScYUlh1GuzU6gdhD9cApoDYRcJNNkx72hf+yYfc=\n-----END CERTIFICATE-----"
+requestor_signature: "z6+b1Nj9/0J63+G9LIFLB6jVJs8neIB7DvurXO5DD7FR/fk3cFqPX4QSR77ENQOBzPAzQUJZRMDeL1VgA0/fAA=="
+nonce: "b0709b3a-9b07-4a59-b3c9-a99fa40a5f58"
+request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
+requesting_org: "PartyA"
+
+Fetching state from the Corda network.
+
+Sending back Ack: request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
+message: "Received query with request id 06a5e496-a422-4adc-a6e7-8059d7d17ae5"
+
+
+UseHandleExternalRequest Query: policy: "PartyA"
+address: "localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H"
+requesting_relay: "Corda_Relay"
+requesting_network: "Corda_Network"
+certificate: "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQbegAkzWcX6OtUTjSxUFqDzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDQwMzAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8dXDfPWS+bdtEos6Qfdn3JF+4HPK1awT2ZxDTOatbJqjgYkwgYYwHQYDVR0O\nBBYEFHs332oSTBtWVMUUvbUIlvseMMhFMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFPsSlKzW4bnK\nIvXuCXfQ7DNG4PnGMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhANlDCcnECJlBJg2/8DMQHzgdmfmpmDRZUN9PrrFwsG/VAiEA\n22e5ScYUlh1GuzU6gdhD9cApoDYRcJNNkx72hf+yYfc=\n-----END CERTIFICATE-----"
+requestor_signature: "z6+b1Nj9/0J63+G9LIFLB6jVJs8neIB7DvurXO5DD7FR/fk3cFqPX4QSR77ENQOBzPAzQUJZRMDeL1VgA0/fAA=="
+nonce: "b0709b3a-9b07-4a59-b3c9-a99fa40a5f58"
+request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
+requesting_org: "PartyA"
+
+Corda node returned: Right(b=meta {
+  protocol: CORDA
+  timestamp: "Wed Apr 03 11:36:07 GMT 2024"
+  proof_type: "Notarization"
+  serialization_format: "JSON"
+}
+data: "\n\340\a\nXcXr2W+0ybX1JMPqeMjf2j8kV+FLxKA9FVZb0TK1JFfv28e3nfn6hNrSKHmstnc1AfeZJ8E2cTOHWhym9M55+AQ==\022\253\005-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRpFm6AV5iiyqlbYzaSYdKTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDQwMzAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAny/nlO4++cTKtX84FvSMMiIhhCP0FTnfE74ZDB2rD96jgYkwgYYwHQYDVR0O\nBBYEFBMga2ymFN2aODB4qnJpPr7tCUrAMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFP2u0aRPecA0\nu9iPLdjjsED4kakYMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPLUoVyWaGHyPXeNYGcNhlmVWoBuRXDBqiNJhqMNuignAiB+\nyH5XnaSOtZiXc2JezzvYaF8QJ6QzPV5K6dA67VD+VA==\n-----END CERTIFICATE-----\032\006PartyA\"\315\001\nl[SimpleState(key=H, value=1, owner=O=PartyA, L=London, C=GB, linearId=451a242f-20cd-42d1-a6b0-3ff2bf6e4393)]\022]localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H"
+)
+
+Aggregating the notarizedPayloads returned from all Corda nodes.
+
+Sending state back to remote relay: request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
+view {
+  meta {
+    protocol: CORDA
+    timestamp: "Wed Apr 03 11:36:07 GMT 2024"
+    proof_type: "Notarization"
+    serialization_format: "JSON"
+  }
+  data: "\n\340\a\nXcXr2W+0ybX1JMPqeMjf2j8kV+FLxKA9FVZb0TK1JFfv28e3nfn6hNrSKHmstnc1AfeZJ8E2cTOHWhym9M55+AQ==\022\253\005-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRpFm6AV5iiyqlbYzaSYdKTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDQwMzAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAny/nlO4++cTKtX84FvSMMiIhhCP0FTnfE74ZDB2rD96jgYkwgYYwHQYDVR0O\nBBYEFBMga2ymFN2aODB4qnJpPr7tCUrAMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFP2u0aRPecA0\nu9iPLdjjsED4kakYMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPLUoVyWaGHyPXeNYGcNhlmVWoBuRXDBqiNJhqMNuignAiB+\nyH5XnaSOtZiXc2JezzvYaF8QJ6QzPV5K6dA67VD+VA==\n-----END CERTIFICATE-----\032\006PartyA\"\315\001\nl[SimpleState(key=H, value=1, owner=O=PartyA, L=London, C=GB, linearId=451a242f-20cd-42d1-a6b0-3ff2bf6e4393)]\022]localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H"
+}
+
+
+Sending state back to the relay for request 06a5e496-a422-4adc-a6e7-8059d7d17ae5
+Received from SendDriverState: request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
+
+Response back from relay from sendDriverState request: request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
+
diff --git a/weaver/core/network/corda-interop-app/build.gradle b/weaver/core/network/corda-interop-app/build.gradle
@@ -84,8 +84,8 @@ allprojects {
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
         kotlinOptions {
-            languageVersion = "1.4"
-            apiVersion = "1.4"
+            languageVersion = "1.3"
+            apiVersion = "1.3"
             jvmTarget = "1.8"
             javaParameters = true   // Useful for reflection.
         }

diff --git a/weaver/core/network/corda-interop-app/constants.properties b/weaver/core/network/corda-interop-app/constants.properties
@@ -3,10 +3,10 @@ cordaCoreReleaseGroup=net.corda
 cordaVersion=4.11.2
 cordaCoreVersion=4.11.2
 gradlePluginsVersion=5.1.1
-kotlinVersion=1.4.32
+kotlinVersion=1.3.72
 junitVersion=4.12
 log4jVersion=2.17.1
-platformVersion=10
+platformVersion=13
 slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
 arrowVersion=0.10.4

diff --git a/weaver/core/network/corda-interop-app/interop-workflows/build.gradle b/weaver/core/network/corda-interop-app/interop-workflows/build.gradle
@@ -1,4 +1,5 @@
 buildscript {
+    ext.protobuf_version = "3.11.1"
     repositories {
         mavenCentral()
     }
@@ -59,17 +60,20 @@ configurations {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation 'com.google.code.gson:gson:2.9.1'
 
     testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testCompile "junit:junit:$junit_version"
     testCompile project(":test-cordapp")
 
-    compile "io.arrow-kt:arrow-core:$arrow_version"
-    compile "io.arrow-kt:arrow-fx:$arrow_version"
-    compile "io.arrow-kt:arrow-syntax:$arrow_version"
+    implementation "io.arrow-kt:arrow-core:$arrow_version"
+    implementation "io.arrow-kt:arrow-fx:$arrow_version"
+    implementation "io.arrow-kt:arrow-syntax:$arrow_version"
+
+    compile "com.google.protobuf:protobuf-java:$protobuf_version"
+    compile "com.google.protobuf:protobuf-java-util:$protobuf_version"
 
     // weaver-protos
     implementation "org.hyperledger.cacti.weaver.protos:protos-java-kt:$cacti_version"
@@ -111,4 +115,4 @@ publishing {
 
 test {
     maxHeapSize = "4096m"
-}
+}
diff --git a/...lows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/ViewVerification.kt b/...lows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/ViewVerification.kt
@@ -117,16 +117,20 @@ fun verifyCordaNotarization(viewData: ByteString, verificationPolicyCriteria: Li
     println("Corda view data: $cordaViewData")
 
     var interopPayload = cordaViewData.notarizedPayloadsList[0].payload
+    var signersMut = mutableListOf<String>()
 
     // 2. Map over the list of notarizations and verify the signature, creating a list of Either Error Boolean
     val eitherErrorCordaViewData = cordaViewData.notarizedPayloadsList.map { notarizedPayload ->
         getCertificateFromString(notarizedPayload.certificate).flatMap { x509Cert ->
             // 3. Check the certificates are valid according to the [Membership].
+            println("Verify membership of signer")
             verifyMemberInSecurityDomain(x509Cert, securityDomain, notarizedPayload.id, serviceHub).flatMap {
+                println("Verify signature")
                 verifyNodeSignature(notarizedPayload.certificate, notarizedPayload.signature, notarizedPayload.payload.toByteArray()).flatMap {
                     if (interopPayload != notarizedPayload.payload) {
                         Left(Error("InteropPayload doesn't match across responses from different nodes"))
                     }
+                    signersMut.add(notarizedPayload.id)
                     Right(true)
                 }
             }
@@ -139,7 +143,8 @@ fun verifyCordaNotarization(viewData: ByteString, verificationPolicyCriteria: Li
             .map { viewData }
 
     // Get the signers from the list of notarizedPayloads
-    val signers = cordaViewData.notarizedPayloadsList.map { it.id }
+    // val signers = cordaViewData.notarizedPayloadsList.map { it.id }
+    val signers = signersMut.toList()
 
     // 4. Check that every party listed in the verification policy is a signatory
     eitherErrorCordaViewData.flatMap { _ ->

diff --git a/...c/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt b/...c/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt
@@ -136,7 +136,9 @@ constructor(
                     println("Error in resolving user flow: ${it.message}")
                     Left(Error("Error in resolving user flow: ${it.message}"))
                 }, {
-                    Right(subFlow(it))
+                    val userFlowResult = subFlow(it)
+                    println("\nuserFlowResult: $userFlowResult")
+                    Right(userFlowResult)
                 })
             }
         } catch (e: Exception) {