diff --git a/weaver/common/protos-java-kt/build.gradle b/weaver/common/protos-java-kt/build.gradle index 6ff9a3a559..5dade6e296 100644 --- 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" @@ -15,7 +15,7 @@ buildscript { plugins { id "maven-publish" id 'java' - id 'com.google.protobuf' version '0.8.12' + id 'com.google.protobuf' version '0.9.4' id 'idea' } @@ -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/common/protos-java-kt/gradle/wrapper/gradle-wrapper.jar b/weaver/common/protos-java-kt/gradle/wrapper/gradle-wrapper.jar index 249e5832f0..943f0cbfa7 100644 Binary files a/weaver/common/protos-java-kt/gradle/wrapper/gradle-wrapper.jar and b/weaver/common/protos-java-kt/gradle/wrapper/gradle-wrapper.jar differ diff --git a/weaver/common/protos-java-kt/gradle/wrapper/gradle-wrapper.properties b/weaver/common/protos-java-kt/gradle/wrapper/gradle-wrapper.properties index 2ec77e51a9..e8be595e3c 100644 --- a/weaver/common/protos-java-kt/gradle/wrapper/gradle-wrapper.properties +++ b/weaver/common/protos-java-kt/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/weaver/common/protos-java-kt/gradlew b/weaver/common/protos-java-kt/gradlew index a69d9cb6c2..65dcd68d65 100755 --- a/weaver/common/protos-java-kt/gradlew +++ b/weaver/common/protos-java-kt/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/weaver/common/protos-java-kt/gradlew.bat b/weaver/common/protos-java-kt/gradlew.bat index f127cfd49d..93e3f59f13 100755 --- a/weaver/common/protos-java-kt/gradlew.bat +++ b/weaver/common/protos-java-kt/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/weaver/core/drivers/corda-driver/build.gradle b/weaver/core/drivers/corda-driver/build.gradle index c018789e6b..2ba907694d 100644 --- a/weaver/core/drivers/corda-driver/build.gradle +++ b/weaver/core/drivers/corda-driver/build.gradle @@ -5,7 +5,6 @@ buildscript { ext { kotlin_version = constants.getProperty("kotlinVersion") coroutines_version = constants.getProperty("coroutinesVersion") - protobuf_version = constants.getProperty("protobufVersion") bcprov_version = constants.getProperty("bcprovVersion") grpc_version = constants.getProperty("grpcVersion") // CURRENT_GRPC_VERSION grpc_kotlin_version = constants.getProperty("grpcKotlinVersion") // CURRENT_GRPC_KOTLIN_VERSION @@ -20,8 +19,6 @@ buildscript { repositories { mavenCentral() maven { url 'https://download.corda.net/maven/corda-dependencies' } - maven { url 'https://download.corda.net/maven/corda-releases' } - maven { url 'https://download.corda.net/maven/corda-lib' } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -31,7 +28,6 @@ buildscript { plugins { id "idea" id "application" - id "com.google.protobuf" version "0.8.12" id 'org.jetbrains.dokka' version '0.10.1' id 'maven-publish' } @@ -117,12 +113,9 @@ dependencies { implementation(group: 'org.hyperledger.cacti.weaver.sdk.corda', name: 'weaver-sdk-corda', version: "$cacti_version") implementation(group: 'org.hyperledger.cacti.weaver.protos', name: 'protos-java-kt', version: "$cacti_version") - // gRPC and protobuf dependencies + // gRPC dependencies implementation "io.grpc:grpc-kotlin-stub:$grpc_kotlin_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" implementation "io.grpc:grpc-stub:$grpc_version" testImplementation("org.junit.jupiter:junit-jupiter:5.6.2") diff --git a/weaver/core/drivers/corda-driver/constants.properties b/weaver/core/drivers/corda-driver/constants.properties index c8a5ba74b8..5f1d351254 100644 --- a/weaver/core/drivers/corda-driver/constants.properties +++ b/weaver/core/drivers/corda-driver/constants.properties @@ -1,16 +1,14 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.8.11 -cordaCoreVersion=4.8.11 -gradlePluginsVersion=5.0.17 -kotlinVersion=1.4.32 +cordaVersion=4.11.2 +cordaCoreVersion=4.11.2 +kotlinVersion=1.3.72 junitVersion=4.12 log4jVersion=2.17.1 slf4jVersion=1.7.25 arrowVersion=0.10.4 grpcVersion=1.28.1 grpcKotlinVersion=0.1.3 -protobufVersion=3.11.1 coroutinesVersion=1.3.3 bcprovVersion=1.53 cactiVersion=2.0.0-alpha.2 diff --git a/weaver/core/drivers/corda-driver/corda-driver.out b/weaver/core/drivers/corda-driver/corda-driver.out new file mode 100644 index 0000000000..8579c404fa --- /dev/null +++ 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 new file mode 100644 index 0000000000..8b67354e39 --- /dev/null +++ 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/drivers/corda-driver/gradle/wrapper/gradle-wrapper.jar b/weaver/core/drivers/corda-driver/gradle/wrapper/gradle-wrapper.jar index 249e5832f0..943f0cbfa7 100644 Binary files a/weaver/core/drivers/corda-driver/gradle/wrapper/gradle-wrapper.jar and b/weaver/core/drivers/corda-driver/gradle/wrapper/gradle-wrapper.jar differ diff --git a/weaver/core/drivers/corda-driver/gradle/wrapper/gradle-wrapper.properties b/weaver/core/drivers/corda-driver/gradle/wrapper/gradle-wrapper.properties index 2ec77e51a9..e8be595e3c 100644 --- a/weaver/core/drivers/corda-driver/gradle/wrapper/gradle-wrapper.properties +++ b/weaver/core/drivers/corda-driver/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/weaver/core/drivers/corda-driver/gradlew b/weaver/core/drivers/corda-driver/gradlew index a69d9cb6c2..65dcd68d65 100755 --- a/weaver/core/drivers/corda-driver/gradlew +++ b/weaver/core/drivers/corda-driver/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/weaver/core/drivers/corda-driver/gradlew.bat b/weaver/core/drivers/corda-driver/gradlew.bat index f127cfd49d..93e3f59f13 100644 --- a/weaver/core/drivers/corda-driver/gradlew.bat +++ b/weaver/core/drivers/corda-driver/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/weaver/core/drivers/corda-driver/jre8.Dockerfile b/weaver/core/drivers/corda-driver/jre8.Dockerfile new file mode 100644 index 0000000000..61dae389d8 --- /dev/null +++ b/weaver/core/drivers/corda-driver/jre8.Dockerfile @@ -0,0 +1,15 @@ +FROM debian:12 + +CMD ["bash"] +RUN /bin/sh -c set -eux; apt-get update; apt-get install -y --no-install-recommends ca-certificates curl netbase wget ; rm -rf /var/lib/apt/lists/* +RUN /bin/sh -c set -ex; if ! command -v gpg > /dev/null; then apt-get update; apt-get install -y --no-install-recommends gnupg dirmngr ; rm -rf /var/lib/apt/lists/*; fi +RUN /bin/sh -c set -eux; apt-get update; apt-get install -y --no-install-recommends bzip2 unzip xz-utils fontconfig libfreetype6 ca-certificates p11-kit ; rm -rf /var/lib/apt/lists/* + +ENV JAVA_HOME=/usr/local/openjdk-8 +RUN /bin/sh -c { echo '#/bin/sh'; echo 'echo "$JAVA_HOME"'; } > /usr/local/bin/docker-java-home && chmod +x /usr/local/bin/docker-java-home && [ "$JAVA_HOME" = "$(docker-java-home)" ] # backwards compatibility +ENV PATH=/usr/local/openjdk-8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV LANG=C.UTF-8 +ENV JAVA_VERSION=8u402 + +RUN /bin/sh -c set -eux; arch="$(dpkg --print-architecture)"; case "$arch" in 'amd64') downloadUrl='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jre_x64_linux_hotspot_8u402b06.tar.gz'; ;; 'arm64') downloadUrl='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u402b06.tar.gz'; ;; *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; esac; wget --progress=dot:giga -O openjdk.tgz "$downloadUrl"; wget --progress=dot:giga -O openjdk.tgz.asc "$downloadUrl.sign"; export GNUPGHOME="$(mktemp -d)"; gpg --batch --keyserver keyserver.ubuntu.com --recv-keys EAC843EBD3EFDB98CC772FADA5CD6035332FA671; gpg --batch --keyserver keyserver.ubuntu.com --keyserver-options no-self-sigs-only --recv-keys CA5F11C6CE22644D42C6AC4492EF8D39DC13168F; gpg --batch --list-sigs --keyid-format 0xLONG CA5F11C6CE22644D42C6AC4492EF8D39DC13168F | tee /dev/stderr | grep '0xA5CD6035332FA671' | grep 'Andrew Haley'; gpg --batch --verify openjdk.tgz.asc openjdk.tgz; gpgconf --kill all; rm -rf "$GNUPGHOME"; mkdir -p "$JAVA_HOME"; tar --extract --file openjdk.tgz --directory "$JAVA_HOME" --strip-components 1 --no-same-owner ; rm openjdk.tgz*; { echo '#!/usr/bin/env bash'; echo 'set -Eeuo pipefail'; echo 'trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$JAVA_HOME/lib/security/cacerts"'; } > /etc/ca-certificates/update.d/docker-openjdk; chmod +x /etc/ca-certificates/update.d/docker-openjdk; /etc/ca-certificates/update.d/docker-openjdk; find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; ldconfig; java -version + diff --git a/weaver/core/network/corda-interop-app/build.gradle b/weaver/core/network/corda-interop-app/build.gradle index 69c4b08304..80b111a59c 100644 --- a/weaver/core/network/corda-interop-app/build.gradle +++ b/weaver/core/network/corda-interop-app/build.gradle @@ -115,27 +115,23 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" // Corda dependencies. - cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version" - cordaRuntime "$corda_release_group:corda-node-api:$corda_release_version" - cordaRuntime "$corda_release_group:corda:$corda_release_version" + cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version" + cordaRuntimeOnly "$corda_release_group:corda-node-api:$corda_release_version" + cordaRuntimeOnly "$corda_release_group:corda:$corda_release_version" // CorDapp dependencies. cordapp project(":interop-workflows") cordapp project(":interop-contracts") // Logging dependencies. - cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" - cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" - cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" + cordaProvided "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" + cordaProvided "org.apache.logging.log4j:log4j-web:${log4j_version}" + cordaProvided "org.slf4j:jul-to-slf4j:$slf4j_version" } cordapp { - info { - name "CorDapp Template" - vendor "Corda Open Source" - targetPlatformVersion corda_platform_version - minimumPlatformVersion corda_platform_version - } + targetPlatformVersion corda_platform_version + minimumPlatformVersion corda_platform_version } task installQuasar(type: Copy) { diff --git a/weaver/core/network/corda-interop-app/constants.properties b/weaver/core/network/corda-interop-app/constants.properties index bacb9b5dc5..b0922dc09e 100644 --- a/weaver/core/network/corda-interop-app/constants.properties +++ b/weaver/core/network/corda-interop-app/constants.properties @@ -1,12 +1,12 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.8.11 -cordaCoreVersion=4.8.11 -gradlePluginsVersion=5.0.17 -kotlinVersion=1.4.32 +cordaVersion=4.11.2 +cordaCoreVersion=4.11.2 +gradlePluginsVersion=5.1.1 +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/gradle/wrapper/gradle-wrapper.jar b/weaver/core/network/corda-interop-app/gradle/wrapper/gradle-wrapper.jar index 249e5832f0..943f0cbfa7 100644 Binary files a/weaver/core/network/corda-interop-app/gradle/wrapper/gradle-wrapper.jar and b/weaver/core/network/corda-interop-app/gradle/wrapper/gradle-wrapper.jar differ diff --git a/weaver/core/network/corda-interop-app/gradle/wrapper/gradle-wrapper.properties b/weaver/core/network/corda-interop-app/gradle/wrapper/gradle-wrapper.properties index 2ec77e51a9..e8be595e3c 100644 --- a/weaver/core/network/corda-interop-app/gradle/wrapper/gradle-wrapper.properties +++ b/weaver/core/network/corda-interop-app/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/weaver/core/network/corda-interop-app/gradlew b/weaver/core/network/corda-interop-app/gradlew index a69d9cb6c2..65dcd68d65 100755 --- a/weaver/core/network/corda-interop-app/gradlew +++ b/weaver/core/network/corda-interop-app/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/weaver/core/network/corda-interop-app/gradlew.bat b/weaver/core/network/corda-interop-app/gradlew.bat index f127cfd49d..93e3f59f13 100644 --- a/weaver/core/network/corda-interop-app/gradlew.bat +++ b/weaver/core/network/corda-interop-app/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/weaver/core/network/corda-interop-app/interop-contracts/build.gradle b/weaver/core/network/corda-interop-app/interop-contracts/build.gradle index ab4292da88..c17d16b0d8 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/build.gradle +++ b/weaver/core/network/corda-interop-app/interop-contracts/build.gradle @@ -1,10 +1,6 @@ -buildscript { - ext.protobuf_version = "3.11.1" -} - plugins { - id "maven-publish" id "java" + id "maven-publish" id "idea" } @@ -40,15 +36,12 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" // Corda dependencies. - cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version" + cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version" testCompile "$corda_release_group:corda-node-driver:$corda_release_version" // weaver-protos implementation "org.hyperledger.cacti.weaver.protos:protos-java-kt:$cacti_version" - - compile "com.google.protobuf:protobuf-java:$protobuf_version" - compile "com.google.protobuf:protobuf-java-util:$protobuf_version" } publishing { @@ -57,7 +50,7 @@ publishing { groupId = project.properties['group'] artifactId = 'interop-contracts' version = project.properties['version'] - from components.java + from components.cordapp } } repositories { diff --git a/weaver/core/network/corda-interop-app/interop-workflows/build.gradle b/weaver/core/network/corda-interop-app/interop-workflows/build.gradle index 4e219f0925..de8d784164 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/build.gradle +++ b/weaver/core/network/corda-interop-app/interop-workflows/build.gradle @@ -1,6 +1,5 @@ buildscript { ext.protobuf_version = "3.11.1" - repositories { mavenCentral() } @@ -61,27 +60,27 @@ 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" - - compile "com.google.protobuf:protobuf-java:$protobuf_version" - compile "com.google.protobuf:protobuf-java-util:$protobuf_version" // Corda dependencies. - cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version" - cordaRuntime "$corda_release_group:corda:$corda_release_version" + cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version" + cordaRuntimeOnly "$corda_release_group:corda:$corda_release_version" testCompile "$corda_release_group:corda-node-driver:$corda_release_version" @@ -100,7 +99,7 @@ publishing { groupId = project.properties['group'] artifactId = 'interop-workflows' version = project.properties['version'] - from components.java + from components.cordapp } } repositories { @@ -116,4 +115,4 @@ publishing { test { maxHeapSize = "4096m" -} \ No newline at end of file +} diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/ViewVerification.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/ViewVerification.kt index e259166b6d..d73dfa1aeb 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/ViewVerification.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/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() // 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/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt index e4bae5e1c4..cea1ab905c 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/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) { diff --git a/weaver/core/network/corda-interop-app/test-cordapp/build.gradle b/weaver/core/network/corda-interop-app/test-cordapp/build.gradle index f5cc83fc9f..5bb6491e9d 100644 --- a/weaver/core/network/corda-interop-app/test-cordapp/build.gradle +++ b/weaver/core/network/corda-interop-app/test-cordapp/build.gradle @@ -42,8 +42,8 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" // Corda dependencies. - cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version" - cordaRuntime "$corda_release_group:corda:$corda_release_version" + cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version" + cordaRuntimeOnly "$corda_release_group:corda:$corda_release_version" testCompile "$corda_release_group:corda-node-driver:$corda_release_version" } diff --git a/weaver/core/relay/relay-corda.out b/weaver/core/relay/relay-corda.out new file mode 100644 index 0000000000..dd3acfba6e --- /dev/null +++ b/weaver/core/relay/relay-corda.out @@ -0,0 +1,130 @@ +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/data_transfer_service.rs:266:31 + | +266 | let status = ack::Status::from_i32(ack.status) + | ^^^^^^^^ + | + = note: `#[warn(deprecated)]` on by default + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/event_subscribe_service.rs:232:31 + | +232 | let status = ack::Status::from_i32(ack.status) + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/event_publish_service.rs:356:51 + | +356 | let status = ack::Status::from_i32(ack.status) + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::events::event_subscription_state::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/network_service.rs:272:57 + | +272 | match event_subscription_state::Status::from_i32(fetched_event_sub_state.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/network_service.rs:607:36 + | +607 | match ack::Status::from_i32(ack_response_into_inner.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/network_service.rs:742:36 + | +742 | match ack::Status::from_i32(ack_response_into_inner.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::events::EventSubOperation::from_i32`: Use the TryFrom implementation instead + --> src/services/event_subscribe_service.rs:258:40 + | +258 | let operation = EventSubOperation::from_i32(event_sub.operation) + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/event_subscribe_service.rs:345:40 + | +345 | match ack::Status::from_i32(response_ack.into_inner().status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/event_subscribe_service.rs:383:24 + | +383 | match ack::Status::from_i32(request_ack.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::events::event_subscription_state::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/helpers.rs:50:57 + | +50 | match event_subscription_state::Status::from_i32(fetched_event_sub_state.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::state::request_state::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/helpers.rs:332:47 + | +332 | let state_status = request_state::Status::from_i32(state.clone().status).expect("No Status"); + | ^^^^^^^^ + +warning: `relay` (bin "server") generated 11 warnings + Finished dev [unoptimized + debuginfo] target(s) in 1.51s + Running `target/debug/server` +Relay Name: "Corda_Relay" +RelayServer listening on 127.0.0.1:9081 +Got a NetworkQuery request from Some(127.0.0.1:57734) - Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: NetworkQuery { policy: ["PartyA"], address: "localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H", requesting_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", requesting_org: "PartyA", confidential: false }, extensions: Extensions } +Successfully stored NetworkQuery in db with request_id: 06a5e496-a422-4adc-a6e7-8059d7d17ae5 +Address to be parsed: localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H +Sending Query to remote relay: "localhost":"9082" +Sending Ack back to network: Ack { status: Ok, request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5", message: "" } + +Query: Request { metadata: MetadataMap { headers: {} }, message: 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", confidential: false }, extensions: Extensions } +Received Ack from remote relay: Ok(Response { metadata: MetadataMap { headers: {"content-type": "application/grpc", "date": "Wed, 03 Apr 2024 11:36:01 GMT", "grpc-status": "0"} }, message: Ack { status: Ok, request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5", message: "" }, extensions: Extensions }) + +Successfully written RequestState to database +RequestState { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5", status: Pending, state: None } + + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 1 +Received state from remote relay: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5" +View Meta: Some(Meta { protocol: Corda, timestamp: "Wed Apr 03 11:36:07 GMT 2024", proof_type: "Notarization", serialization_format: "JSON" }), View Data: "CuAHClhjWHIyVysweWJYMUpNUHFlTWpmMmo4a1YrRkx4S0E5RlZaYjBUSzFKRmZ2MjhlM25mbjZoTnJTS0htc3RuYzFBZmVaSjhFMmNUT0hXaHltOU01NStBUT09EqsFLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRUnBGbTZBVjVpaXlxbGJZemFTWWRLVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEkwTURRd016QXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQW55L25sTzQrK2NUS3RYODRGdlNNTWlJaGhDUDBGVG5mRTc0WkRCMnJEOTZqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkJNZ2EyeW1GTjJhT0RCNHFuSnBQcjd0Q1VyQU1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGUDJ1MGFSUGVjQTAKdTlpUExkampzRUQ0a2FrWU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUloQVBMVW9WeVdhR0h5UFhlTllHY05obG1WV29CdVJYREJxaU5KaHFNTnVpZ25BaUIrCnlINVhuYVNPdFppWGMySmV6enZZYUY4UUo2UXpQVjVLNmRBNjdWRCtWQT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0aBlBhcnR5QSLNAQpsW1NpbXBsZVN0YXRlKGtleT1ILCB2YWx1ZT0xLCBvd25lcj1PPVBhcnR5QSwgTD1Mb25kb24sIEM9R0IsIGxpbmVhcklkPTQ1MWEyNDJmLTIwY2QtNDJkMS1hNmIwLTNmZjJiZjZlNDM5MyldEl1sb2NhbGhvc3Q6OTA4Mi9Db3JkYV9OZXR3b3JrMi9sb2NhbGhvc3Q6MzAwMDYjY29tLmNvcmRhU2ltcGxlQXBwbGljYXRpb24uZmxvdy5HZXRTdGF0ZUJ5S2V5Okg=" +Stored ViewPayload into db with request_id: 06a5e496-a422-4adc-a6e7-8059d7d17ae5 +Successfully set state in DB. +Sending back Ack to remote relay: Ok(Response { metadata: MetadataMap { headers: {} }, message: Ack { status: Ok, request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5", message: "" }, extensions: Extensions }) + +Received GetState request from network: Request { metadata: MetadataMap { headers: {"content-type": "application/grpc", "te": "trailers", "user-agent": "grpc-java-netty/1.29.0", "grpc-accept-encoding": "gzip"} }, message: GetStateMessage { request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" }, extensions: Extensions } +Sending back RequestState to network: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5", Status = 3 +View Meta: Some(Meta { protocol: Corda, timestamp: "Wed Apr 03 11:36:07 GMT 2024", proof_type: "Notarization", serialization_format: "JSON" }), View Data: "CuAHClhjWHIyVysweWJYMUpNUHFlTWpmMmo4a1YrRkx4S0E5RlZaYjBUSzFKRmZ2MjhlM25mbjZoTnJTS0htc3RuYzFBZmVaSjhFMmNUT0hXaHltOU01NStBUT09EqsFLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRUnBGbTZBVjVpaXlxbGJZemFTWWRLVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEkwTURRd016QXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQW55L25sTzQrK2NUS3RYODRGdlNNTWlJaGhDUDBGVG5mRTc0WkRCMnJEOTZqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkJNZ2EyeW1GTjJhT0RCNHFuSnBQcjd0Q1VyQU1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGUDJ1MGFSUGVjQTAKdTlpUExkampzRUQ0a2FrWU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUloQVBMVW9WeVdhR0h5UFhlTllHY05obG1WV29CdVJYREJxaU5KaHFNTnVpZ25BaUIrCnlINVhuYVNPdFppWGMySmV6enZZYUY4UUo2UXpQVjVLNmRBNjdWRCtWQT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0aBlBhcnR5QSLNAQpsW1NpbXBsZVN0YXRlKGtleT1ILCB2YWx1ZT0xLCBvd25lcj1PPVBhcnR5QSwgTD1Mb25kb24sIEM9R0IsIGxpbmVhcklkPTQ1MWEyNDJmLTIwY2QtNDJkMS1hNmIwLTNmZjJiZjZlNDM5MyldEl1sb2NhbGhvc3Q6OTA4Mi9Db3JkYV9OZXR3b3JrMi9sb2NhbGhvc3Q6MzAwMDYjY29tLmNvcmRhU2ltcGxlQXBwbGljYXRpb24uZmxvdy5HZXRTdGF0ZUJ5S2V5Okg=" diff --git a/weaver/core/relay/relay-corda2.out b/weaver/core/relay/relay-corda2.out new file mode 100644 index 0000000000..a0044393f7 --- /dev/null +++ b/weaver/core/relay/relay-corda2.out @@ -0,0 +1,90 @@ +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/data_transfer_service.rs:266:31 + | +266 | let status = ack::Status::from_i32(ack.status) + | ^^^^^^^^ + | + = note: `#[warn(deprecated)]` on by default + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/event_subscribe_service.rs:232:31 + | +232 | let status = ack::Status::from_i32(ack.status) + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/event_publish_service.rs:356:51 + | +356 | let status = ack::Status::from_i32(ack.status) + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::events::event_subscription_state::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/network_service.rs:272:57 + | +272 | match event_subscription_state::Status::from_i32(fetched_event_sub_state.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/network_service.rs:607:36 + | +607 | match ack::Status::from_i32(ack_response_into_inner.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/network_service.rs:742:36 + | +742 | match ack::Status::from_i32(ack_response_into_inner.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::events::EventSubOperation::from_i32`: Use the TryFrom implementation instead + --> src/services/event_subscribe_service.rs:258:40 + | +258 | let operation = EventSubOperation::from_i32(event_sub.operation) + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/event_subscribe_service.rs:345:40 + | +345 | match ack::Status::from_i32(response_ack.into_inner().status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::ack::ack::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/event_subscribe_service.rs:383:24 + | +383 | match ack::Status::from_i32(request_ack.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::events::event_subscription_state::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/helpers.rs:50:57 + | +50 | match event_subscription_state::Status::from_i32(fetched_event_sub_state.status) { + | ^^^^^^^^ + +warning: use of deprecated associated function `weaverpb::common::state::request_state::Status::from_i32`: Use the TryFrom implementation instead + --> src/services/helpers.rs:332:47 + | +332 | let state_status = request_state::Status::from_i32(state.clone().status).expect("No Status"); + | ^^^^^^^^ + +warning: `relay` (bin "server") generated 11 warnings + Finished dev [unoptimized + debuginfo] target(s) in 0.15s + Running `target/debug/server` +Relay Name: "Corda_Relay2" +RelayServer listening on 127.0.0.1:9082 +Got a Query request from Some(127.0.0.1:57686) - Request { metadata: MetadataMap { headers: {"te": "trailers", "content-type": "application/grpc", "user-agent": "tonic/0.10.2"} }, message: 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", confidential: false }, extensions: Extensions } +Address to be parsed: localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H +Sending back Ack: Ok(Response { metadata: MetadataMap { headers: {} }, message: Ack { status: Ok, request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5", message: "" }, extensions: Extensions }) + +Sending request to driver with query 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", confidential: false } +Response ACK from driver=Ack { status: Ok, request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5", message: "Received query with request id 06a5e496-a422-4adc-a6e7-8059d7d17ae5" } + +Ack Ok from driver + +Received State from driver: "06a5e496-a422-4adc-a6e7-8059d7d17ae5" +View Meta: Some(Meta { protocol: Corda, timestamp: "Wed Apr 03 11:36:07 GMT 2024", proof_type: "Notarization", serialization_format: "JSON" }), View Data: "CuAHClhjWHIyVysweWJYMUpNUHFlTWpmMmo4a1YrRkx4S0E5RlZaYjBUSzFKRmZ2MjhlM25mbjZoTnJTS0htc3RuYzFBZmVaSjhFMmNUT0hXaHltOU01NStBUT09EqsFLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRUnBGbTZBVjVpaXlxbGJZemFTWWRLVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEkwTURRd016QXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQW55L25sTzQrK2NUS3RYODRGdlNNTWlJaGhDUDBGVG5mRTc0WkRCMnJEOTZqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkJNZ2EyeW1GTjJhT0RCNHFuSnBQcjd0Q1VyQU1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGUDJ1MGFSUGVjQTAKdTlpUExkampzRUQ0a2FrWU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUloQVBMVW9WeVdhR0h5UFhlTllHY05obG1WV29CdVJYREJxaU5KaHFNTnVpZ25BaUIrCnlINVhuYVNPdFppWGMySmV6enZZYUY4UUo2UXpQVjVLNmRBNjdWRCtWQT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0aBlBhcnR5QSLNAQpsW1NpbXBsZVN0YXRlKGtleT1ILCB2YWx1ZT0xLCBvd25lcj1PPVBhcnR5QSwgTD1Mb25kb24sIEM9R0IsIGxpbmVhcklkPTQ1MWEyNDJmLTIwY2QtNDJkMS1hNmIwLTNmZjJiZjZlNDM5MyldEl1sb2NhbGhvc3Q6OTA4Mi9Db3JkYV9OZXR3b3JrMi9sb2NhbGhvc3Q6MzAwMDYjY29tLmNvcmRhU2ltcGxlQXBwbGljYXRpb24uZmxvdy5HZXRTdGF0ZUJ5S2V5Okg=" +Sending back Ack to driver: Ok(Response { metadata: MetadataMap { headers: {} }, message: Ack { status: Ok, request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5", message: "" }, extensions: Extensions }) + +Sending state back to requesting relay: Request ID = "06a5e496-a422-4adc-a6e7-8059d7d17ae5" +View Meta: Some(Meta { protocol: Corda, timestamp: "Wed Apr 03 11:36:07 GMT 2024", proof_type: "Notarization", serialization_format: "JSON" }), View Data: "CuAHClhjWHIyVysweWJYMUpNUHFlTWpmMmo4a1YrRkx4S0E5RlZaYjBUSzFKRmZ2MjhlM25mbjZoTnJTS0htc3RuYzFBZmVaSjhFMmNUT0hXaHltOU01NStBUT09EqsFLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRUnBGbTZBVjVpaXlxbGJZemFTWWRLVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEkwTURRd016QXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQW55L25sTzQrK2NUS3RYODRGdlNNTWlJaGhDUDBGVG5mRTc0WkRCMnJEOTZqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkJNZ2EyeW1GTjJhT0RCNHFuSnBQcjd0Q1VyQU1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGUDJ1MGFSUGVjQTAKdTlpUExkampzRUQ0a2FrWU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUloQVBMVW9WeVdhR0h5UFhlTllHY05obG1WV29CdVJYREJxaU5KaHFNTnVpZ25BaUIrCnlINVhuYVNPdFppWGMySmV6enZZYUY4UUo2UXpQVjVLNmRBNjdWRCtWQT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0aBlBhcnR5QSLNAQpsW1NpbXBsZVN0YXRlKGtleT1ILCB2YWx1ZT0xLCBvd25lcj1PPVBhcnR5QSwgTD1Mb25kb24sIEM9R0IsIGxpbmVhcklkPTQ1MWEyNDJmLTIwY2QtNDJkMS1hNmIwLTNmZjJiZjZlNDM5MyldEl1sb2NhbGhvc3Q6OTA4Mi9Db3JkYV9OZXR3b3JrMi9sb2NhbGhvc3Q6MzAwMDYjY29tLmNvcmRhU2ltcGxlQXBwbGljYXRpb24uZmxvdy5HZXRTdGF0ZUJ5S2V5Okg=" +Response ACK from requesting relay=Ok(Response { metadata: MetadataMap { headers: {"content-type": "application/grpc", "date": "Wed, 03 Apr 2024 11:36:07 GMT", "grpc-status": "0"} }, message: Ack { status: Ok, request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5", message: "" }, extensions: Extensions }) + diff --git a/weaver/samples/corda/corda-simple-application/build.gradle b/weaver/samples/corda/corda-simple-application/build.gradle index 4eeae2e748..1aa3952b08 100644 --- a/weaver/samples/corda/corda-simple-application/build.gradle +++ b/weaver/samples/corda/corda-simple-application/build.gradle @@ -15,22 +15,20 @@ buildscript { corda_platform_version = constants.getProperty("platformVersion").toInteger() cacti_version = constants.getProperty("cactiVersion") tokens_release_group = constants.getProperty('cordaTokenSDKGroup') - tokens_release_version = constants.getProperty('cordaTokenSDKVersion') + tokens_release_version = constants.getProperty('cordaTokenSDKVersion') + cliktVersion = constants.getProperty('cliktVersion') } repositories { mavenLocal() mavenCentral() - maven { url 'https://repo1.maven.org/maven2' } maven { url 'https://download.corda.net/maven/corda-releases' } - maven { url 'https://download.corda.net/maven/corda-dependencies' } } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-reflect:$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" } } @@ -99,7 +97,6 @@ allprojects { } apply plugin: 'net.corda.plugins.cordapp' -apply plugin: 'net.corda.plugins.cordformation' apply plugin: 'net.corda.plugins.quasar-utils' sourceSets { @@ -115,26 +112,22 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" // Corda dependencies. - cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version" - cordaRuntime "$corda_release_group:corda-node-api:$corda_release_version" - cordaRuntime "$corda_release_group:corda:$corda_release_version" + cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version" + cordaRuntimeOnly "$corda_release_group:corda-node-api:$corda_release_version" + cordaRuntimeOnly "$corda_release_group:corda:$corda_release_version" // CorDapp dependencies. cordapp project(":workflows-kotlin") cordapp project(":contracts-kotlin") - cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" - cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}" - cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version" + cordaProvided "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}" + cordaProvided "org.apache.logging.log4j:log4j-web:${log4j_version}" + cordaProvided "org.slf4j:jul-to-slf4j:$slf4j_version" } cordapp { - info { - name "CorDapp Template" - vendor "Corda Open Source" - targetPlatformVersion corda_platform_version - minimumPlatformVersion corda_platform_version - } + targetPlatformVersion corda_platform_version + minimumPlatformVersion corda_platform_version } dokka { diff --git a/weaver/samples/corda/corda-simple-application/clients/build.gradle b/weaver/samples/corda/corda-simple-application/clients/build.gradle index 0f42b43237..4ee8edb931 100644 --- a/weaver/samples/corda/corda-simple-application/clients/build.gradle +++ b/weaver/samples/corda/corda-simple-application/clients/build.gradle @@ -1,10 +1,5 @@ buildscript { - Properties constants = new Properties() - file("$projectDir/../constants.properties").withInputStream { constants.load(it) } - - ext.clikt_version = constants.getProperty("cliktVersion") ext.coroutines_version = "1.3.7" - ext.protobuf_version = "3.11.1" ext.bcprov_version = "1.53" ext.grpc_version = "1.29.0" // CURRENT_GRPC_VERSION ext.grpc_kotlin_version = "0.1.4" // CURRENT_GRPC_KOTLIN_VERSION @@ -18,7 +13,6 @@ buildscript { plugins { id 'com.github.johnrengelman.shadow' version '5.0.0' id "java" - id "com.google.protobuf" version "0.8.12" id "idea" id "application" } @@ -81,7 +75,8 @@ dependencies { // CorDapp dependencies. compile project(":contracts-kotlin") compile project(":workflows-kotlin") - implementation files("libs/clikt-${clikt_version}.jar") + //implementation files("libs/clikt-${cliktVersion}.jar") + implementation "com.github.ajalt.clikt:clikt:$cliktVersion" implementation(group: 'com.fungiblehousetoken', name: 'contracts', version: "1.0") implementation(group: 'com.fungiblehousetoken', name: 'workflows', version: "1.0") @@ -93,10 +88,7 @@ dependencies { // gRPC and protobuf dependencies implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "io.grpc:grpc-kotlin-stub:$grpc_kotlin_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" implementation "io.grpc:grpc-stub:$grpc_version" implementation "io.grpc:grpc-okhttp:$grpc_version" implementation "org.bouncycastle:bcprov-jdk15on:$bcprov_version" diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network/access-control.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network/access-control.json index 9905cf4357..9204c4139d 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network/access-control.json +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network/access-control.json @@ -1,45 +1,46 @@ { "securityDomain": "Corda_Network", "rules": [{ - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:30006#com.cordaSimpleApplication.flow.GetAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:30006#com.cordaSimpleApplication.flow.GetAssetClaimStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:30006#com.cordaSimpleApplication.flow.GetBondAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:30006#com.cordaSimpleApplication.flow.GetBondAssetClaimStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:30006#net.corda.samples.tokenizedhouse.flows.GetAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:30006#net.corda.samples.tokenizedhouse.flows.GetAssetClaimStatusByPledgeId:*", "read": true }] } + diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network/membership.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network/membership.json index 854969363f..820b591ffb 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network/membership.json +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network/membership.json @@ -4,7 +4,7 @@ "PartyA": { "value": "", "type": "certificate", - "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQUhzeiFfaWHb+iY3a6DEhvzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yMTEwMjAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABCaCvAiw4WvrDfc3b6/vc7E6F8+B+471gp7q\nOlFaQmTxvRa+23soGKkmRm2fW5VdeKWCjEshCGseyN8qBnUH+e6jgdAwgc0wHQYD\nVR0OBBYEFM1cH1AsPx3GP0cFiOfCyk/ezevUMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEAvRqiRNgFcE52\nSbmRmF/O1tIzMDBK2dWgM0I8jokCnAwCIQD0uo6aood698ZVNbE51VBSSGZjJMty\nzRhwsFpjNyVbFg\u003d\u003d\n-----END CERTIFICATE-----"] + "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdTCCAhGgAwIBAgIQTD8oyIPdy6HceBfQBc5LrzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA0MDMwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABKe8oZCIZMtEhPa6oV8otTIR33b6AHHnDRnM\n5M9iDKib+NEOPrA8nEVZBfoWSt38U9RkzSury6WT8Th6QgoQJXCjgdAwgc0wHQYD\nVR0OBBYEFPsSlKzW4bnKIvXuCXfQ7DNG4PnGMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiEA8V24Ij7GcyDJ\nTsJH1QpMdNUcM8D8v46tlbfITPE2RJgCIEsREiH/IlDwtnEXrPjYGR+U17JddSm1\npL8p//tdJKhl\n-----END CERTIFICATE-----"] } } } \ No newline at end of file diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network2/access-control.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network2/access-control.json index 5f97b72395..6dcf5c4b2b 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network2/access-control.json +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network2/access-control.json @@ -1,43 +1,43 @@ { "securityDomain": "Corda_Network2", "rules": [{ - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:10006#com.cordaSimpleApplication.flow.GetStateByKey:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:10006#net.corda.samples.tokenizedhouse.flows.GetAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:10006#com.cordaSimpleApplication.flow.GetAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:10006#com.cordaSimpleApplication.flow.GetBondAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:10006#net.corda.samples.tokenizedhouse.flows.GetAssetClaimStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:10006#com.cordaSimpleApplication.flow.GetAssetClaimStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "localhost:10006#com.cordaSimpleApplication.flow.GetBondAssetClaimStatusByPledgeId:*", "read": true diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network2/membership.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network2/membership.json index 14eb250167..318b05aec2 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network2/membership.json +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials/Corda_Network2/membership.json @@ -4,7 +4,7 @@ "PartyA": { "value": "", "type": "certificate", - "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdTCCAhGgAwIBAgIQf+maBBrTPK9P/kRm8iAscDAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yMTEwMjYwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABPh9u+rE3XQjXC3PB1yEimtSGabMCjcViIAi\nkdtvlM7m5jk3Uy4aF1zkKdfqhTlRX/+exGSZ27WWMVVHMDe3AOejgdAwgc0wHQYD\nVR0OBBYEFFYWFwBR5VMhi6Wr+/ldDSWUODgbMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiEAoUEdOApTdEYc\nvDUTq7YadHHTkri7LfRdBKD2PKWFl6UCICrF73oKUIfHEw40A+fj5F9iDSI9pc4n\nTzBqzc6Gos8u\n-----END CERTIFICATE-----"] + "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdTCCAhGgAwIBAgIQS+UovX4k+emAIiW515l1GDAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA0MDMwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABGs3WRx2PMQeYu99c1FmcH5fV2P/lZZqFV6l\nQFB4cl7oKKgx36h/utu2DnrueN5LFgOYQesstCtGeFUaJ7bfD0CjgdAwgc0wHQYD\nVR0OBBYEFP2u0aRPecA0u9iPLdjjsED4kakYMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiEA95YVQZHK4DcF\nrzqEosctvdPoGu5HutpFkLYQmjG6xVMCIAGPAJCouQJfGQ67fiOiODSf4tNmaFxa\nDDe2IGrK3wEi\n-----END CERTIFICATE-----"] } } } \ No newline at end of file diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network/access-control.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network/access-control.json index 81ec2d0706..4f2bca11b5 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network/access-control.json +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network/access-control.json @@ -1,45 +1,45 @@ { "securityDomain": "Corda_Network", "rules": [{ - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_network2_partya_1:10003#com.cordaSimpleApplication.flow.GetStateByKey:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_network2_partya_1:10003#com.cordaSimpleApplication.flow.GetAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_network2_partya_1:10003#com.cordaSimpleApplication.flow.GetAssetClaimStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_network2_partya_1:10003#com.cordaSimpleApplication.flow.GetBondAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_network2_partya_1:10003#com.cordaSimpleApplication.flow.GetBondAssetClaimStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_network2_partya_1:10003#net.corda.samples.tokenizedhouse.flows.GetAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_network2_partya_1:10003#net.corda.samples.tokenizedhouse.flows.GetAssetClaimStatusByPledgeId:*", "read": true }] -} \ No newline at end of file +} diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network/membership.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network/membership.json index 854969363f..2fd298e2dc 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network/membership.json +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network/membership.json @@ -4,7 +4,7 @@ "PartyA": { "value": "", "type": "certificate", - "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQUhzeiFfaWHb+iY3a6DEhvzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yMTEwMjAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABCaCvAiw4WvrDfc3b6/vc7E6F8+B+471gp7q\nOlFaQmTxvRa+23soGKkmRm2fW5VdeKWCjEshCGseyN8qBnUH+e6jgdAwgc0wHQYD\nVR0OBBYEFM1cH1AsPx3GP0cFiOfCyk/ezevUMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEAvRqiRNgFcE52\nSbmRmF/O1tIzMDBK2dWgM0I8jokCnAwCIQD0uo6aood698ZVNbE51VBSSGZjJMty\nzRhwsFpjNyVbFg\u003d\u003d\n-----END CERTIFICATE-----"] + "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQYohCsogx1S+AfafMS1XWEzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDAzMjgwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABLMmJkQ+4I2I4p0ai8KvWpYsNxfD1DGe4II9\nE7rlRGWbKcK67Fc4RDf1ulNwMkFqs5G10ZdhawEWRdkP04dO+6CjgdAwgc0wHQYD\nVR0OBBYEFLDykwYKcEXY/GRyxyTjV1iFr3MlMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEA9EERNnmII7/R\nsdfEBQZujJ05h4ZAjDte/UgC7y6lDk8CIQD6vUTSNgHrgqmjGBa08QRjGOzEZP1b\nixb8NsaEPlOXQw\u003d\u003d\n-----END CERTIFICATE-----"] } } } \ No newline at end of file diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network2/access-control.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network2/access-control.json index 206484e9e5..592dd93fed 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network2/access-control.json +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network2/access-control.json @@ -1,45 +1,45 @@ { "securityDomain": "Corda_Network2", "rules": [{ - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_partya_1:10003#com.cordaSimpleApplication.flow.GetStateByKey:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_partya_1:10003#net.corda.samples.tokenizedhouse.flows.GetAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_partya_1:10003#com.cordaSimpleApplication.flow.GetAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_partya_1:10003#com.cordaSimpleApplication.flow.GetBondAssetPledgeStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_partya_1:10003#net.corda.samples.tokenizedhouse.flows.GetAssetClaimStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_partya_1:10003#com.cordaSimpleApplication.flow.GetAssetClaimStatusByPledgeId:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "corda_partya_1:10003#com.cordaSimpleApplication.flow.GetBondAssetClaimStatusByPledgeId:*", "read": true }] -} \ No newline at end of file +} diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network2/membership.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network2/membership.json index 14eb250167..6bbd8380fd 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network2/membership.json +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/credentials_docker/Corda_Network2/membership.json @@ -4,7 +4,7 @@ "PartyA": { "value": "", "type": "certificate", - "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdTCCAhGgAwIBAgIQf+maBBrTPK9P/kRm8iAscDAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yMTEwMjYwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABPh9u+rE3XQjXC3PB1yEimtSGabMCjcViIAi\nkdtvlM7m5jk3Uy4aF1zkKdfqhTlRX/+exGSZ27WWMVVHMDe3AOejgdAwgc0wHQYD\nVR0OBBYEFFYWFwBR5VMhi6Wr+/ldDSWUODgbMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiEAoUEdOApTdEYc\nvDUTq7YadHHTkri7LfRdBKD2PKWFl6UCICrF73oKUIfHEw40A+fj5F9iDSI9pc4n\nTzBqzc6Gos8u\n-----END CERTIFICATE-----"] + "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQQgCePT9gZnKr47C1GAAtWzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDAzMjgwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABI2kmXTjRAPpSjl+3NQKHjrs9FPScK0wmRMS\n+RwgwsPna1P/ES4/oFOnQQziX703+i2SxCacq62+aAI8Ms6XVZujgdAwgc0wHQYD\nVR0OBBYEFOF7D6mbueXtyO2uYpaaHiPvNogCMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEA4h8GVO0eM2DG\nge+oQbOvhFz4iiB1INqjHzwHg34FVIECIQD+x4jyLS8L/QNQrcYALfx1NTr7Ky1D\nfxbMoEx81DXLAg\u003d\u003d\n-----END CERTIFICATE-----"] } } } \ No newline at end of file diff --git a/weaver/samples/corda/corda-simple-application/config/dev/log4j2.xml b/weaver/samples/corda/corda-simple-application/config/dev/log4j2_simple.xml similarity index 100% rename from weaver/samples/corda/corda-simple-application/config/dev/log4j2.xml rename to weaver/samples/corda/corda-simple-application/config/dev/log4j2_simple.xml diff --git a/weaver/samples/corda/corda-simple-application/constants.properties b/weaver/samples/corda/corda-simple-application/constants.properties index ba331f71f1..18ae19d365 100644 --- a/weaver/samples/corda/corda-simple-application/constants.properties +++ b/weaver/samples/corda/corda-simple-application/constants.properties @@ -1,12 +1,12 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.8.11 -cordaCoreVersion=4.8.11 -gradlePluginsVersion=5.0.17 -kotlinVersion=1.4.32 +cordaVersion=4.11.2 +cordaCoreVersion=4.11.2 +gradlePluginsVersion=5.1.1 +kotlinVersion=1.3.72 junitVersion=4.12 log4jVersion=2.17.1 -platformVersion=10 +platformVersion=13 slf4jVersion=1.7.25 nettyVersion=4.1.22.Final cordaTokenSDKGroup=com.r3.corda.lib.tokens diff --git a/weaver/samples/corda/corda-simple-application/contracts-kotlin/build.gradle b/weaver/samples/corda/corda-simple-application/contracts-kotlin/build.gradle index b30a10ceff..093abfaba5 100644 --- a/weaver/samples/corda/corda-simple-application/contracts-kotlin/build.gradle +++ b/weaver/samples/corda/corda-simple-application/contracts-kotlin/build.gradle @@ -19,11 +19,11 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" // Corda dependencies. - cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version" + cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version" testCompile "$corda_release_group:corda-node-driver:$corda_release_version" - implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version") + compileOnly(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version") } publishing { @@ -43,7 +43,7 @@ publishing { groupId = 'com.cordaSimpleApplication' artifactId = 'contracts-kotlin' version = '0.4' - from components.java + from components.cordapp } } repositories { diff --git a/weaver/samples/corda/corda-simple-application/gradle/wrapper/gradle-wrapper.jar b/weaver/samples/corda/corda-simple-application/gradle/wrapper/gradle-wrapper.jar index 62d4c05355..943f0cbfa7 100644 Binary files a/weaver/samples/corda/corda-simple-application/gradle/wrapper/gradle-wrapper.jar and b/weaver/samples/corda/corda-simple-application/gradle/wrapper/gradle-wrapper.jar differ diff --git a/weaver/samples/corda/corda-simple-application/gradle/wrapper/gradle-wrapper.properties b/weaver/samples/corda/corda-simple-application/gradle/wrapper/gradle-wrapper.properties index 2ec77e51a9..e8be595e3c 100644 --- a/weaver/samples/corda/corda-simple-application/gradle/wrapper/gradle-wrapper.properties +++ b/weaver/samples/corda/corda-simple-application/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/weaver/samples/corda/corda-simple-application/gradlew b/weaver/samples/corda/corda-simple-application/gradlew index 4f906e0c81..65dcd68d65 100755 --- a/weaver/samples/corda/corda-simple-application/gradlew +++ b/weaver/samples/corda/corda-simple-application/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,105 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/weaver/samples/corda/corda-simple-application/gradlew.bat b/weaver/samples/corda/corda-simple-application/gradlew.bat index 5093609d51..93e3f59f13 100644 --- a/weaver/samples/corda/corda-simple-application/gradlew.bat +++ b/weaver/samples/corda/corda-simple-application/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +65,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,17 +72,19 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/weaver/samples/corda/corda-simple-application/makefile b/weaver/samples/corda/corda-simple-application/makefile index a6782c5255..f0fc863670 100644 --- a/weaver/samples/corda/corda-simple-application/makefile +++ b/weaver/samples/corda/corda-simple-application/makefile @@ -10,7 +10,8 @@ build-local-weaver-dependencies: .PHONY: build-local build-local: cd ../fungible-house-token && rm -f github.properties && make build - wget -P clients/libs/ https://repo1.maven.org/maven2/com/github/ajalt/clikt/${CLIKT_VERSION}/clikt-${CLIKT_VERSION}.jar && ./gradlew clean installDist jar + #wget -P clients/libs/ https://repo1.maven.org/maven2/com/github/ajalt/clikt/${CLIKT_VERSION}/clikt-${CLIKT_VERSION}.jar && + ./gradlew clean installDist jar .PHONY: build-refresh-dependencies-local build-refresh-dependencies-local: build-local-weaver-dependencies diff --git a/weaver/samples/corda/corda-simple-application/repositories.gradle b/weaver/samples/corda/corda-simple-application/repositories.gradle index b9d1d4140b..ee4e0ee0da 100644 --- a/weaver/samples/corda/corda-simple-application/repositories.gradle +++ b/weaver/samples/corda/corda-simple-application/repositories.gradle @@ -1,7 +1,6 @@ repositories { mavenLocal() mavenCentral() - jcenter() maven { url 'https://jitpack.io' } maven { url 'https://download.corda.net/maven/corda-dependencies' } maven { url 'https://download.corda.net/maven/corda-releases' } diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle b/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle index d1974c2992..fd9d7444d9 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle @@ -41,8 +41,8 @@ configurations { dependencies { compile 'com.google.code.gson:gson:2.8.6' - implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version") - implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "$cacti_version") + compileOnly(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version") + compileOnly(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "$cacti_version") compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" @@ -51,8 +51,8 @@ dependencies { testCompile "junit:junit:$junit_version" // Corda dependencies. - cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version" - cordaRuntime "$corda_release_group:corda:$corda_release_version" + cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version" + cordaRuntimeOnly "$corda_release_group:corda:$corda_release_version" testCompile "$corda_release_group:corda-node-driver:$corda_release_version" @@ -82,7 +82,7 @@ publishing { groupId = 'com.cordaSimpleApplication' artifactId = 'workflows-kotlin' version = '0.4' - from components.java + from components.cordapp } } repositories { diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt index c9f6423c4f..7a2106acbd 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt @@ -10,7 +10,6 @@ import co.paralleluniverse.fibers.Suspendable import com.cordaSimpleApplication.state.AssetState import com.cordaSimpleApplication.state.AssetStateJSON import com.cordaSimpleApplication.contract.AssetContract -import javassist.NotFoundException import net.corda.core.contracts.Command import net.corda.core.contracts.ContractState import net.corda.core.contracts.StateAndRef @@ -174,7 +173,7 @@ class DeleteAssetState(val linearId: String) : FlowLogic() { val assetStatesWithLinearId = serviceHub.vaultService.queryBy(criteria).states if (assetStatesWithLinearId.isEmpty()) { - throw NotFoundException("AssetState with linearId $linearId not found") + throw NoSuchElementException("AssetState with linearId $linearId not found") } val inputState = assetStatesWithLinearId.first() println("Deleting asset state from the ledger: $inputState\n") @@ -366,7 +365,7 @@ class MergeAssetStates(val linearId1: String, val linearId2: String) : FlowLogic Vault.StateStatus.UNCONSUMED, null) var assetStatesWithLinearId = serviceHub.vaultService.queryBy(criteria).states if (assetStatesWithLinearId.isEmpty()) { - throw NotFoundException("AssetState with linearId $linearId1 not found") + throw NoSuchElementException("AssetState with linearId $linearId1 not found") } val assetState1 = assetStatesWithLinearId.first() @@ -375,7 +374,7 @@ class MergeAssetStates(val linearId1: String, val linearId2: String) : FlowLogic Vault.StateStatus.UNCONSUMED, null) assetStatesWithLinearId = serviceHub.vaultService.queryBy(criteria).states if (assetStatesWithLinearId.isEmpty()) { - throw NotFoundException("AssetState with linearId $linearId2 not found") + throw NoSuchElementException("AssetState with linearId $linearId2 not found") } val assetState2 = assetStatesWithLinearId.first() @@ -484,7 +483,7 @@ class SplitAssetState(val linearId: String, val quantity1: Long, val quantity2: Vault.StateStatus.UNCONSUMED, null) val assetStatesWithLinearId = serviceHub.vaultService.queryBy(criteria).states if (assetStatesWithLinearId.isEmpty()) { - throw NotFoundException("AssetState with linearId $linearId not found") + throw NoSuchElementException("AssetState with linearId $linearId not found") } val splitState = assetStatesWithLinearId.first() @@ -568,7 +567,7 @@ class TransferAssetStateInitiator(val linearId: String, val otherParty: Party) : Vault.StateStatus.UNCONSUMED, null) val assetStatesWithLinearId = serviceHub.vaultService.queryBy(criteria).states if (assetStatesWithLinearId.isEmpty()) { - throw NotFoundException("AssetState with linearId $linearId not found") + throw NoSuchElementException("AssetState with linearId $linearId not found") } val inputState = assetStatesWithLinearId.first() diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt index bb31481879..fbc2c6ce84 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt @@ -10,7 +10,6 @@ import co.paralleluniverse.fibers.Suspendable import com.cordaSimpleApplication.state.BondAssetState import com.cordaSimpleApplication.state.BondAssetStateJSON import com.cordaSimpleApplication.contract.BondAssetContract -import javassist.NotFoundException import net.corda.core.contracts.Command import net.corda.core.contracts.ContractState import net.corda.core.contracts.StateAndRef @@ -174,7 +173,7 @@ class DeleteBondAssetState(val linearId: String) : FlowLogic( val assetStatesWithLinearId = serviceHub.vaultService.queryBy(criteria).states if (assetStatesWithLinearId.isEmpty()) { - throw NotFoundException("BondssetState with linearId $linearId not found") + throw NoSuchElementException("BondssetState with linearId $linearId not found") } val inputState = assetStatesWithLinearId.first() println("Deleting bond asset state from the ledger: $inputState\n") @@ -399,7 +398,7 @@ class TransferBondAssetStateInitiator(val linearId: String, val otherParty: Part Vault.StateStatus.UNCONSUMED, null) val assetStatesWithLinearId = serviceHub.vaultService.queryBy(criteria).states if (assetStatesWithLinearId.isEmpty()) { - throw NotFoundException("BondAssetState with linearId $linearId not found") + throw NoSuchElementException("BondAssetState with linearId $linearId not found") } val inputState = assetStatesWithLinearId.first() diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/SimpleFlow.kt b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/SimpleFlow.kt index dab2259208..7beee40307 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/SimpleFlow.kt +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/SimpleFlow.kt @@ -9,7 +9,6 @@ package com.cordaSimpleApplication.flow import co.paralleluniverse.fibers.Suspendable import com.cordaSimpleApplication.contract.SimpleContract import com.cordaSimpleApplication.state.SimpleState -import javassist.NotFoundException import net.corda.core.contracts.Command import net.corda.core.contracts.UniqueIdentifier import net.corda.core.contracts.requireThat @@ -256,7 +255,7 @@ class UpdateState(val key: String, val value: String) : FlowLogic().states .filter { it.state.data.key == key } if (statesWithKey.isEmpty()) { - throw NotFoundException("SimpleState with key $key not found") + throw NoSuchElementException("SimpleState with key $key not found") } val inputState = statesWithKey.first() val outputState = inputState.state.data.copy(value = value) @@ -330,7 +329,7 @@ class DeleteState(val key: String) : FlowLogic() { val statesWithKey = serviceHub.vaultService.queryBy().states .filter { it.state.data.key == key } if (statesWithKey.isEmpty()) { - throw NotFoundException("SimpleState with key $key not found") + throw NoSuchElementException("SimpleState with key $key not found") } val inputState = statesWithKey.first() println("Deleting state from the ledger: $inputState\n") diff --git a/weaver/samples/corda/fungible-house-token/build.gradle b/weaver/samples/corda/fungible-house-token/build.gradle index a728b35adf..7fdd844bfc 100644 --- a/weaver/samples/corda/fungible-house-token/build.gradle +++ b/weaver/samples/corda/fungible-house-token/build.gradle @@ -92,8 +92,8 @@ dependencies { tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { kotlinOptions { - languageVersion = "1.2" - apiVersion = "1.2" + languageVersion = "1.4" + apiVersion = "1.4" jvmTarget = "1.8" javaParameters = true // Useful for reflection. } diff --git a/weaver/samples/corda/fungible-house-token/makefile b/weaver/samples/corda/fungible-house-token/makefile index 98e50c1d6d..007208e46f 100644 --- a/weaver/samples/corda/fungible-house-token/makefile +++ b/weaver/samples/corda/fungible-house-token/makefile @@ -9,7 +9,7 @@ build: source cp extension-flows/*.kt source/workflows/src/main/kotlin/net/corda/samples/tokenizedhouse/flows/ cp extension-states/*.kt source/contracts/src/main/kotlin/net/corda/samples/tokenizedhouse/states/ cp build.gradle source/build.gradle - cd source && ./gradlew wrapper --gradle-version 7.5 --distribution-type all && ./gradlew clean jar + cd source && ./gradlew wrapper --gradle-version 7.6.1 --distribution-type all && ./gradlew clean jar .PHONY: clean clean: diff --git a/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network/access-control.json b/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network/access-control.json index 56fe3a591f..f9ff3eb70c 100644 --- a/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network/access-control.json +++ b/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network/access-control.json @@ -1,31 +1,31 @@ { "securityDomain": "Corda_Network", "rules": [{ - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simplestate:Read:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simpleassettransfer:GetTokenAssetPledgeStatus:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simpleassettransfer:GetTokenAssetClaimStatus:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simpleassettransfer:GetAssetPledgeStatus:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simpleassettransfer:GetAssetClaimStatus:*", "read": true diff --git a/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network/membership.json b/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network/membership.json index 854969363f..2fd298e2dc 100644 --- a/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network/membership.json +++ b/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network/membership.json @@ -4,7 +4,7 @@ "PartyA": { "value": "", "type": "certificate", - "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQUhzeiFfaWHb+iY3a6DEhvzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yMTEwMjAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABCaCvAiw4WvrDfc3b6/vc7E6F8+B+471gp7q\nOlFaQmTxvRa+23soGKkmRm2fW5VdeKWCjEshCGseyN8qBnUH+e6jgdAwgc0wHQYD\nVR0OBBYEFM1cH1AsPx3GP0cFiOfCyk/ezevUMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEAvRqiRNgFcE52\nSbmRmF/O1tIzMDBK2dWgM0I8jokCnAwCIQD0uo6aood698ZVNbE51VBSSGZjJMty\nzRhwsFpjNyVbFg\u003d\u003d\n-----END CERTIFICATE-----"] + "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQYohCsogx1S+AfafMS1XWEzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDAzMjgwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABLMmJkQ+4I2I4p0ai8KvWpYsNxfD1DGe4II9\nE7rlRGWbKcK67Fc4RDf1ulNwMkFqs5G10ZdhawEWRdkP04dO+6CjgdAwgc0wHQYD\nVR0OBBYEFLDykwYKcEXY/GRyxyTjV1iFr3MlMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEA9EERNnmII7/R\nsdfEBQZujJ05h4ZAjDte/UgC7y6lDk8CIQD6vUTSNgHrgqmjGBa08QRjGOzEZP1b\nixb8NsaEPlOXQw\u003d\u003d\n-----END CERTIFICATE-----"] } } } \ No newline at end of file diff --git a/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network2/access-control.json b/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network2/access-control.json index 224ab5e8e0..27f1d97210 100644 --- a/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network2/access-control.json +++ b/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network2/access-control.json @@ -1,7 +1,7 @@ { "securityDomain": "Corda_Network2", "rules": [{ - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simplestate:Read:*", "read": true diff --git a/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network2/membership.json b/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network2/membership.json index 14eb250167..6bbd8380fd 100644 --- a/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network2/membership.json +++ b/weaver/samples/fabric/fabric-cli/src/data/credentials/Corda_Network2/membership.json @@ -4,7 +4,7 @@ "PartyA": { "value": "", "type": "certificate", - "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdTCCAhGgAwIBAgIQf+maBBrTPK9P/kRm8iAscDAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yMTEwMjYwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABPh9u+rE3XQjXC3PB1yEimtSGabMCjcViIAi\nkdtvlM7m5jk3Uy4aF1zkKdfqhTlRX/+exGSZ27WWMVVHMDe3AOejgdAwgc0wHQYD\nVR0OBBYEFFYWFwBR5VMhi6Wr+/ldDSWUODgbMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiEAoUEdOApTdEYc\nvDUTq7YadHHTkri7LfRdBKD2PKWFl6UCICrF73oKUIfHEw40A+fj5F9iDSI9pc4n\nTzBqzc6Gos8u\n-----END CERTIFICATE-----"] + "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQQgCePT9gZnKr47C1GAAtWzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDAzMjgwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABI2kmXTjRAPpSjl+3NQKHjrs9FPScK0wmRMS\n+RwgwsPna1P/ES4/oFOnQQziX703+i2SxCacq62+aAI8Ms6XVZujgdAwgc0wHQYD\nVR0OBBYEFOF7D6mbueXtyO2uYpaaHiPvNogCMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEA4h8GVO0eM2DG\nge+oQbOvhFz4iiB1INqjHzwHg34FVIECIQD+x4jyLS8L/QNQrcYALfx1NTr7Ky1D\nfxbMoEx81DXLAg\u003d\u003d\n-----END CERTIFICATE-----"] } } } \ No newline at end of file diff --git a/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network/access-control.json b/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network/access-control.json index 848de2cdf7..509d1131b5 100644 --- a/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network/access-control.json +++ b/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network/access-control.json @@ -1,31 +1,31 @@ { "securityDomain": "Corda_Network", "rules": [{ - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simplestate:Read:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simpleassettransfer:GetTokenAssetPledgeStatus:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simpleassettransfer:GetTokenAssetClaimStatus:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simpleassettransfer:GetAssetPledgeStatus:*", "read": true }, { - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaqyrhCxlulMXQ2ERwrN5FjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAMaHQI58Jjpugv6uIZ1qej2YDAkYOd+8IngOkp1AXioCjgYkwgYYwHQYDVR0O\nBBYEFPI4LMY1d+hDVGJTXnDJuQviBQ59MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFM1cH1AsPx3G\nP0cFiOfCyk/ezevUMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIgcKAtTPzmuGtwGHTx4Gq07K0R96lGFgQhFCycFNgxcj4CIQD2\nE1rZxLU2pKar/MC86c+LNF1F55ehf9egcDUzJO8Bjg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRaj46w56nBwxypSSSrm8MjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEATjyYBUxFeghyrN6mx6Ar/tidLwaZusIzurVfYC+NmzmjgYkwgYYwHQYDVR0O\nBBYEFNXl2A5PwdIxg8c1K2rgg5pGyDVWMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFLDykwYKcEXY\n/GRyxyTjV1iFr3MlMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAIHi2o27twiCiYyi+33bRqj1WTqKeMuss5mCarYNz6GpAiA5\nl7he+qL1ymthCbGFBrLObbk1K0wVbuRDL2OpcaoyIA\u003d\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simpleassettransfer:GetAssetClaimStatus:*", "read": true diff --git a/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network/membership.json b/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network/membership.json index 854969363f..2fd298e2dc 100644 --- a/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network/membership.json +++ b/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network/membership.json @@ -4,7 +4,7 @@ "PartyA": { "value": "", "type": "certificate", - "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQUhzeiFfaWHb+iY3a6DEhvzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yMTEwMjAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABCaCvAiw4WvrDfc3b6/vc7E6F8+B+471gp7q\nOlFaQmTxvRa+23soGKkmRm2fW5VdeKWCjEshCGseyN8qBnUH+e6jgdAwgc0wHQYD\nVR0OBBYEFM1cH1AsPx3GP0cFiOfCyk/ezevUMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEAvRqiRNgFcE52\nSbmRmF/O1tIzMDBK2dWgM0I8jokCnAwCIQD0uo6aood698ZVNbE51VBSSGZjJMty\nzRhwsFpjNyVbFg\u003d\u003d\n-----END CERTIFICATE-----"] + "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQYohCsogx1S+AfafMS1XWEzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDAzMjgwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABLMmJkQ+4I2I4p0ai8KvWpYsNxfD1DGe4II9\nE7rlRGWbKcK67Fc4RDf1ulNwMkFqs5G10ZdhawEWRdkP04dO+6CjgdAwgc0wHQYD\nVR0OBBYEFLDykwYKcEXY/GRyxyTjV1iFr3MlMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEA9EERNnmII7/R\nsdfEBQZujJ05h4ZAjDte/UgC7y6lDk8CIQD6vUTSNgHrgqmjGBa08QRjGOzEZP1b\nixb8NsaEPlOXQw\u003d\u003d\n-----END CERTIFICATE-----"] } } } \ No newline at end of file diff --git a/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network2/access-control.json b/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network2/access-control.json index 224ab5e8e0..27f1d97210 100644 --- a/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network2/access-control.json +++ b/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network2/access-control.json @@ -1,7 +1,7 @@ { "securityDomain": "Corda_Network2", "rules": [{ - "principal": "-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQaj/tzScOOq5mA6XOZ6xlXTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTIxMTAyNjAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAVxGzRmahlqiYY1Xae7a469UYL0ST44myWj1lnAF/yuWjgYkwgYYwHQYDVR0O\nBBYEFA1+fHn5Aqe61gxRVrYYveplXCWqMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFFYWFwBR5VMh\ni6Wr+/ldDSWUODgbMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPFlXeyOPM/NR05cSNwbX2TFomwV04sN7eZFpCkzVz5HAiAj\nNGmNhIbeiktfehc3tdUGkf7BR6RovI4rLqMlDo8MYg\u003d\u003d\n-----END CERTIFICATE-----", + "principal": "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQW0F17jbAR+7rBDTqReiK0TAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDMyODAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAgnANNKDPTjc01PGubfchSLGBp+v0U+RD8yKVFcvLifmjgYkwgYYwHQYDVR0O\nBBYEFGdhe2OvL0ijxXmu6pCqhAtQEWEeMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOF7D6mbueXt\nyO2uYpaaHiPvNogCMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAMs4I8+5ldhH51QkMTMtsxFL+n4ptQkrMjuifbxvXCqRAiEA\nxEPrhXJpMiQOOK1epEO7nM5VrwsXCnM5KEGkI9bP/tY\u003d\n-----END CERTIFICATE-----", "principalType": "certificate", "resource": "mychannel:simplestate:Read:*", "read": true diff --git a/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network2/membership.json b/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network2/membership.json index 14eb250167..6bbd8380fd 100644 --- a/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network2/membership.json +++ b/weaver/samples/fabric/fabric-cli/src/data/credentials_docker/Corda_Network2/membership.json @@ -4,7 +4,7 @@ "PartyA": { "value": "", "type": "certificate", - "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdTCCAhGgAwIBAgIQf+maBBrTPK9P/kRm8iAscDAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yMTEwMjYwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABPh9u+rE3XQjXC3PB1yEimtSGabMCjcViIAi\nkdtvlM7m5jk3Uy4aF1zkKdfqhTlRX/+exGSZ27WWMVVHMDe3AOejgdAwgc0wHQYD\nVR0OBBYEFFYWFwBR5VMhi6Wr+/ldDSWUODgbMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiEAoUEdOApTdEYc\nvDUTq7YadHHTkri7LfRdBKD2PKWFl6UCICrF73oKUIfHEw40A+fj5F9iDSI9pc4n\nTzBqzc6Gos8u\n-----END CERTIFICATE-----"] + "chain": ["-----BEGIN CERTIFICATE-----\nMIICCTCCAbCgAwIBAgIIcFe0qctqSucwCgYIKoZIzj0EAwIwWDEbMBkGA1UEAwwS\nQ29yZGEgTm9kZSBSb290IENBMQswCQYDVQQKDAJSMzEOMAwGA1UECwwFY29yZGEx\nDzANBgNVBAcMBkxvbmRvbjELMAkGA1UEBhMCVUswHhcNMTcwNTIyMDAwMDAwWhcN\nMjcwNTIwMDAwMDAwWjBYMRswGQYDVQQDDBJDb3JkYSBOb2RlIFJvb3QgQ0ExCzAJ\nBgNVBAoMAlIzMQ4wDAYDVQQLDAVjb3JkYTEPMA0GA1UEBwwGTG9uZG9uMQswCQYD\nVQQGEwJVSzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGlm6LFHrVkzfuUHin36\nJrm1aUMarX/NUZXw8n8gSiJmsZPlUEplJ+f/lzZMky5EZPTtCciG34pnOP0eiMd/\nJTCjZDBiMB0GA1UdDgQWBBR8rqnfuUgBKxOJC5rmRYUcORcHczALBgNVHQ8EBAMC\nAYYwIwYDVR0lBBwwGgYIKwYBBQUHAwEGCCsGAQUFBwMCBgRVHSUAMA8GA1UdEwEB\n/wQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgDaL4SguKsNeTT7SeUkFdoCBACeG8\nGqO4M1KlfimphQwCICiq00hDanT5W8bTLqE7GIGuplf/O8AABlpWrUg6uiUB\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICXjCCAfugAwIBAgIIHVb6wd3RHhIwFAYIKoZIzj0EAwIGCCqGSM49AwEHMFgx\nGzAZBgNVBAMMEkNvcmRhIE5vZGUgUm9vdCBDQTELMAkGA1UECgwCUjMxDjAMBgNV\nBAsMBWNvcmRhMQ8wDQYDVQQHDAZMb25kb24xCzAJBgNVBAYTAlVLMB4XDTE4MDcx\nMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowYzELMAkGA1UEBhMCVVMxETAPBgNVBAcT\nCE5ldyBZb3JrMQ4wDAYDVQQLEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExM\nQzEZMBcGA1UEAxMQQ29yZGEgRG9vcm1hbiBDQTBZMBMGByqGSM49AgEGCCqGSM49\nAwEHA0IABAPL3qAm4WZms5ciBVoxMQXfK7uTmHRVvWfWQ+QVYP3bMHSguHZRzB3v\n7EOE8RZpGDan+w007Xj7XR0+xG9SxmCjgZkwgZYwHQYDVR0OBBYEFOvuLjAVKUCu\nGZge2G/jfX8HosITMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgGGMCMGA1Ud\nJQQcMBoGCCsGAQUFBwMBBggrBgEFBQcDAgYEVR0lADAfBgNVHSMEGDAWgBR8rqnf\nuUgBKxOJC5rmRYUcORcHczARBgorBgEEAYOKYgEBBAMCAQEwFAYIKoZIzj0EAwIG\nCCqGSM49AwEHA0cAMEQCIBmzQXpnCo9eAxkhwMt0bBr1Q0APJXF0KuBRsFBWAa6S\nAiBgx6G8G9Ij7B8+y65ItLKVcs7Kh6Rdnr5/1zB/yPwfrg\u003d\u003d\n-----END CERTIFICATE-----", "-----BEGIN CERTIFICATE-----\nMIICdjCCAhGgAwIBAgIQQgCePT9gZnKr47C1GAAtWzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDAzMjgwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABI2kmXTjRAPpSjl+3NQKHjrs9FPScK0wmRMS\n+RwgwsPna1P/ES4/oFOnQQziX703+i2SxCacq62+aAI8Ms6XVZujgdAwgc0wHQYD\nVR0OBBYEFOF7D6mbueXtyO2uYpaaHiPvNogCMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNJADBGAiEA4h8GVO0eM2DG\nge+oQbOvhFz4iiB1INqjHzwHg34FVIECIQD+x4jyLS8L/QNQrcYALfx1NTr7Ky1D\nfxbMoEx81DXLAg\u003d\u003d\n-----END CERTIFICATE-----"] } } } \ No newline at end of file diff --git a/weaver/sdks/corda/build.gradle b/weaver/sdks/corda/build.gradle index 9928171eb1..02be5c17d8 100644 --- a/weaver/sdks/corda/build.gradle +++ b/weaver/sdks/corda/build.gradle @@ -5,7 +5,6 @@ buildscript { ext { kotlin_version = constants.getProperty("kotlinVersion") coroutines_version = constants.getProperty("coroutinesVersion") - protobuf_version = constants.getProperty("protobufVersion") bcprov_version = constants.getProperty("bcprovVersion") grpc_version = constants.getProperty("grpcVersion") // CURRENT_GRPC_VERSION grpc_kotlin_version = constants.getProperty("grpcKotlinVersion") // CURRENT_GRPC_KOTLIN_VERSION @@ -14,7 +13,6 @@ buildscript { corda_version = constants.getProperty("cordaVersion") corda_core_version = constants.getProperty("cordaVersion") arrow_version = constants.getProperty("arrowVersion") - corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion") log4j_version = constants.getProperty("log4jVersion") slf4j_version = constants.getProperty("slf4jVersion") cacti_version = constants.getProperty("cactiVersion") @@ -77,7 +75,7 @@ dependencies { implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "$cacti_version") implementation(group: 'org.hyperledger.cacti.weaver.protos', name: 'protos-java-kt', version: "$cacti_version") - // gRPC and protobuf dependencies + // gRPC dependencies implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "io.grpc:grpc-kotlin-stub:$grpc_kotlin_version" implementation "io.grpc:grpc-netty-shaded:$grpc_version" diff --git a/weaver/sdks/corda/config/dev/bootstrap-states.csv b/weaver/sdks/corda/config/dev/bootstrap-states.csv deleted file mode 100644 index ca93a66865..0000000000 --- a/weaver/sdks/corda/config/dev/bootstrap-states.csv +++ /dev/null @@ -1,118 +0,0 @@ -H, 1 -He, 2 -Li, 3 -Be, 4 -B, 5 -C, 6 -N, 7 -O, 8 -F, 9 -Ne, 10 -Na, 11 -Mg, 12 -Al, 13 -Si, 14 -P, 15 -S, 16 -Cl, 17 -Ar, 18 -K, 19 -Ca, 20 -Sc, 21 -Ti, 22 -V, 23 -Cr, 24 -Mn, 25 -Fe, 26 -Co, 27 -Ni, 28 -Cu, 29 -Zn, 30 -Ga, 31 -Ge, 32 -As, 33 -Se, 34 -Br, 35 -Kr, 36 -Rb, 37 -Sr, 38 -Y, 39 -Zr, 40 -Nb, 41 -Mo, 42 -Tc, 43 -Ru, 44 -Rh, 45 -Pd, 46 -Ag, 47 -Cd, 48 -In, 49 -Sn, 50 -Sb, 51 -Te, 52 -I, 53 -Xe, 54 -Cs, 55 -Ba, 56 -La, 57 -Ce, 58 -Pr, 59 -Nd, 60 -Pm, 61 -Sm, 62 -Eu, 63 -Gd, 64 -Tb, 65 -Dy, 66 -Ho, 67 -Er, 68 -Tm, 69 -Yb, 70 -Lu, 71 -Hf, 72 -Ta, 73 -W, 74 -Re, 75 -Os, 76 -Ir, 77 -Pt, 78 -Au, 79 -Hg, 80 -Tl, 81 -Pb, 82 -Bi, 83 -Po, 84 -At, 85 -Rn, 86 -Fr, 87 -Ra, 88 -Ac, 89 -Th, 90 -Pa, 91 -U, 92 -Np, 93 -Pu, 94 -Am, 95 -Cm, 96 -Bk, 97 -Cf, 98 -Es, 99 -Fm, 100 -Md, 101 -No, 102 -Lr, 103 -Rf, 104 -Db, 105 -Sg, 106 -Bh, 107 -Hs, 108 -Mt, 109 -Ds, 110 -Rg, 111 -Cn, 112 -Nh, 113 -Fl, 114 -Mc, 115 -Lv, 116 -Ts, 117 -Og, 118 \ No newline at end of file diff --git a/weaver/sdks/corda/constants.properties b/weaver/sdks/corda/constants.properties index c8a5ba74b8..5f1d351254 100644 --- a/weaver/sdks/corda/constants.properties +++ b/weaver/sdks/corda/constants.properties @@ -1,16 +1,14 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.8.11 -cordaCoreVersion=4.8.11 -gradlePluginsVersion=5.0.17 -kotlinVersion=1.4.32 +cordaVersion=4.11.2 +cordaCoreVersion=4.11.2 +kotlinVersion=1.3.72 junitVersion=4.12 log4jVersion=2.17.1 slf4jVersion=1.7.25 arrowVersion=0.10.4 grpcVersion=1.28.1 grpcKotlinVersion=0.1.3 -protobufVersion=3.11.1 coroutinesVersion=1.3.3 bcprovVersion=1.53 cactiVersion=2.0.0-alpha.2 diff --git a/weaver/sdks/corda/gradle/wrapper/gradle-wrapper.jar b/weaver/sdks/corda/gradle/wrapper/gradle-wrapper.jar index 249e5832f0..943f0cbfa7 100644 Binary files a/weaver/sdks/corda/gradle/wrapper/gradle-wrapper.jar and b/weaver/sdks/corda/gradle/wrapper/gradle-wrapper.jar differ diff --git a/weaver/sdks/corda/gradle/wrapper/gradle-wrapper.properties b/weaver/sdks/corda/gradle/wrapper/gradle-wrapper.properties index 2ec77e51a9..e8be595e3c 100644 --- a/weaver/sdks/corda/gradle/wrapper/gradle-wrapper.properties +++ b/weaver/sdks/corda/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/weaver/sdks/corda/gradlew b/weaver/sdks/corda/gradlew index a69d9cb6c2..65dcd68d65 100755 --- a/weaver/sdks/corda/gradlew +++ b/weaver/sdks/corda/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/weaver/sdks/corda/gradlew.bat b/weaver/sdks/corda/gradlew.bat index f127cfd49d..93e3f59f13 100644 --- a/weaver/sdks/corda/gradlew.bat +++ b/weaver/sdks/corda/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/weaver/tests/network-setups/corda/.gitignore b/weaver/tests/network-setups/corda/.gitignore index ff55db3932..f661d96b33 100644 --- a/weaver/tests/network-setups/corda/.gitignore +++ b/weaver/tests/network-setups/corda/.gitignore @@ -3,6 +3,7 @@ shared/artifacts/*.jar shared/artifacts/*.zip shared/artifacts/clients-0.1 shared/artifacts/clients-0.2 +!shared/**/logs # Eclipse, ctags, Mac metadata, log files .classpath diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle b/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle index cf2677d1ed..a3d73ee5a8 100644 --- a/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle +++ b/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle @@ -20,9 +20,7 @@ buildscript { repositories { mavenLocal() mavenCentral() - jcenter() maven { url 'https://download.corda.net/maven/corda-releases' } - maven { url 'https://download.corda.net/maven/corda-dependencies' } } dependencies { @@ -32,39 +30,29 @@ buildscript { } } +apply plugin: 'kotlin' apply plugin: 'net.corda.plugins.cordformation' -sourceSets { - main { - resources { - srcDir rootProject.file("config/dev") - } - } +repositories { + mavenLocal() + mavenCentral() + maven { url 'https://download.corda.net/maven/corda-dependencies' } + maven { url 'https://repo1.maven.org/maven2' } + maven { url 'https://download.corda.net/maven/corda' } + maven { url 'https://download.corda.net/maven/corda-lib' } + maven { url 'https://jitpack.io' } } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - // Corda dependencies. - cordaRuntime "$corda_release_group:corda-node-api:$corda_release_version" - cordaRuntime "$corda_release_group:corda:$corda_release_version" + cordaBootstrapper "$corda_release_group:corda-node-api:$corda_release_version" + corda "$corda_release_group:corda:$corda_release_version" // Token SDK dependencies. cordapp "$tokens_release_group:tokens-contracts:$tokens_release_version" cordapp "$tokens_release_group:tokens-workflows:$tokens_release_version" } - -repositories { - mavenLocal() - jcenter() - mavenCentral() - maven { url 'https://download.corda.net/maven/corda' } - maven { url 'https://jitpack.io' } - maven { url 'https://download.corda.net/maven/corda-lib' } -} - task ganache { subprojects { if (it.project.name != "clients") { @@ -136,7 +124,7 @@ task deployNodes(type: net.corda.plugins.Cordform) { } task prepareDockerNodes(type: net.corda.plugins.Dockerform, dependsOn: ['jar']) { - dockerImage = "corda/corda-zulu-java1.8-$corda_release_version" + dockerImage = "corda/community:$corda_release_version-zulu-openjdk8" nodeDefaults { projectCordapp { deploy = false diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network/constants.properties b/weaver/tests/network-setups/corda/dev/Corda_Network/constants.properties index cc7009c9a0..1f8fc2cefc 100644 --- a/weaver/tests/network-setups/corda/dev/Corda_Network/constants.properties +++ b/weaver/tests/network-setups/corda/dev/Corda_Network/constants.properties @@ -1,12 +1,12 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.8 -cordaCoreVersion=4.8 -gradlePluginsVersion=5.0.17 -kotlinVersion=1.4.32 +cordaVersion=4.11.2 +cordaCoreVersion=4.11.2 +gradlePluginsVersion=5.1.1 +kotlinVersion=1.3.72 junitVersion=4.12 log4jVersion =2.11.2 -platformVersion=10 +platformVersion=13 slf4jVersion=1.7.25 nettyVersion=4.1.22.Final diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network/docker-compose.yml b/weaver/tests/network-setups/corda/dev/Corda_Network/docker-compose.yml index 767bb606da..78a8b9ed89 100644 --- a/weaver/tests/network-setups/corda/dev/Corda_Network/docker-compose.yml +++ b/weaver/tests/network-setups/corda/dev/Corda_Network/docker-compose.yml @@ -22,7 +22,7 @@ services: ports: - 10003:10003 - 22022 - image: corda/corda-zulu-java1.8-4.8 + image: corda/community:4.11.2-zulu-openjdk8 container_name: corda_notary_1 partya: profiles: ["1-node", "2-nodes", "3-nodes"] @@ -41,7 +41,7 @@ services: ports: - 10006:10003 - 22022 - image: corda/corda-zulu-java1.8-4.8 + image: corda/community:4.11.2-zulu-openjdk8 container_name: corda_partya_1 partyb: profiles: ["2-nodes", "3-nodes"] @@ -60,7 +60,7 @@ services: ports: - 10009:10003 - 22022 - image: corda/corda-zulu-java1.8-4.8 + image: corda/community:4.11.2-zulu-openjdk8 container_name: corda_partyb_1 partyc: profiles: ["3-nodes"] @@ -79,5 +79,5 @@ services: ports: - 10012:10003 - 22022 - image: corda/corda-zulu-java1.8-4.8 + image: corda/community:4.11.2-zulu-openjdk8 container_name: corda_partyc_1 diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network/settings.gradle b/weaver/tests/network-setups/corda/dev/Corda_Network/settings.gradle new file mode 100644 index 0000000000..e69de29bb2 diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle b/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle index 552abecb6b..508d9193fd 100644 --- a/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle +++ b/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle @@ -20,9 +20,7 @@ buildscript { repositories { mavenLocal() mavenCentral() - jcenter() maven { url 'https://download.corda.net/maven/corda-releases' } - maven { url 'https://download.corda.net/maven/corda-dependencies' } } dependencies { @@ -32,39 +30,29 @@ buildscript { } } +apply plugin: 'kotlin' apply plugin: 'net.corda.plugins.cordformation' -sourceSets { - main { - resources { - srcDir rootProject.file("config/dev") - } - } +repositories { + mavenLocal() + mavenCentral() + maven { url 'https://download.corda.net/maven/corda-dependencies' } + maven { url 'https://repo1.maven.org/maven2' } + maven { url 'https://download.corda.net/maven/corda' } + maven { url 'https://download.corda.net/maven/corda-lib' } + maven { url 'https://jitpack.io' } } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - // Corda dependencies. - cordaRuntime "$corda_release_group:corda-node-api:$corda_release_version" - cordaRuntime "$corda_release_group:corda:$corda_release_version" + cordaBootstrapper "$corda_release_group:corda-node-api:$corda_release_version" + corda "$corda_release_group:corda:$corda_release_version" // Token SDK dependencies. cordapp "$tokens_release_group:tokens-contracts:$tokens_release_version" cordapp "$tokens_release_group:tokens-workflows:$tokens_release_version" } - -repositories { - mavenLocal() - jcenter() - mavenCentral() - maven { url 'https://download.corda.net/maven/corda' } - maven { url 'https://jitpack.io' } - maven { url 'https://download.corda.net/maven/corda-lib' } -} - task ganache { subprojects { if (it.project.name != "clients") { @@ -136,7 +124,7 @@ task deployNodes(type: net.corda.plugins.Cordform) { } task prepareDockerNodes(type: net.corda.plugins.Dockerform, dependsOn: ['jar']) { - dockerImage = "corda/corda-zulu-java1.8-$corda_release_version" + dockerImage = "corda/community:$corda_release_version-zulu-openjdk8" nodeDefaults { projectCordapp { deploy = false diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network2/constants.properties b/weaver/tests/network-setups/corda/dev/Corda_Network2/constants.properties index 0a986fc3e9..c915e136d7 100644 --- a/weaver/tests/network-setups/corda/dev/Corda_Network2/constants.properties +++ b/weaver/tests/network-setups/corda/dev/Corda_Network2/constants.properties @@ -1,12 +1,12 @@ cordaReleaseGroup=net.corda cordaCoreReleaseGroup=net.corda -cordaVersion=4.8 -cordaCoreVersion=4.8 -gradlePluginsVersion=5.0.17 -kotlinVersion=1.4.32 +cordaVersion=4.11.2 +cordaCoreVersion=4.11.2 +gradlePluginsVersion=5.1.1 +kotlinVersion=1.3.72 junitVersion=4.12 log4jVersion =2.11.2 -platformVersion=10 +platformVersion=13 slf4jVersion=1.7.25 nettyVersion=4.1.22.Final diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network2/docker-compose.yml b/weaver/tests/network-setups/corda/dev/Corda_Network2/docker-compose.yml index f735b7e67a..6ad88d9c10 100644 --- a/weaver/tests/network-setups/corda/dev/Corda_Network2/docker-compose.yml +++ b/weaver/tests/network-setups/corda/dev/Corda_Network2/docker-compose.yml @@ -22,7 +22,7 @@ services: ports: - 30003:10003 - 22022 - image: corda/corda-zulu-java1.8-4.8 + image: corda/community:4.11.2-zulu-openjdk8 container_name: corda_network2_notary_1 partya: profiles: ["1-node", "2-nodes", "3-nodes"] @@ -41,7 +41,7 @@ services: ports: - 30006:10003 - 22022 - image: corda/corda-zulu-java1.8-4.8 + image: corda/community:4.11.2-zulu-openjdk8 container_name: corda_network2_partya_1 partyb: profiles: ["2-nodes", "3-nodes"] @@ -60,7 +60,7 @@ services: ports: - 30009:10003 - 22022 - image: corda/corda-zulu-java1.8-4.8 + image: corda/community:4.11.2-zulu-openjdk8 container_name: corda_network2_partyb_1 partyc: profiles: ["3-nodes"] @@ -79,5 +79,5 @@ services: ports: - 30012:10003 - 22022 - image: corda/corda-zulu-java1.8-4.8 + image: corda/community:4.11.2-zulu-openjdk8 container_name: corda_network2_partyc_1 diff --git a/weaver/tests/network-setups/corda/dev/Corda_Network2/settings.gradle b/weaver/tests/network-setups/corda/dev/Corda_Network2/settings.gradle new file mode 100644 index 0000000000..e69de29bb2 diff --git a/weaver/tests/network-setups/corda/gradle/wrapper/gradle-wrapper.jar b/weaver/tests/network-setups/corda/gradle/wrapper/gradle-wrapper.jar index 7a3265ee94..249e5832f0 100644 Binary files a/weaver/tests/network-setups/corda/gradle/wrapper/gradle-wrapper.jar and b/weaver/tests/network-setups/corda/gradle/wrapper/gradle-wrapper.jar differ diff --git a/weaver/tests/network-setups/corda/gradle/wrapper/gradle-wrapper.properties b/weaver/tests/network-setups/corda/gradle/wrapper/gradle-wrapper.properties index 0e9a610516..31cca49130 100644 --- a/weaver/tests/network-setups/corda/gradle/wrapper/gradle-wrapper.properties +++ b/weaver/tests/network-setups/corda/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip diff --git a/weaver/tests/network-setups/corda/gradlew b/weaver/tests/network-setups/corda/gradlew index cccdd3d517..a69d9cb6c2 100755 --- a/weaver/tests/network-setups/corda/gradlew +++ b/weaver/tests/network-setups/corda/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/weaver/tests/network-setups/corda/gradlew.bat b/weaver/tests/network-setups/corda/gradlew.bat index f9553162f1..f127cfd49d 100644 --- a/weaver/tests/network-setups/corda/gradlew.bat +++ b/weaver/tests/network-setups/corda/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,19 +25,22 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,38 +64,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/weaver/tests/network-setups/corda/makefile b/weaver/tests/network-setups/corda/makefile index 2f24107177..8452932db3 100644 --- a/weaver/tests/network-setups/corda/makefile +++ b/weaver/tests/network-setups/corda/makefile @@ -66,10 +66,18 @@ restart-with-new-interop-app: stop .PHONY: stop-network1 stop-network1: + docker exec corda_notary_1 bash -c "rm -rf /opt/corda/logs/*" || true + docker exec corda_partya_1 bash -c "rm -rf /opt/corda/logs/*" || true + (docker logs corda_partyb_1 > /dev/null && docker exec corda_partyb_1 bash -c "rm -rf /opt/corda/logs/*") || true + (docker logs corda_partyc_1 > /dev/null && docker exec corda_partyc_1 bash -c "rm -rf /opt/corda/logs/*") || true docker-compose -f dev/Corda_Network/docker-compose.yml -p corda --profile $(PROFILE) down --volumes || true .PHONY: stop-network2 stop-network2: + docker exec corda_network2_notary_1 bash -c "rm -rf /opt/corda/logs/*" || true + docker exec corda_network2_partya_1 bash -c "rm -rf /opt/corda/logs/*" || true + (docker logs corda_network2_partyb_1 > /dev/null && docker exec corda_network2_partyb_1 bash -c "rm -rf /opt/corda/logs/*") || true + (docker logs corda_network2_partyc_1 > /dev/null && docker exec corda_network2_partyc_1 bash -c "rm -rf /opt/corda/logs/*") || true docker-compose -f dev/Corda_Network2/docker-compose.yml -p corda_network2 --profile $(PROFILE) down --volumes || true stop: stop-network1 stop-network2 @@ -95,10 +103,19 @@ rebuild-network2: cd dev/Corda_Network2/build/nodes/PartyB && rm -rf corda.jar djvm logs cordapps/*.jar cd dev/Corda_Network2/build/nodes/PartyC && rm -rf corda.jar djvm logs cordapps/*.jar rm -rf dev/Corda_Network2/build/nodes/.cache + rm -rf dev/Corda_Network2/build/kotlin touch dev/Corda_Network2/build/nodes/Notary/cordapps/config/.gitkeep touch dev/Corda_Network2/build/nodes/PartyA/cordapps/config/.gitkeep touch dev/Corda_Network2/build/nodes/PartyB/cordapps/config/.gitkeep touch dev/Corda_Network2/build/nodes/PartyC/cordapps/config/.gitkeep + mkdir -p dev/Corda_Network2/build/nodes/Notary/logs/ + mkdir -p dev/Corda_Network2/build/nodes/PartyA/logs/ + mkdir -p dev/Corda_Network2/build/nodes/PartyB/logs/ + mkdir -p dev/Corda_Network2/build/nodes/PartyC/logs/ + touch dev/Corda_Network2/build/nodes/Notary/logs/.gitkeep + touch dev/Corda_Network2/build/nodes/PartyA/logs/.gitkeep + touch dev/Corda_Network2/build/nodes/PartyB/logs/.gitkeep + touch dev/Corda_Network2/build/nodes/PartyC/logs/.gitkeep rebuild-network1: ./gradlew -p dev/Corda_Network clean prepareDockerNodes @@ -107,8 +124,27 @@ rebuild-network1: cd dev/Corda_Network/build/nodes/PartyB && rm -rf corda.jar djvm logs cordapps/*.jar cd dev/Corda_Network/build/nodes/PartyC && rm -rf corda.jar djvm logs cordapps/*.jar rm -rf dev/Corda_Network/build/nodes/.cache + rm -rf dev/Corda_Network/build/kotlin touch dev/Corda_Network/build/nodes/Notary/cordapps/config/.gitkeep touch dev/Corda_Network/build/nodes/PartyA/cordapps/config/.gitkeep touch dev/Corda_Network/build/nodes/PartyB/cordapps/config/.gitkeep touch dev/Corda_Network/build/nodes/PartyC/cordapps/config/.gitkeep + mkdir -p dev/Corda_Network/build/nodes/Notary/logs/ + mkdir -p dev/Corda_Network/build/nodes/PartyA/logs/ + mkdir -p dev/Corda_Network/build/nodes/PartyB/logs/ + mkdir -p dev/Corda_Network/build/nodes/PartyC/logs/ + touch dev/Corda_Network/build/nodes/Notary/logs/.gitkeep + touch dev/Corda_Network/build/nodes/PartyA/logs/.gitkeep + touch dev/Corda_Network/build/nodes/PartyB/logs/.gitkeep + touch dev/Corda_Network/build/nodes/PartyC/logs/.gitkeep +backup-network1: + cp -r dev/Corda_Network/build ./shared/Corda_Network + +backup-network2: + cp -r dev/Corda_Network2/build ./shared/Corda_Network2 + +backup: backup-network1 backup-network2 + +delete-backup: + rm -rf ./shared/Corda_Network ./shared/Corda_Network2 diff --git a/weaver/tests/network-setups/corda/settings.gradle b/weaver/tests/network-setups/corda/settings.gradle new file mode 100644 index 0000000000..5faaa06d40 --- /dev/null +++ b/weaver/tests/network-setups/corda/settings.gradle @@ -0,0 +1 @@ +include 'dev' \ No newline at end of file diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/libs/Corda_Network-0.1.jar b/weaver/tests/network-setups/corda/shared/Corda_Network/libs/Corda_Network-0.1.jar new file mode 100644 index 0000000000..e8f0977a77 Binary files /dev/null and b/weaver/tests/network-setups/corda/shared/Corda_Network/libs/Corda_Network-0.1.jar differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/libs/corda-0.1.jar b/weaver/tests/network-setups/corda/shared/Corda_Network/libs/corda-0.1.jar deleted file mode 100644 index 4c08832542..0000000000 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/libs/corda-0.1.jar and /dev/null differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index 46eb9acd31..1fab4b08c0 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index eb44fa1933..158477765d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index f88f50b0a2..3ebad22947 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 7f40d0009e..7eae2d3ade 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/nodekeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/nodekeystore.jks index 69e0da7631..35c35913b7 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/nodekeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/nodekeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/sslkeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/sslkeystore.jks index a1e02fba20..3c6dbf1667 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/sslkeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/sslkeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/truststore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/truststore.jks index e0d78ca54b..52b80ea83e 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/truststore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/certificates/truststore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/cordapps/config/.gitkeep b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/cordapps/config/.gitkeep index 8b13789179..e69de29bb2 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/cordapps/config/.gitkeep +++ b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/cordapps/config/.gitkeep @@ -1 +0,0 @@ - diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/network-parameters b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/network-parameters index 8ef7cf9aff..3f80a24c61 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/network-parameters and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/network-parameters differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index 46eb9acd31..1fab4b08c0 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/persistence/persistence.mv.db b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/persistence/persistence.mv.db index 1e03cc7c77..8b4ab8e938 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/persistence/persistence.mv.db and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/persistence/persistence.mv.db differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/persistence/persistence.trace.db b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/persistence/persistence.trace.db index 4142d9531a..bc35b9c05a 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/persistence/persistence.trace.db +++ b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/Notary/persistence/persistence.trace.db @@ -1,51 +1,83 @@ -2021-10-20 05:53:17 jdbc[3]: exception -org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found; SQL statement: -select count(*) from node_checkpoints [42102-199] -2021-10-20 05:53:24 jdbc[3]: exception +2024-04-03 10:54:31.951000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found (this database is empty); SQL statement: +select count(*) from node_checkpoints [42104-224] +2024-04-03 10:54:36.207000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "DATABASECHANGELOGLOCK" not found; SQL statement: -SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-199] -2021-10-20 05:53:25 jdbc[3]: exception +SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-224] +2024-04-03 10:54:39.077000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.RELEVANCY_STATUS" not found; SQL statement: -select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) @@ -57,48 +89,165 @@ select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) at net.corda.node.Corda.main(Corda.kt:13) -2021-10-20 05:53:26 jdbc[3]: exception +2024-04-03 10:54:39.802000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.CONSUMING_TX_ID" not found; SQL statement: +select t.consuming_tx_id from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) + at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) + at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) + at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) + at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) + at picocli.CommandLine.execute(CommandLine.java:1173) + at picocli.CommandLine.access$800(CommandLine.java:141) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1367) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1335) + at picocli.CommandLine$AbstractParseResultHandler.handleParseResult(CommandLine.java:1243) + at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) + at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) + at net.corda.node.Corda.main(Corda.kt:13) +2024-04-03 10:54:40.826000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.STATE_MACHINE_RUN_ID" not found; SQL statement: -select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index 46eb9acd31..1fab4b08c0 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index eb44fa1933..158477765d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index f88f50b0a2..3ebad22947 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 7f40d0009e..7eae2d3ade 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/nodekeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/nodekeystore.jks index b600febbe3..1d03eb7d84 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/nodekeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/nodekeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/sslkeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/sslkeystore.jks index 65de672985..b0d3640280 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/sslkeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/sslkeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/truststore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/truststore.jks index 1e3e401f59..6c109e1b0f 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/truststore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/certificates/truststore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/cordapps/config/.gitkeep b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/cordapps/config/.gitkeep index 8b13789179..e69de29bb2 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/cordapps/config/.gitkeep +++ b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/cordapps/config/.gitkeep @@ -1 +0,0 @@ - diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/network-parameters b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/network-parameters index 8ef7cf9aff..3f80a24c61 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/network-parameters and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/network-parameters differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 7f40d0009e..7eae2d3ade 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/persistence/persistence.mv.db b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/persistence/persistence.mv.db index dad7885bc2..85240d6b14 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/persistence/persistence.mv.db and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/persistence/persistence.mv.db differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/persistence/persistence.trace.db b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/persistence/persistence.trace.db index 39dd969e79..cf05476db2 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/persistence/persistence.trace.db +++ b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyA/persistence/persistence.trace.db @@ -1,51 +1,83 @@ -2021-10-20 05:53:21 jdbc[3]: exception -org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found; SQL statement: -select count(*) from node_checkpoints [42102-199] -2021-10-20 05:53:28 jdbc[3]: exception +2024-04-03 10:54:31.774000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found (this database is empty); SQL statement: +select count(*) from node_checkpoints [42104-224] +2024-04-03 10:54:36.109000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "DATABASECHANGELOGLOCK" not found; SQL statement: -SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-199] -2021-10-20 05:53:29 jdbc[3]: exception +SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-224] +2024-04-03 10:54:38.748000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.RELEVANCY_STATUS" not found; SQL statement: -select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) @@ -57,48 +89,165 @@ select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) at net.corda.node.Corda.main(Corda.kt:13) -2021-10-20 05:53:29 jdbc[3]: exception +2024-04-03 10:54:39.502000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.CONSUMING_TX_ID" not found; SQL statement: +select t.consuming_tx_id from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) + at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) + at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) + at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) + at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) + at picocli.CommandLine.execute(CommandLine.java:1173) + at picocli.CommandLine.access$800(CommandLine.java:141) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1367) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1335) + at picocli.CommandLine$AbstractParseResultHandler.handleParseResult(CommandLine.java:1243) + at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) + at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) + at net.corda.node.Corda.main(Corda.kt:13) +2024-04-03 10:54:40.390000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.STATE_MACHINE_RUN_ID" not found; SQL statement: -select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index 46eb9acd31..1fab4b08c0 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index eb44fa1933..158477765d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index f88f50b0a2..3ebad22947 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 7f40d0009e..7eae2d3ade 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/nodekeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/nodekeystore.jks index 4f89eb3026..5c2ce55ecc 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/nodekeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/nodekeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/sslkeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/sslkeystore.jks index 07115dde51..f5ad1844f4 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/sslkeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/sslkeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/truststore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/truststore.jks index e66ce678e1..a2092cbdc2 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/truststore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/certificates/truststore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/cordapps/config/.gitkeep b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/cordapps/config/.gitkeep index 8b13789179..e69de29bb2 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/cordapps/config/.gitkeep +++ b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/cordapps/config/.gitkeep @@ -1 +0,0 @@ - diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/network-parameters b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/network-parameters index 8ef7cf9aff..3f80a24c61 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/network-parameters and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/network-parameters differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index f88f50b0a2..3ebad22947 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/persistence/persistence.mv.db b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/persistence/persistence.mv.db index 948a6630ce..8abc522e3f 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/persistence/persistence.mv.db and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/persistence/persistence.mv.db differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/persistence/persistence.trace.db b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/persistence/persistence.trace.db index a6e7d22b31..67151f1578 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/persistence/persistence.trace.db +++ b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyB/persistence/persistence.trace.db @@ -1,51 +1,83 @@ -2021-10-20 05:53:21 jdbc[3]: exception -org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found; SQL statement: -select count(*) from node_checkpoints [42102-199] -2021-10-20 05:53:27 jdbc[3]: exception +2024-04-03 10:54:30.135000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found (this database is empty); SQL statement: +select count(*) from node_checkpoints [42104-224] +2024-04-03 10:54:34.273000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "DATABASECHANGELOGLOCK" not found; SQL statement: -SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-199] -2021-10-20 05:53:28 jdbc[3]: exception +SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-224] +2024-04-03 10:54:36.853000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.RELEVANCY_STATUS" not found; SQL statement: -select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) @@ -57,48 +89,165 @@ select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) at net.corda.node.Corda.main(Corda.kt:13) -2021-10-20 05:53:29 jdbc[3]: exception +2024-04-03 10:54:37.348000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.CONSUMING_TX_ID" not found; SQL statement: +select t.consuming_tx_id from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) + at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) + at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) + at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) + at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) + at picocli.CommandLine.execute(CommandLine.java:1173) + at picocli.CommandLine.access$800(CommandLine.java:141) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1367) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1335) + at picocli.CommandLine$AbstractParseResultHandler.handleParseResult(CommandLine.java:1243) + at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) + at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) + at net.corda.node.Corda.main(Corda.kt:13) +2024-04-03 10:54:38.642000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.STATE_MACHINE_RUN_ID" not found; SQL statement: -select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index 46eb9acd31..1fab4b08c0 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index eb44fa1933..158477765d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index f88f50b0a2..3ebad22947 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 7f40d0009e..7eae2d3ade 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/nodekeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/nodekeystore.jks index 78a67c734f..6f0fb4636b 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/nodekeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/nodekeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/sslkeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/sslkeystore.jks index f5924ab7f6..8a2683956e 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/sslkeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/sslkeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/truststore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/truststore.jks index fc4fd931eb..1e7dd74709 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/truststore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/certificates/truststore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/cordapps/config/.gitkeep b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/cordapps/config/.gitkeep index 8b13789179..e69de29bb2 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/cordapps/config/.gitkeep +++ b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/cordapps/config/.gitkeep @@ -1 +0,0 @@ - diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/network-parameters b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/network-parameters index 8ef7cf9aff..3f80a24c61 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/network-parameters and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/network-parameters differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index eb44fa1933..158477765d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/persistence/persistence.mv.db b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/persistence/persistence.mv.db index 683da06795..781a2fb5d7 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/persistence/persistence.mv.db and b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/persistence/persistence.mv.db differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/persistence/persistence.trace.db b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/persistence/persistence.trace.db index 3587e599fd..a1075d1ea6 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/persistence/persistence.trace.db +++ b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/PartyC/persistence/persistence.trace.db @@ -1,51 +1,83 @@ -2021-10-20 05:53:21 jdbc[3]: exception -org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found; SQL statement: -select count(*) from node_checkpoints [42102-199] -2021-10-20 05:53:28 jdbc[3]: exception +2024-04-03 10:54:31.365000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found (this database is empty); SQL statement: +select count(*) from node_checkpoints [42104-224] +2024-04-03 10:54:35.645000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "DATABASECHANGELOGLOCK" not found; SQL statement: -SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-199] -2021-10-20 05:53:29 jdbc[3]: exception +SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-224] +2024-04-03 10:54:38.130000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.RELEVANCY_STATUS" not found; SQL statement: -select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) @@ -57,48 +89,165 @@ select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) at net.corda.node.Corda.main(Corda.kt:13) -2021-10-20 05:53:30 jdbc[3]: exception +2024-04-03 10:54:38.809000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.CONSUMING_TX_ID" not found; SQL statement: +select t.consuming_tx_id from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) + at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) + at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) + at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) + at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) + at picocli.CommandLine.execute(CommandLine.java:1173) + at picocli.CommandLine.access$800(CommandLine.java:141) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1367) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1335) + at picocli.CommandLine$AbstractParseResultHandler.handleParseResult(CommandLine.java:1243) + at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) + at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) + at net.corda.node.Corda.main(Corda.kt:13) +2024-04-03 10:54:40.080000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.STATE_MACHINE_RUN_ID" not found; SQL statement: -select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/docker-compose.yml b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/docker-compose.yml index aeec75cc7a..0e4fb8b178 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/docker-compose.yml +++ b/weaver/tests/network-setups/corda/shared/Corda_Network/nodes/docker-compose.yml @@ -1,66 +1,50 @@ version: '3' services: notary: - volumes: - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/Notary/node.conf:/etc/corda/node.conf - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/Notary/certificates:/opt/corda/certificates - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/Notary/logs:/opt/corda/logs - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/Notary/persistence:/opt/corda/persistence - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/Notary/cordapps:/opt/corda/cordapps - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/Notary/network-parameters:/opt/corda/network-parameters - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/Notary/additional-node-infos:/opt/corda/additional-node-infos - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/Notary/drivers:/opt/corda/drivers - environment: - - ACCEPT_LICENSE=${ACCEPT_LICENSE} - ports: - - 10003 - - 22022 - image: corda/corda-zulu-java1.8-4.8 + volumes: ['/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/node.conf:/etc/corda/node.conf', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/certificates:/opt/corda/certificates', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/logs:/opt/corda/logs', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/persistence:/opt/corda/persistence', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/cordapps:/opt/corda/cordapps', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/network-parameters:/opt/corda/network-parameters', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/additional-node-infos:/opt/corda/additional-node-infos', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/drivers:/opt/corda/drivers'] + environment: ['ACCEPT_LICENSE=${ACCEPT_LICENSE}'] + ports: [10003, 22022] + image: corda/community:4.11.2-zulu-openjdk8 partya: - volumes: - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyA/node.conf:/etc/corda/node.conf - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyA/certificates:/opt/corda/certificates - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyA/logs:/opt/corda/logs - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyA/persistence:/opt/corda/persistence - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyA/cordapps:/opt/corda/cordapps - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyA/network-parameters:/opt/corda/network-parameters - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyA/additional-node-infos:/opt/corda/additional-node-infos - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyA/drivers:/opt/corda/drivers - environment: - - ACCEPT_LICENSE=${ACCEPT_LICENSE} - ports: - - 10003 - - 22022 - image: corda/corda-zulu-java1.8-4.8 + volumes: ['/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/node.conf:/etc/corda/node.conf', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/certificates:/opt/corda/certificates', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/logs:/opt/corda/logs', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/persistence:/opt/corda/persistence', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/cordapps:/opt/corda/cordapps', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/network-parameters:/opt/corda/network-parameters', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/additional-node-infos:/opt/corda/additional-node-infos', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/drivers:/opt/corda/drivers'] + environment: ['ACCEPT_LICENSE=${ACCEPT_LICENSE}'] + ports: [10003, 22022] + image: corda/community:4.11.2-zulu-openjdk8 partyb: - volumes: - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyB/node.conf:/etc/corda/node.conf - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyB/certificates:/opt/corda/certificates - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyB/logs:/opt/corda/logs - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyB/persistence:/opt/corda/persistence - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyB/cordapps:/opt/corda/cordapps - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyB/network-parameters:/opt/corda/network-parameters - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyB/additional-node-infos:/opt/corda/additional-node-infos - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyB/drivers:/opt/corda/drivers - environment: - - ACCEPT_LICENSE=${ACCEPT_LICENSE} - ports: - - 10003 - - 22022 - image: corda/corda-zulu-java1.8-4.8 + volumes: ['/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/node.conf:/etc/corda/node.conf', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/certificates:/opt/corda/certificates', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/logs:/opt/corda/logs', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/persistence:/opt/corda/persistence', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/cordapps:/opt/corda/cordapps', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/network-parameters:/opt/corda/network-parameters', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/additional-node-infos:/opt/corda/additional-node-infos', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/drivers:/opt/corda/drivers'] + environment: ['ACCEPT_LICENSE=${ACCEPT_LICENSE}'] + ports: [10003, 22022] + image: corda/community:4.11.2-zulu-openjdk8 partyc: - volumes: - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyC/node.conf:/etc/corda/node.conf - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyC/certificates:/opt/corda/certificates - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyC/logs:/opt/corda/logs - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyC/persistence:/opt/corda/persistence - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyC/cordapps:/opt/corda/cordapps - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyC/network-parameters:/opt/corda/network-parameters - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyC/additional-node-infos:/opt/corda/additional-node-infos - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/build/nodes/PartyC/drivers:/opt/corda/drivers - environment: - - ACCEPT_LICENSE=${ACCEPT_LICENSE} - ports: - - 10003 - - 22022 - image: corda/corda-zulu-java1.8-4.8 + volumes: ['/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/node.conf:/etc/corda/node.conf', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/certificates:/opt/corda/certificates', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/logs:/opt/corda/logs', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/persistence:/opt/corda/persistence', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/cordapps:/opt/corda/cordapps', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/network-parameters:/opt/corda/network-parameters', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/additional-node-infos:/opt/corda/additional-node-infos', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/drivers:/opt/corda/drivers'] + environment: ['ACCEPT_LICENSE=${ACCEPT_LICENSE}'] + ports: [10003, 22022] + image: corda/community:4.11.2-zulu-openjdk8 diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/tmp/Notary_node.conf b/weaver/tests/network-setups/corda/shared/Corda_Network/tmp/prepareDockerNodes/Notary_node.conf similarity index 100% rename from weaver/tests/network-setups/corda/shared/Corda_Network/tmp/Notary_node.conf rename to weaver/tests/network-setups/corda/shared/Corda_Network/tmp/prepareDockerNodes/Notary_node.conf diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/tmp/PartyA_node.conf b/weaver/tests/network-setups/corda/shared/Corda_Network/tmp/prepareDockerNodes/PartyA_node.conf similarity index 100% rename from weaver/tests/network-setups/corda/shared/Corda_Network/tmp/PartyA_node.conf rename to weaver/tests/network-setups/corda/shared/Corda_Network/tmp/prepareDockerNodes/PartyA_node.conf diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/tmp/PartyB_node.conf b/weaver/tests/network-setups/corda/shared/Corda_Network/tmp/prepareDockerNodes/PartyB_node.conf similarity index 100% rename from weaver/tests/network-setups/corda/shared/Corda_Network/tmp/PartyB_node.conf rename to weaver/tests/network-setups/corda/shared/Corda_Network/tmp/prepareDockerNodes/PartyB_node.conf diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network/tmp/PartyC_node.conf b/weaver/tests/network-setups/corda/shared/Corda_Network/tmp/prepareDockerNodes/PartyC_node.conf similarity index 100% rename from weaver/tests/network-setups/corda/shared/Corda_Network/tmp/PartyC_node.conf rename to weaver/tests/network-setups/corda/shared/Corda_Network/tmp/prepareDockerNodes/PartyC_node.conf diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/libs/Corda_Network2-0.1.jar b/weaver/tests/network-setups/corda/shared/Corda_Network2/libs/Corda_Network2-0.1.jar index e8fc0b3ebe..b526688267 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/libs/Corda_Network2-0.1.jar and b/weaver/tests/network-setups/corda/shared/Corda_Network2/libs/Corda_Network2-0.1.jar differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index ca57d7e59b..09799f095d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index ce045b3e1a..91f9042907 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index 12774ec11f..8991d9aa81 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 78d923cbd1..9edbd809b6 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/nodekeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/nodekeystore.jks index 39e1b3a36c..8d7c62a6ea 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/nodekeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/nodekeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/sslkeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/sslkeystore.jks index b97ce78652..8eac0e5404 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/sslkeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/sslkeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/truststore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/truststore.jks index 9cfc58a72d..a9f44bdd5f 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/truststore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/certificates/truststore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/network-parameters b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/network-parameters index 325d2440af..090ff9c8d8 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/network-parameters and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/network-parameters differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index ca57d7e59b..09799f095d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/persistence/persistence.mv.db b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/persistence/persistence.mv.db index 976479118e..a1ace59989 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/persistence/persistence.mv.db and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/persistence/persistence.mv.db differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/persistence/persistence.trace.db b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/persistence/persistence.trace.db index 358edc13a5..c9c70317c8 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/persistence/persistence.trace.db +++ b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/Notary/persistence/persistence.trace.db @@ -1,51 +1,83 @@ -2021-10-26 10:39:38 jdbc[3]: exception -org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found; SQL statement: -select count(*) from node_checkpoints [42102-199] -2021-10-26 10:39:45 jdbc[3]: exception +2024-04-03 10:56:53.161000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found (this database is empty); SQL statement: +select count(*) from node_checkpoints [42104-224] +2024-04-03 10:56:57.447000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "DATABASECHANGELOGLOCK" not found; SQL statement: -SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-199] -2021-10-26 10:39:46 jdbc[3]: exception +SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-224] +2024-04-03 10:57:00.295000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.RELEVANCY_STATUS" not found; SQL statement: -select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) @@ -57,48 +89,165 @@ select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) at net.corda.node.Corda.main(Corda.kt:13) -2021-10-26 10:39:47 jdbc[3]: exception +2024-04-03 10:57:00.914000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.CONSUMING_TX_ID" not found; SQL statement: +select t.consuming_tx_id from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) + at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) + at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) + at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) + at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) + at picocli.CommandLine.execute(CommandLine.java:1173) + at picocli.CommandLine.access$800(CommandLine.java:141) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1367) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1335) + at picocli.CommandLine$AbstractParseResultHandler.handleParseResult(CommandLine.java:1243) + at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) + at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) + at net.corda.node.Corda.main(Corda.kt:13) +2024-04-03 10:57:02.295000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.STATE_MACHINE_RUN_ID" not found; SQL statement: -select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index ca57d7e59b..09799f095d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index ce045b3e1a..91f9042907 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index 12774ec11f..8991d9aa81 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 78d923cbd1..9edbd809b6 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/nodekeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/nodekeystore.jks index 959c3ac9b7..2ff5c8a23d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/nodekeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/nodekeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/sslkeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/sslkeystore.jks index 9e3717dac8..20c01e48e4 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/sslkeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/sslkeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/truststore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/truststore.jks index 548057fa07..80bdd43ce7 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/truststore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/certificates/truststore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/network-parameters b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/network-parameters index 325d2440af..090ff9c8d8 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/network-parameters and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/network-parameters differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 78d923cbd1..9edbd809b6 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/persistence/persistence.mv.db b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/persistence/persistence.mv.db index 8817d45f72..959cf08356 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/persistence/persistence.mv.db and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/persistence/persistence.mv.db differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/persistence/persistence.trace.db b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/persistence/persistence.trace.db index b89e9e8bae..a302ccaa00 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/persistence/persistence.trace.db +++ b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyA/persistence/persistence.trace.db @@ -1,51 +1,83 @@ -2021-10-26 10:39:39 jdbc[3]: exception -org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found; SQL statement: -select count(*) from node_checkpoints [42102-199] -2021-10-26 10:39:45 jdbc[3]: exception +2024-04-03 10:56:56.410000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found (this database is empty); SQL statement: +select count(*) from node_checkpoints [42104-224] +2024-04-03 10:57:00.577000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "DATABASECHANGELOGLOCK" not found; SQL statement: -SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-199] -2021-10-26 10:39:46 jdbc[3]: exception +SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-224] +2024-04-03 10:57:02.808000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.RELEVANCY_STATUS" not found; SQL statement: -select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) @@ -57,48 +89,165 @@ select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) at net.corda.node.Corda.main(Corda.kt:13) -2021-10-26 10:39:47 jdbc[3]: exception +2024-04-03 10:57:03.448000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.CONSUMING_TX_ID" not found; SQL statement: +select t.consuming_tx_id from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) + at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) + at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) + at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) + at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) + at picocli.CommandLine.execute(CommandLine.java:1173) + at picocli.CommandLine.access$800(CommandLine.java:141) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1367) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1335) + at picocli.CommandLine$AbstractParseResultHandler.handleParseResult(CommandLine.java:1243) + at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) + at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) + at net.corda.node.Corda.main(Corda.kt:13) +2024-04-03 10:57:04.445000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.STATE_MACHINE_RUN_ID" not found; SQL statement: -select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index ca57d7e59b..09799f095d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index ce045b3e1a..91f9042907 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index 12774ec11f..8991d9aa81 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 78d923cbd1..9edbd809b6 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/nodekeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/nodekeystore.jks index 096088f391..6f01bd579e 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/nodekeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/nodekeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/sslkeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/sslkeystore.jks index 1aab41716e..b10857aa8a 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/sslkeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/sslkeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/truststore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/truststore.jks index 01973d981a..1a34fe31d1 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/truststore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/certificates/truststore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/network-parameters b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/network-parameters index 325d2440af..090ff9c8d8 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/network-parameters and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/network-parameters differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index 12774ec11f..8991d9aa81 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/persistence/persistence.mv.db b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/persistence/persistence.mv.db index 747f5b853c..8d848b60ec 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/persistence/persistence.mv.db and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/persistence/persistence.mv.db differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/persistence/persistence.trace.db b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/persistence/persistence.trace.db index 0d13c7b68e..bf91cadbbc 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/persistence/persistence.trace.db +++ b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyB/persistence/persistence.trace.db @@ -1,51 +1,83 @@ -2021-10-26 10:39:38 jdbc[3]: exception -org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found; SQL statement: -select count(*) from node_checkpoints [42102-199] -2021-10-26 10:39:44 jdbc[3]: exception +2024-04-03 10:56:56.416000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found (this database is empty); SQL statement: +select count(*) from node_checkpoints [42104-224] +2024-04-03 10:57:00.954000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "DATABASECHANGELOGLOCK" not found; SQL statement: -SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-199] -2021-10-26 10:39:45 jdbc[3]: exception +SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-224] +2024-04-03 10:57:03.561000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.RELEVANCY_STATUS" not found; SQL statement: -select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) @@ -57,48 +89,165 @@ select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) at net.corda.node.Corda.main(Corda.kt:13) -2021-10-26 10:39:46 jdbc[3]: exception +2024-04-03 10:57:04.206000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.CONSUMING_TX_ID" not found; SQL statement: +select t.consuming_tx_id from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) + at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) + at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) + at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) + at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) + at picocli.CommandLine.execute(CommandLine.java:1173) + at picocli.CommandLine.access$800(CommandLine.java:141) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1367) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1335) + at picocli.CommandLine$AbstractParseResultHandler.handleParseResult(CommandLine.java:1243) + at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) + at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) + at net.corda.node.Corda.main(Corda.kt:13) +2024-04-03 10:57:05.694000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.STATE_MACHINE_RUN_ID" not found; SQL statement: -select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE index ca57d7e59b..09799f095d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-777DA369F066FE34BEDE3E6334A1006A4026A02DD76AFA798204BD015C9965DE differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index ce045b3e1a..91f9042907 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB index 12774ec11f..8991d9aa81 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-7B8AF0AFE12D3B3993C45192A142CF0C30CC712BD66A8EF34F152A377D07AFEB differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A index 78d923cbd1..9edbd809b6 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/additional-node-infos/nodeInfo-E4477B559304AADFC0638772C0956A38FA2E2A7A5EB0E65D0D83E5884831879A differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/nodekeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/nodekeystore.jks index 8d4259292f..18bfc11b94 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/nodekeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/nodekeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/sslkeystore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/sslkeystore.jks index 8ccbbf3540..4d334e4543 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/sslkeystore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/sslkeystore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/truststore.jks b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/truststore.jks index ee422ba943..eb9897c8c8 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/truststore.jks and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/certificates/truststore.jks differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/network-parameters b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/network-parameters index 325d2440af..090ff9c8d8 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/network-parameters and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/network-parameters differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E index ce045b3e1a..91f9042907 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/nodeInfo-792779944AF580192A4510FC31680E19EE0C5F519756FA158E989D14B7F2847E differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/persistence/persistence.mv.db b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/persistence/persistence.mv.db index c5c7b65f50..f23cc49d1d 100644 Binary files a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/persistence/persistence.mv.db and b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/persistence/persistence.mv.db differ diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/persistence/persistence.trace.db b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/persistence/persistence.trace.db index ce32b89fb2..5ab51320fe 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/persistence/persistence.trace.db +++ b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/PartyC/persistence/persistence.trace.db @@ -1,51 +1,83 @@ -2021-10-26 10:39:34 jdbc[3]: exception -org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found; SQL statement: -select count(*) from node_checkpoints [42102-199] -2021-10-26 10:39:41 jdbc[3]: exception +2024-04-03 10:56:57.109000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "NODE_CHECKPOINTS" not found (this database is empty); SQL statement: +select count(*) from node_checkpoints [42104-224] +2024-04-03 10:57:01.163000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Table "DATABASECHANGELOGLOCK" not found; SQL statement: -SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-199] -2021-10-26 10:39:42 jdbc[3]: exception +SELECT COUNT(*) FROM PUBLIC.DATABASECHANGELOGLOCK [42102-224] +2024-04-03 10:57:03.627000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.RELEVANCY_STATUS" not found; SQL statement: -select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) @@ -57,48 +89,165 @@ select t.relevancy_status from PUBLIC.vault_states t where 0=1 [42122-199] at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) at net.corda.node.Corda.main(Corda.kt:13) -2021-10-26 10:39:43 jdbc[3]: exception +2024-04-03 10:57:04.404000Z jdbc[3]: exception +org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.CONSUMING_TX_ID" not found; SQL statement: +select t.consuming_tx_id from PUBLIC.vault_states t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) + at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) + at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) + at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) + at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) + at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) + at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) + at picocli.CommandLine.execute(CommandLine.java:1173) + at picocli.CommandLine.access$800(CommandLine.java:141) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1367) + at picocli.CommandLine$RunLast.handle(CommandLine.java:1335) + at picocli.CommandLine$AbstractParseResultHandler.handleParseResult(CommandLine.java:1243) + at picocli.CommandLine.parseWithHandlers(CommandLine.java:1526) + at net.corda.cliutils.CordaCliWrapperKt.start(CordaCliWrapper.kt:89) + at net.corda.node.Corda.main(Corda.kt:13) +2024-04-03 10:57:05.346000Z jdbc[3]: exception org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "T.STATE_MACHINE_RUN_ID" not found; SQL statement: -select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-199] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:451) - at org.h2.message.DbException.getJdbcSQLException(DbException.java:427) - at org.h2.message.DbException.get(DbException.java:205) - at org.h2.message.DbException.get(DbException.java:181) - at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:176) - at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:158) - at org.h2.command.dml.Select.prepare(Select.java:1245) - at org.h2.command.Parser.prepareCommand(Parser.java:689) - at org.h2.engine.Session.prepareLocal(Session.java:627) - at org.h2.engine.Session.prepareCommand(Session.java:565) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1292) - at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:78) +select t.state_machine_run_id from PUBLIC.node_transactions t where 0=1 [42122-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:514) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.expression.ExpressionColumn.getColumnException(ExpressionColumn.java:244) + at org.h2.expression.ExpressionColumn.optimizeOther(ExpressionColumn.java:226) + at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:213) + at org.h2.command.query.Select.prepareExpressions(Select.java:1170) + at org.h2.command.query.Query.prepare(Query.java:218) + at org.h2.command.Parser.prepareCommand(Parser.java:489) + at org.h2.engine.SessionLocal.prepareLocal(SessionLocal.java:639) + at org.h2.engine.SessionLocal.prepareCommand(SessionLocal.java:559) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1166) + at org.h2.jdbc.JdbcStatement.executeQuery(JdbcStatement.java:94) at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111) at com.zaxxer.hikari.pool.HikariProxyStatement.executeQuery(HikariProxyStatement.java) at liquibase.precondition.core.ColumnExistsPrecondition.checkFast(ColumnExistsPrecondition.java:164) at liquibase.precondition.core.ColumnExistsPrecondition.check(ColumnExistsPrecondition.java:82) - at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:40) - at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:45) - at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:215) - at liquibase.changelog.ChangeSet.execute(ChangeSet.java:516) - at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:53) - at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:83) - at liquibase.Liquibase.update(Liquibase.java:202) - at liquibase.Liquibase.update(Liquibase.java:179) - at liquibase.Liquibase.update(Liquibase.java:175) - at liquibase.Liquibase.update(Liquibase.java:168) - at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:67) - at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:485) + at liquibase.precondition.core.NotPrecondition.check(NotPrecondition.java:34) + at liquibase.precondition.core.AndPrecondition.check(AndPrecondition.java:39) + at liquibase.precondition.core.PreconditionContainer.check(PreconditionContainer.java:213) + at liquibase.changelog.ChangeSet.execute(ChangeSet.java:617) + at liquibase.changelog.visitor.UpdateVisitor.visit(UpdateVisitor.java:59) + at liquibase.changelog.ChangeLogIterator$2.lambda$null$0(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.changelog.ChangeLogIterator$2.lambda$run$1(ChangeLogIterator.java:124) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.changelog.ChangeLogIterator$2.run(ChangeLogIterator.java:105) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Scope.child(Scope.java:260) + at liquibase.changelog.ChangeLogIterator.run(ChangeLogIterator.java:75) + at liquibase.Liquibase.lambda$null$0(Liquibase.java:297) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Scope.child(Scope.java:256) + at liquibase.Liquibase.lambda$update$1(Liquibase.java:295) + at liquibase.Scope.lambda$child$0(Scope.java:187) + at liquibase.Scope.child(Scope.java:196) + at liquibase.Scope.child(Scope.java:186) + at liquibase.Scope.child(Scope.java:165) + at liquibase.Liquibase.runInScope(Liquibase.java:2639) + at liquibase.Liquibase.update(Liquibase.java:236) + at liquibase.Liquibase.update(Liquibase.java:221) + at liquibase.Liquibase.update(Liquibase.java:207) + at liquibase.Liquibase.update(Liquibase.java:197) + at net.corda.nodeapi.internal.persistence.SchemaMigration.runMigration(SchemaMigration.kt:77) + at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:477) at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:202) - at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1343) - at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:482) - at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:574) + at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1419) + at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:474) + at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:497) at net.corda.node.internal.subcommands.RunMigrationScriptsCli$runProgram$2.run(RunMigrationScriptsCli.kt:25) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:212) - at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:551) - at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:151) - at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:211) - at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:163) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:230) + at net.corda.node.internal.NodeStartup$initialiseAndRun$5.invoke(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartupLogging$DefaultImpls.attempt(NodeStartup.kt:561) + at net.corda.node.internal.NodeStartup.attempt(NodeStartup.kt:169) + at net.corda.node.internal.NodeStartup.initialiseAndRun(NodeStartup.kt:229) + at net.corda.node.internal.NodeStartup.initialiseAndRun$default(NodeStartup.kt:181) at net.corda.node.internal.subcommands.RunMigrationScriptsCli.runProgram(RunMigrationScriptsCli.kt:23) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:153) at net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:116) diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/docker-compose.yml b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/docker-compose.yml index 0431026aec..0af45bd810 100644 --- a/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/docker-compose.yml +++ b/weaver/tests/network-setups/corda/shared/Corda_Network2/nodes/docker-compose.yml @@ -1,66 +1,50 @@ version: '3' services: notary: - volumes: - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/node.conf:/etc/corda/node.conf - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/certificates:/opt/corda/certificates - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/logs:/opt/corda/logs - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/persistence:/opt/corda/persistence - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/cordapps:/opt/corda/cordapps - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/network-parameters:/opt/corda/network-parameters - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/additional-node-infos:/opt/corda/additional-node-infos - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/drivers:/opt/corda/drivers - environment: - - ACCEPT_LICENSE=${ACCEPT_LICENSE} - ports: - - 10003 - - 22022 - image: corda/corda-zulu-java1.8-4.8 + volumes: ['/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/node.conf:/etc/corda/node.conf', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/certificates:/opt/corda/certificates', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/logs:/opt/corda/logs', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/persistence:/opt/corda/persistence', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/cordapps:/opt/corda/cordapps', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/network-parameters:/opt/corda/network-parameters', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/additional-node-infos:/opt/corda/additional-node-infos', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/drivers:/opt/corda/drivers'] + environment: ['ACCEPT_LICENSE=${ACCEPT_LICENSE}'] + ports: [10003, 22022] + image: corda/community:4.11.2-zulu-openjdk8 partya: - volumes: - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/node.conf:/etc/corda/node.conf - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/certificates:/opt/corda/certificates - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/logs:/opt/corda/logs - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/persistence:/opt/corda/persistence - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/cordapps:/opt/corda/cordapps - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/network-parameters:/opt/corda/network-parameters - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/additional-node-infos:/opt/corda/additional-node-infos - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/drivers:/opt/corda/drivers - environment: - - ACCEPT_LICENSE=${ACCEPT_LICENSE} - ports: - - 10003 - - 22022 - image: corda/corda-zulu-java1.8-4.8 + volumes: ['/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/node.conf:/etc/corda/node.conf', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/certificates:/opt/corda/certificates', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/logs:/opt/corda/logs', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/persistence:/opt/corda/persistence', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/cordapps:/opt/corda/cordapps', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/network-parameters:/opt/corda/network-parameters', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/additional-node-infos:/opt/corda/additional-node-infos', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/drivers:/opt/corda/drivers'] + environment: ['ACCEPT_LICENSE=${ACCEPT_LICENSE}'] + ports: [10003, 22022] + image: corda/community:4.11.2-zulu-openjdk8 partyb: - volumes: - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/node.conf:/etc/corda/node.conf - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/certificates:/opt/corda/certificates - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/logs:/opt/corda/logs - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/persistence:/opt/corda/persistence - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/cordapps:/opt/corda/cordapps - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/network-parameters:/opt/corda/network-parameters - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/additional-node-infos:/opt/corda/additional-node-infos - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/drivers:/opt/corda/drivers - environment: - - ACCEPT_LICENSE=${ACCEPT_LICENSE} - ports: - - 10003 - - 22022 - image: corda/corda-zulu-java1.8-4.8 + volumes: ['/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/node.conf:/etc/corda/node.conf', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/certificates:/opt/corda/certificates', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/logs:/opt/corda/logs', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/persistence:/opt/corda/persistence', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/cordapps:/opt/corda/cordapps', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/network-parameters:/opt/corda/network-parameters', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/additional-node-infos:/opt/corda/additional-node-infos', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/drivers:/opt/corda/drivers'] + environment: ['ACCEPT_LICENSE=${ACCEPT_LICENSE}'] + ports: [10003, 22022] + image: corda/community:4.11.2-zulu-openjdk8 partyc: - volumes: - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/node.conf:/etc/corda/node.conf - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/certificates:/opt/corda/certificates - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/logs:/opt/corda/logs - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/persistence:/opt/corda/persistence - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/cordapps:/opt/corda/cordapps - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/network-parameters:/opt/corda/network-parameters - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/additional-node-infos:/opt/corda/additional-node-infos - - /data/dlt-interop/weaver-fork/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/drivers:/opt/corda/drivers - environment: - - ACCEPT_LICENSE=${ACCEPT_LICENSE} - ports: - - 10003 - - 22022 - image: corda/corda-zulu-java1.8-4.8 + volumes: ['/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/node.conf:/etc/corda/node.conf', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/certificates:/opt/corda/certificates', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/logs:/opt/corda/logs', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/persistence:/opt/corda/persistence', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/cordapps:/opt/corda/cordapps', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/network-parameters:/opt/corda/network-parameters', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/additional-node-infos:/opt/corda/additional-node-infos', + '/data/dlt-interop/cacti-fork/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/drivers:/opt/corda/drivers'] + environment: ['ACCEPT_LICENSE=${ACCEPT_LICENSE}'] + ports: [10003, 22022] + image: corda/community:4.11.2-zulu-openjdk8 diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/Notary_node.conf b/weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/prepareDockerNodes/Notary_node.conf similarity index 100% rename from weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/Notary_node.conf rename to weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/prepareDockerNodes/Notary_node.conf diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/PartyA_node.conf b/weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/prepareDockerNodes/PartyA_node.conf similarity index 100% rename from weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/PartyA_node.conf rename to weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/prepareDockerNodes/PartyA_node.conf diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/PartyB_node.conf b/weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/prepareDockerNodes/PartyB_node.conf similarity index 100% rename from weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/PartyB_node.conf rename to weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/prepareDockerNodes/PartyB_node.conf diff --git a/weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/PartyC_node.conf b/weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/prepareDockerNodes/PartyC_node.conf similarity index 100% rename from weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/PartyC_node.conf rename to weaver/tests/network-setups/corda/shared/Corda_Network2/tmp/prepareDockerNodes/PartyC_node.conf