diff --git a/.github/workflows/test_weaver-asset-exchange-corda.yaml b/.github/workflows/test_weaver-asset-exchange-corda.yaml
index 22afaae7bd..43cc3dfc0d 100644
--- a/.github/workflows/test_weaver-asset-exchange-corda.yaml
+++ b/.github/workflows/test_weaver-asset-exchange-corda.yaml
@@ -47,10 +47,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
       # CORDA NETWORK
@@ -144,10 +144,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Build Java Protos
@@ -248,10 +248,10 @@ jobs:
               - './weaver/**'
               - '.github/workflows/test_weaver-asset-exchange-corda.yaml'
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
       # CORDA NETWORK
diff --git a/.github/workflows/test_weaver-asset-transfer.yaml b/.github/workflows/test_weaver-asset-transfer.yaml
index a84241af81..932982478c 100644
--- a/.github/workflows/test_weaver-asset-transfer.yaml
+++ b/.github/workflows/test_weaver-asset-transfer.yaml
@@ -50,10 +50,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go
@@ -85,9 +85,7 @@ jobs:
         working-directory: weaver/tests/network-setups/corda
 
       - name: Start Corda Network
-        run: |
-          sed -i "/docker logs corda_partya_1 -f/"' s/^/#/' "scripts/start-nodes.sh"
-          make start &> corda-net.out &
+        run: make start &> corda-net.out &
         working-directory: weaver/tests/network-setups/corda
 
       # FABRIC NETWORK
@@ -695,10 +693,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go
@@ -789,9 +787,7 @@ jobs:
 
       # CORDA NETWORK
       - name: Start Corda Network
-        run: |
-          sed -i "/docker logs corda_partya_1 -f/"' s/^/#/' "scripts/start-nodes.sh"
-          make start-local &> corda-net.out &
+        run: make start-local &> corda-net.out &
         working-directory: weaver/tests/network-setups/corda
 
       # FABRIC NETWORK
diff --git a/.github/workflows/test_weaver-corda-interop-app.yaml b/.github/workflows/test_weaver-corda-interop-app.yaml
index 2fd86fa288..bd65c6e9a5 100644
--- a/.github/workflows/test_weaver-corda-interop-app.yaml
+++ b/.github/workflows/test_weaver-corda-interop-app.yaml
@@ -43,10 +43,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4.1.7
 
-    - name: Set up JDK 8
+    - name: Set up JDK 17
       uses: actions/setup-java@v3.11.0
       with:
-        java-version: '8'
+        java-version: '17'
         distribution: 'adopt'
 
     - name: Build Protos (Local)
diff --git a/.github/workflows/test_weaver-data-sharing.yaml b/.github/workflows/test_weaver-data-sharing.yaml
index 48ed9142d3..28c40df9fe 100644
--- a/.github/workflows/test_weaver-data-sharing.yaml
+++ b/.github/workflows/test_weaver-data-sharing.yaml
@@ -50,10 +50,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go
@@ -85,9 +85,7 @@ jobs:
         working-directory: weaver/tests/network-setups/corda
 
       - name: Start Corda Network
-        run: |
-          sed -i "/docker logs corda_partya_1 -f/"' s/^/#/' "scripts/start-nodes.sh"
-          make start &> corda-net.out &
+        run: make start &> corda-net.out &
         working-directory: weaver/tests/network-setups/corda
 
       # FABRIC NETWORK
@@ -244,11 +242,11 @@ jobs:
           # CORDA2-CORDA
 
           NETWORK_NAME=Corda_Network2 CORDA_PORT=30006 ./clients/build/install/clients/bin/clients request-state localhost:9082 relay-corda:9081/Corda_Network/corda_partya_1:10003#com.cordaSimpleApplication.flow.GetStateByKey:C 1> tmp.out
-          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           NETWORK_NAME=Corda_Network2 CORDA_PORT=30006 ./clients/build/install/clients/bin/clients get-state C 1> tmp.out
-          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           # CORDA - FABRIC1
@@ -340,11 +338,11 @@ jobs:
           cp chaincode.json.template chaincode.json
           sed -i "s/\"args\"\: \[\"a\"/\"args\"\: \[\"C\"/g" chaincode.json
           ./bin/fabric-cli interop --local-network=network2 --sign=true --requesting-org=Org1MSP relay-corda:9081/Corda_Network/corda_partya_1:10003#com.cordaSimpleApplication.flow.GetStateByKey:C --debug=true &> tmp.out
-          tail -n 1 tmp.out | grep "Args: C, \[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          tail -n 1 tmp.out | grep "Args: C, \[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           ./bin/fabric-cli chaincode query mychannel simplestate read '["C"]' --local-network=network2 &> tmp.out
-          tail -n 1 tmp.out | grep "Result from network query: \[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          tail -n 1 tmp.out | grep "Result from network query: \[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
 
@@ -409,7 +407,17 @@ jobs:
   data-sharing-docker-local:
     needs: check_code_changed
     if:  inputs.run_all == 'true' || needs.check_code_changed.outputs.status == 'true'
-    # if: ${{ false }}
+    env:
+      FREE_UP_GITHUB_RUNNER_DISK_SPACE_DISABLED: false
+      CONFIGURE_DISABLED: true
+      TOOLS_VALIDATE_BUNDLE_NAMES_DISABLED: true
+      CUSTOM_CHECKS_DISABLED: true
+      JEST_TEST_RUNNER_DISABLED: true
+      TAPE_TEST_RUNNER_DISABLED: true
+      DUMP_DISK_USAGE_INFO_DISABLED: true
+      FULL_BUILD_DISABLED: true
+      CHECK_WORK_TREE_STATUS_DISABLED: true
+
     # The type of runner that the job will run on
     runs-on: ubuntu-22.04
 
@@ -426,10 +434,10 @@ jobs:
               - './weaver/**'
               - '.github/workflows/test_weaver-data-sharing.yaml'
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go
@@ -446,9 +454,13 @@ jobs:
         run: |
           curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-x86_64.zip
           unzip protoc-3.15.6-linux-x86_64.zip -d protoc
+          rm -rf protoc-3.15.6-linux-x86_64.zip
           go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
           go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
 
+      - name: CI script for cleanup
+        run: ./tools/ci.sh
+
       # PROTOS
       - name: Build GO Protos
         run: |
@@ -505,9 +517,7 @@ jobs:
         working-directory: weaver/core/identity-management/iin-agent
 
       - name: Start Corda Network
-        run: |
-          sed -i "/docker logs corda_partya_1 -f/"' s/^/#/' "scripts/start-nodes.sh"
-          make start-local &> corda-net.out &
+        run: make start-local &> corda-net.out &
         working-directory: weaver/tests/network-setups/corda
 
       # FABRIC NETWORK
@@ -669,11 +679,11 @@ jobs:
           # CORDA2-CORDA
 
           NETWORK_NAME=Corda_Network2 CORDA_PORT=30006 ./clients/build/install/clients/bin/clients request-state --wkey=C localhost:9082 relay-corda:9081/Corda_Network/corda_partya_1:10003#com.cordaSimpleApplication.flow.GetStateByKey:C 1> tmp.out
-          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           NETWORK_NAME=Corda_Network2 CORDA_PORT=30006 ./clients/build/install/clients/bin/clients get-state C 1> tmp.out
-          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           # CORDA - FABRIC1
@@ -765,11 +775,11 @@ jobs:
           cp chaincode.json.template chaincode.json
           sed -i "s/\"args\"\: \[\"a\"/\"args\"\: \[\"C\"/g" chaincode.json
           ./bin/fabric-cli interop --local-network=network2 --sign=true --requesting-org=Org1MSP relay-corda:9081/Corda_Network/corda_partya_1:10003#com.cordaSimpleApplication.flow.GetStateByKey:C --debug=true &> tmp.out
-          tail -n 1 tmp.out | grep "Args: C, \[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          tail -n 1 tmp.out | grep "Args: C, \[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           ./bin/fabric-cli chaincode query mychannel simplestate read '["C"]' --local-network=network2 &> tmp.out
-          tail -n 1 tmp.out | grep "Result from network query: \[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          tail -n 1 tmp.out | grep "Result from network query: \[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
 
@@ -851,10 +861,10 @@ jobs:
               - './weaver/**'
               - '.github/workflows/test_weaver-data-sharing.yaml'
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Set up Go
@@ -945,9 +955,7 @@ jobs:
 
       # CORDA NETWORK
       - name: Start Corda Network
-        run: |
-          sed -i "/docker logs corda_partya_1 -f/"' s/^/#/' "scripts/start-nodes.sh"
-          make start-local &> corda-net.out &
+        run: make start-local &> corda-net.out &
         working-directory: weaver/tests/network-setups/corda
 
       # FABRIC NETWORK
@@ -1097,11 +1105,11 @@ jobs:
           # CORDA2-CORDA
 
           NETWORK_NAME=Corda_Network2 CORDA_PORT=30006 ./clients/build/install/clients/bin/clients request-state --wkey=C localhost:9082 localhost:9081/Corda_Network/localhost:10006#com.cordaSimpleApplication.flow.GetStateByKey:C 1> tmp.out
-          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           NETWORK_NAME=Corda_Network2 CORDA_PORT=30006 ./clients/build/install/clients/bin/clients get-state C 1> tmp.out
-          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          cat tmp.out | grep "SimpleState(key=C, value=\[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           # CORDA - FABRIC1
@@ -1193,11 +1201,11 @@ jobs:
           cp chaincode.json.template chaincode.json
           sed -i "s/\"args\"\: \[\"a\"/\"args\"\: \[\"C\"/g" chaincode.json
           ./bin/fabric-cli interop --local-network=network2 --sign=true --requesting-org=Org1MSP localhost:9081/Corda_Network/localhost:10006#com.cordaSimpleApplication.flow.GetStateByKey:C --debug=true --debug=true &> tmp.out
-          tail -n 1 tmp.out | grep "Args: C, \[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          tail -n 1 tmp.out | grep "Args: C, \[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
           ./bin/fabric-cli chaincode query mychannel simplestate read '["C"]' --local-network=network2 &> tmp.out
-          tail -n 1 tmp.out | grep "Result from network query: \[SimpleState(key=C, value=20" && COUNT=$(( COUNT + 1 )) && echo "PASS"
+          tail -n 1 tmp.out | grep "Result from network query: \[SimpleState(key=C, value=6" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
 
 
diff --git a/.github/workflows/test_weaver-docker-build.yaml b/.github/workflows/test_weaver-docker-build.yaml
index 5477dd6f09..e7ae904e5f 100644
--- a/.github/workflows/test_weaver-docker-build.yaml
+++ b/.github/workflows/test_weaver-docker-build.yaml
@@ -133,10 +133,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
 
       - name: Build Protos (Local)
diff --git a/.github/workflows/test_weaver-fabric-fabric-satp.yaml b/.github/workflows/test_weaver-fabric-fabric-satp.yaml
index faf017c33b..87345bd2db 100644
--- a/.github/workflows/test_weaver-fabric-fabric-satp.yaml
+++ b/.github/workflows/test_weaver-fabric-fabric-satp.yaml
@@ -43,12 +43,6 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3.11.0
-        with:
-          java-version: '8'
-          distribution: 'adopt'
   
       - name: Set up Go
         uses: actions/setup-go@v4.0.0
diff --git a/.github/workflows/weaver_deploy_corda-pkgs.yml b/.github/workflows/weaver_deploy_corda-pkgs.yml
index 77cd3e66bf..74319675cb 100644
--- a/.github/workflows/weaver_deploy_corda-pkgs.yml
+++ b/.github/workflows/weaver_deploy_corda-pkgs.yml
@@ -23,10 +23,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
       
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           
       - name: Generate github.properties
@@ -60,10 +60,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
       
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           
       - name: Generate github.properties
@@ -100,10 +100,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4.1.7
       
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3.11.0
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           
       - name: Generate github.properties
diff --git a/weaver/common/protos-java-kt/build.gradle b/weaver/common/protos-java-kt/build.gradle
index 6ff9a3a559..d7e20b2950 100644
--- a/weaver/common/protos-java-kt/build.gradle
+++ b/weaver/common/protos-java-kt/build.gradle
@@ -1,9 +1,12 @@
+import static org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+import static org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+
 buildscript {
-    ext.coroutines_version = "1.3.7"
-    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.coroutines_version = "1.8.1"
+    ext.protobuf_version = "3.25.3"
+    ext.grpc_version = "1.65.0" // CURRENT_GRPC_VERSION
+    ext.grpc_kotlin_version = "1.4.1" // CURRENT_GRPC_KOTLIN_VERSION
+    ext.kotlin_version = "1.9.23"
     
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -15,7 +18,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'
 }
 
@@ -23,21 +26,29 @@ repositories {
 	mavenLocal()
 	mavenCentral()
 	maven { url 'https://repo1.maven.org/maven2' }
-	maven { url 'https://download.corda.net/maven/corda-dependencies/' }
 	maven { url 'https://jitpack.io' }
 }
 
 apply plugin: 'kotlin'
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-    kotlinOptions {
-        languageVersion = "1.3"
-        apiVersion = "1.3"
-        jvmTarget = "1.8"
+    compilerOptions {
+        languageVersion = KOTLIN_1_9
+        apiVersion = KOTLIN_1_9
+        jvmTarget = JVM_17
         javaParameters = true   // Useful for reflection.
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+compileJava {
+    options.compilerArgs << '-parameters'
+}
+
 jar {
     // This makes the JAR's SHA-256 hash repeatable.
     preserveFileTimestamps = false
@@ -55,17 +66,18 @@ sourceSets {
 }
 
 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 "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"
     implementation "io.grpc:grpc-stub:$grpc_version"
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
+    compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 
 }
 
@@ -78,7 +90,7 @@ protobuf {
         }
         // Specify protoc to generate using our grpc kotlin plugin
         grpckt {
-            artifact = "io.grpc:protoc-gen-grpc-kotlin:$grpc_kotlin_version"
+            artifact = "io.grpc:protoc-gen-grpc-kotlin:$grpc_kotlin_version:jdk8@jar"
         }
     }
     generateProtoTasks {
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/common/protos-java-kt/repositories.gradle b/weaver/common/protos-java-kt/repositories.gradle
index b9d1d4140b..ee4e0ee0da 100644
--- a/weaver/common/protos-java-kt/repositories.gradle
+++ b/weaver/common/protos-java-kt/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/core/drivers/corda-driver/.gitignore b/weaver/core/drivers/corda-driver/.gitignore
index 4b04aa6521..8992555c17 100644
--- a/weaver/core/drivers/corda-driver/.gitignore
+++ b/weaver/core/drivers/corda-driver/.gitignore
@@ -66,3 +66,6 @@ docs/virtualenv/
 # github credentials
 github.properties
 .env
+
+# log files
+*.out
diff --git a/weaver/core/drivers/corda-driver/Dockerfile.local b/weaver/core/drivers/corda-driver/Dockerfile.local
index aefcd806b1..7cfdd5e89d 100644
--- a/weaver/core/drivers/corda-driver/Dockerfile.local
+++ b/weaver/core/drivers/corda-driver/Dockerfile.local
@@ -1,5 +1,5 @@
 # Local build
-FROM gradle:4.10.3-jdk8 AS builder-local
+FROM gradle:7.6-jdk17-jammy AS builder-local
 
 WORKDIR /driver/corda
 ADD build /driver/corda/build
@@ -7,7 +7,7 @@ ADD build /driver/corda/build
 FROM builder-local as builder
 
 # Deployment Image 
-FROM openjdk:8-jre
+FROM eclipse-temurin:17-jre-noble
 
 COPY --from=builder /driver/corda/build/install/driver-corda /driver/corda/
 
diff --git a/weaver/core/drivers/corda-driver/Dockerfile.remote b/weaver/core/drivers/corda-driver/Dockerfile.remote
index 1cce32d620..295054a2f7 100644
--- a/weaver/core/drivers/corda-driver/Dockerfile.remote
+++ b/weaver/core/drivers/corda-driver/Dockerfile.remote
@@ -1,5 +1,5 @@
 # Remote build
-FROM gradle:4.10.3-jdk8 AS builder-remote
+FROM gradle:7.6-jdk17-jammy AS builder-remote
 
 USER root
 
@@ -17,7 +17,7 @@ RUN ./gradlew clean installDist
 FROM builder-remote as builder
 
 # Deployment Image 
-FROM openjdk:8-jre
+FROM eclipse-temurin:17-jre-noble
 
 COPY --from=builder /driver/corda/build/install/driver-corda /driver/corda/
 
diff --git a/weaver/core/drivers/corda-driver/build.gradle b/weaver/core/drivers/corda-driver/build.gradle
index c018789e6b..7c454d78a8 100644
--- a/weaver/core/drivers/corda-driver/build.gradle
+++ b/weaver/core/drivers/corda-driver/build.gradle
@@ -1,3 +1,6 @@
+import static org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+import static org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+
 buildscript {
     Properties constants = new Properties()
     file("$projectDir/./constants.properties").withInputStream { constants.load(it) }
@@ -5,8 +8,8 @@ buildscript {
     ext {
         kotlin_version = constants.getProperty("kotlinVersion")
         coroutines_version = constants.getProperty("coroutinesVersion")
-        protobuf_version = constants.getProperty("protobufVersion")
         bcprov_version = constants.getProperty("bcprovVersion")
+        bcprov_name = constants.getProperty("bcprovName")
         grpc_version = constants.getProperty("grpcVersion") // CURRENT_GRPC_VERSION
         grpc_kotlin_version = constants.getProperty("grpcKotlinVersion") // CURRENT_GRPC_KOTLIN_VERSION
         corda_release_group = constants.getProperty("cordaReleaseGroup")
@@ -20,18 +23,15 @@ 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 {
+    dependencies {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-   }
+    }
 }
 
 plugins {
     id "idea"
     id "application"
-    id "com.google.protobuf" version "0.8.12"
     id 'org.jetbrains.dokka' version '0.10.1'
     id 'maven-publish'
 }
@@ -92,19 +92,19 @@ dependencies {
     // This repo
     implementation "io.grpc:grpc-kotlin-stub:$grpc_kotlin_version"
     implementation "io.grpc:grpc-okhttp:$grpc_version"
-    implementation "org.bouncycastle:bcprov-jdk15on:$bcprov_version"
+    implementation "org.bouncycastle:$bcprov_name:$bcprov_version"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    compile "io.arrow-kt:arrow-core:$arrow_version"
+    implementation "io.arrow-kt:arrow-core:$arrow_version"
 
-    // Java
-    compileOnly "javax.annotation:javax.annotation-api:1.2"
+    // Java: To test at runtime as following was compileOnly
+    implementation "javax.annotation:javax.annotation-api:1.2"
 
     // Google
     implementation "com.google.guava:guava:28.2-jre"
-    compile 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.6'
 
     // Corda dependencies.
     implementation "net.corda:corda-core:$corda_core_version"
@@ -117,23 +117,21 @@ 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"
+    implementation "io.grpc:grpc-protobuf:$grpc_version"
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-    kotlinOptions {
-        languageVersion = "1.3"
-        apiVersion = "1.3"
-        jvmTarget = "1.8"
-        javaParameters = true
+    compilerOptions {
+        languageVersion = KOTLIN_1_9
+        apiVersion = KOTLIN_1_9
+        jvmTarget = JVM_17
+        javaParameters = true   // Useful for reflection.
     }
 }
 
@@ -142,6 +140,15 @@ dokka {
     outputDirectory = "$buildDir/dokka"
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+compileJava {
+    options.compilerArgs << '-parameters'
+}
+
 
 mainClassName = "org.hyperledger.cacti.weaver.driver.corda.CordaDriverKt"
 
diff --git a/weaver/core/drivers/corda-driver/constants.properties b/weaver/core/drivers/corda-driver/constants.properties
index 12a2f23e8f..f96c8db2d3 100644
--- a/weaver/core/drivers/corda-driver/constants.properties
+++ b/weaver/core/drivers/corda-driver/constants.properties
@@ -1,16 +1,15 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8.11
-cordaCoreVersion=4.8.11
-gradlePluginsVersion=5.0.17
-kotlinVersion=1.4.32
+cordaVersion=4.12
+cordaCoreVersion=4.12
+kotlinVersion=1.9.23
 junitVersion=4.12
-log4jVersion=2.17.1
-slf4jVersion=1.7.25
+log4jVersion=2.23.1
+slf4jVersion=2.0.12
 arrowVersion=0.10.4
-grpcVersion=1.28.1
-grpcKotlinVersion=0.1.3
-protobufVersion=3.11.1
-coroutinesVersion=1.3.3
-bcprovVersion=1.53
+grpcVersion=1.65.0
+grpcKotlinVersion=1.4.1
+coroutinesVersion=1.8.1
+bcprovName=bcpkix-jdk18on
+bcprovVersion=1.78.1
 cactiVersion=2.0.0-rc.3
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/network/corda-interop-app/build.gradle b/weaver/core/network/corda-interop-app/build.gradle
index 07488310cc..628edb536c 100644
--- a/weaver/core/network/corda-interop-app/build.gradle
+++ b/weaver/core/network/corda-interop-app/build.gradle
@@ -1,3 +1,6 @@
+import static org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+import static org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+
 buildscript {
     Properties constants = new Properties()
     file("$projectDir/./constants.properties").withInputStream { constants.load(it) }
@@ -14,10 +17,19 @@ buildscript {
         slf4j_version = constants.getProperty("slf4jVersion")
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
         arrow_version = constants.getProperty("arrowVersion")
+        jaxb_version = constants.getProperty("jaxbVersion")
+        protobuf_version = constants.getProperty("protobufVersion")
         cacti_version = constants.getProperty("cactiVersion")
         github_username = ""
         github_password = ""
         github_url = ""
+
+        testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
+               '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
+               '--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
+               '--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
+               '--add-opens', 'java.base/javax.net.ssl=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
+               '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens', 'java.sql/java.sql=ALL-UNNAMED',]
     }
     if (file("$projectDir/./github.properties").exists()) {
         Properties githubConsts = new Properties()
@@ -83,14 +95,23 @@ allprojects {
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-        kotlinOptions {
-            languageVersion = "1.3"
-            apiVersion = "1.3"
-            jvmTarget = "1.8"
+        compilerOptions {
+            languageVersion = KOTLIN_1_9
+            apiVersion = KOTLIN_1_9
+            jvmTarget = JVM_17
             javaParameters = true   // Useful for reflection.
         }
     }
 
+    java {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    compileJava {
+        options.compilerArgs << '-parameters'
+    }
+
     jar {
         // This makes the JAR's SHA-256 hash repeatable.
         preserveFileTimestamps = false
@@ -111,31 +132,27 @@ sourceSets {
 }
 
 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"
 
     // 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 63db046f7c..b30abc73b4 100644
--- a/weaver/core/network/corda-interop-app/constants.properties
+++ b/weaver/core/network/corda-interop-app/constants.properties
@@ -1,13 +1,15 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8.11
-cordaCoreVersion=4.8.11
-gradlePluginsVersion=5.0.17
-kotlinVersion=1.4.32
+cordaVersion=4.12
+cordaCoreVersion=4.12
+gradlePluginsVersion=5.1.1
+kotlinVersion=1.9.23
 junitVersion=4.12
-log4jVersion=2.17.1
-platformVersion=10
-slf4jVersion=1.7.25
-nettyVersion=4.1.22.Final
+log4jVersion=2.23.1
+platformVersion=140
+slf4jVersion=2.0.12
+nettyVersion=4.1.77.Final
 arrowVersion=0.10.4
+jaxbVersion=2.3.1
+protobufVersion=3.25.3
 cactiVersion=2.0.0-rc.3
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..78c1f1c9ff 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"
 }
 
@@ -36,19 +32,19 @@ sourceSets {
 }
 
 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"
 
     // 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"
+    testImplementation "junit:junit:$junit_version"
+    testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
+    testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
+    testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_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 +53,7 @@ publishing {
             groupId = project.properties['group']
             artifactId = 'interop-contracts'
             version = project.properties['version']
-            from components.java
+            from components.cordapp
         }
     }
     repositories {
@@ -70,3 +66,7 @@ publishing {
         }
     }
 }
+
+test {
+    jvmArgs = rootProject.ext.testJvmArgs
+}
diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetTransferContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetTransferContract.kt
index 45bb24dd40..e562ac2bc2 100644
--- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetTransferContract.kt
+++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetTransferContract.kt
@@ -18,7 +18,6 @@ import net.corda.core.contracts.StaticPointer
 import net.corda.core.transactions.LedgerTransaction
 import java.time.Instant
 import java.util.*
-import co.paralleluniverse.fibers.Suspendable
 
 /**
  * AssetTransferContract defines the rules for managing a [AssetPledgeState].
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..a0df5f545f 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,4 @@
 buildscript {
-    ext.protobuf_version = "3.11.1"
-    
     repositories {
         mavenCentral()
     }
@@ -56,34 +54,37 @@ sourceSets {
 }
 
 configurations {
-    integrationTestCompile.extendsFrom testCompile
-    integrationTestRuntime.extendsFrom testRuntime
+    integrationTestImplementation.extendsFrom testImplementation
+    integrationTestRuntimeOnly.extendsFrom testRuntimeOny
 }
 
 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")
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    testImplementation "junit:junit:$junit_version"
+    testImplementation project(":test-cordapp")
+
+    implementation "io.arrow-kt:arrow-core:$arrow_version"
+    implementation "io.arrow-kt:arrow-fx:$arrow_version"
+    implementation "io.arrow-kt:arrow-syntax:$arrow_version"
+    implementation "javax.xml.bind:jaxb-api:$jaxb_version"
 
-    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 "com.google.protobuf:protobuf-java:$protobuf_version"
+    implementation "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"
+    testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
+    testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
+    testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
 
     // CorDapp dependencies.
     cordapp project(":interop-contracts")
@@ -100,7 +101,7 @@ publishing {
             groupId = project.properties['group']
             artifactId = 'interop-workflows'
             version = project.properties['version']
-            from components.java
+            from components.cordapp
         }
     }
     repositories {
@@ -116,4 +117,5 @@ publishing {
 
 test {
     maxHeapSize = "4096m"
-}
\ No newline at end of file
+    jvmArgs = rootProject.ext.testJvmArgs
+}
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..7aa4488864 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,6 +117,7 @@ fun verifyCordaNotarization(viewData: ByteString, verificationPolicyCriteria: Li
     println("Corda view data: $cordaViewData")
     
     var interopPayload = cordaViewData.notarizedPayloadsList[0].payload
+    var signersMut = mutableListOf<String>()
 
     // 2. Map over the list of notarizations and verify the signature, creating a list of Either Error Boolean
     val eitherErrorCordaViewData = cordaViewData.notarizedPayloadsList.map { notarizedPayload ->
@@ -127,6 +128,7 @@ fun verifyCordaNotarization(viewData: ByteString, verificationPolicyCriteria: Li
                     if (interopPayload != notarizedPayload.payload) {
                         Left(Error("InteropPayload doesn't match across responses from different nodes"))
                     }
+                    signersMut.add(notarizedPayload.id)
                     Right(true)
                 }
             }
@@ -139,7 +141,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/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/HandleExternalRequestTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/HandleExternalRequestTests.kt
index ade903f880..8300054308 100644
--- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/HandleExternalRequestTests.kt
+++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/HandleExternalRequestTests.kt
@@ -127,7 +127,8 @@ class HandleExternalRequestTests {
         network.runNetwork()
         val invalidSignatureError = invalidSignatureFuture.getOrThrow()
         assertTrue(invalidSignatureError.isLeft())
-        assertEquals("Verification Error: Error verifying signature: signature length is wrong", invalidSignatureError.fold({ it.message }, { "" }))
+        /* assertEquals("Verification Error: Error verifying signature: signature length is wrong", invalidSignatureError.fold({ it.message }, { "" })) */
+        assertEquals("Signature Verification Error for certificate for O=PartyA, L=London, C=GB", invalidSignatureError.fold({ it.message }, { "" }))
 
         // Unhappy case where query address is incorrect
         val invalidAddressQuery = query.toBuilder().setAddress("invalidAddress").build()
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..344f153d28 100644
--- a/weaver/core/network/corda-interop-app/test-cordapp/build.gradle
+++ b/weaver/core/network/corda-interop-app/test-cordapp/build.gradle
@@ -1,6 +1,4 @@
 buildscript {
-    ext.protobuf_version = "3.11.1"
-    
     repositories {
         mavenCentral()
     }
@@ -38,12 +36,18 @@ sourceSets {
 }
 
 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"
     
     // 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"
+
+    testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
+    testImplementation "$corda_core_release_group:corda-test-utils:$corda_core_release_version"
+    testImplementation "$corda_core_release_group:corda-core-test-utils:$corda_core_release_version"
+}
 
-    testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
+test {
+    jvmArgs = rootProject.ext.testJvmArgs
 }
diff --git a/weaver/core/relay/.gitignore b/weaver/core/relay/.gitignore
index def820feaf..b94fcad888 100644
--- a/weaver/core/relay/.gitignore
+++ b/weaver/core/relay/.gitignore
@@ -5,3 +5,4 @@ protos-rs
 .env
 *.db
 *.sql
+*.out
\ No newline at end of file
diff --git a/weaver/samples/corda/corda-simple-application/build.gradle b/weaver/samples/corda/corda-simple-application/build.gradle
index 2305b6a040..4f91ec6c56 100644
--- a/weaver/samples/corda/corda-simple-application/build.gradle
+++ b/weaver/samples/corda/corda-simple-application/build.gradle
@@ -1,3 +1,6 @@
+import static org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+import static org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+
 buildscript {
     Properties constants = new Properties()
     file("$projectDir/./constants.properties").withInputStream { constants.load(it) }
@@ -17,21 +20,23 @@ buildscript {
         tokens_release_group = constants.getProperty('cordaTokenSDKGroup')
         tokens_release_version = constants.getProperty('cordaTokenSDKVersion')      
         clikt_version = constants.getProperty("cliktVersion")
+        
+        coroutines_version = constants.getProperty("coroutinesVersion")
+        grpc_version = constants.getProperty("grpcVersion") // CURRENT_GRPC_VERSION
+        grpc_kotlin_version = constants.getProperty("grpcKotlinVersion") // CURRENT_GRPC_KOTLIN_VERSION
+        arrow_version = constants.getProperty("arrowVersion")
     }
 
     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"
     }
 }
@@ -84,13 +89,23 @@ allprojects {
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-        kotlinOptions {
-            languageVersion = "1.3"
-            apiVersion = "1.3"
-            jvmTarget = "1.8"
+        compilerOptions {
+            languageVersion = KOTLIN_1_9
+            apiVersion = KOTLIN_1_9
+            jvmTarget = JVM_17
             javaParameters = true   // Useful for reflection.
         }
     }
+    
+    java {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    compileJava {
+        options.compilerArgs << '-parameters'
+    }
+
 
     jar {
         // This makes the JAR's SHA-256 hash repeatable.
@@ -100,7 +115,6 @@ allprojects {
 }
 
 apply plugin: 'net.corda.plugins.cordapp'
-apply plugin: 'net.corda.plugins.cordformation'
 apply plugin: 'net.corda.plugins.quasar-utils'
 
 sourceSets {
@@ -112,30 +126,26 @@ sourceSets {
 }
 
 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"
 
     // 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 a333027552..d24e4a7638 100644
--- a/weaver/samples/corda/corda-simple-application/clients/build.gradle
+++ b/weaver/samples/corda/corda-simple-application/clients/build.gradle
@@ -1,12 +1,4 @@
 buildscript {
-
-    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
-    ext.arrow_version = "0.10.4"
-
     repositories {
         mavenCentral()
     }
@@ -15,7 +7,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"
 }
@@ -64,20 +55,23 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile 'com.google.code.gson:gson:2.8.6'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation 'com.google.code.gson:gson:2.8.6'
 
     // Corda dependencies.
-    compile "$corda_release_group:corda-rpc:$corda_release_version"
+    implementation "$corda_core_release_group:corda-core:$corda_core_release_version"
+    implementation "$corda_release_group:corda-node-api:$corda_release_version"
+    implementation "$corda_release_group:corda:$corda_release_version"
+    implementation "$corda_release_group:corda-rpc:$corda_release_version"
     
-    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"
 
     // CorDapp dependencies.
-    compile project(":contracts-kotlin")
-    compile project(":workflows-kotlin")
+    implementation project(":contracts-kotlin")
+    implementation project(":workflows-kotlin")
     implementation "com.github.ajalt.clikt:clikt:$clikt_version"
     
     implementation(group: 'com.fungiblehousetoken', name: 'contracts', version: "1.0")
@@ -90,17 +84,14 @@ 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"
+    implementation "io.grpc:grpc-protobuf:$grpc_version"
     implementation group: 'org.json', name: 'json', version: '20190722'
 
     //// Logger dependencies
-    compile "org.slf4j:slf4j-simple:1.6.1"
+    implementation "org.slf4j:slf4j-simple:1.6.1"
 
     // Token SDK dependencies.
     implementation "$tokens_release_group:tokens-contracts:$tokens_release_version"
diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt
index be9d542ff6..ca25fc6a25 100644
--- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt
+++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt
@@ -79,8 +79,12 @@ class ConfigureCreateAllCommand : CliktCommand(name="create-all",
  * Helper function used by ConfigureDataCommand
  */
 fun configDataHelper(config: Map<String, String>) {
-    createStateHelper("H", "1", config)
-    createStateHelper("C", "20", config)
+    var linesIterator = object {}.javaClass.getResourceAsStream("/bootstrap-states.csv")?.bufferedReader()?.lines()!!.iterator()
+    while (linesIterator.hasNext()) {
+        val line = linesIterator.next()
+        val keyValue = line.split(",").map{ it.strip() }.toTypedArray()
+        createStateHelper(keyValue[0], keyValue[1], config)
+    }
 }
 
 /**
diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt
index 2ff6ad26dc..bdcf8f40f6 100644
--- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt
+++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt
@@ -13,7 +13,6 @@ import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.core.requireObject
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.options.option
-import io.grpc.ManagedChannelBuilder
 import java.lang.Exception
 import kotlinx.coroutines.*
 import net.corda.core.messaging.startFlow
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..a5aa930e06 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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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..6cf6e715ad 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-----\nMIICdTCCAhGgAwIBAgIQdsDNMip6cOsCdlA+/ZxDYjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA3MzAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABM0dOVFxTr70JURj8XHB3qcuVH88rCZOex4z\nwBQryxAu9AKRNzmpSesbn9BnmPTvdoIaaJwYuRez2Q8+ZqTuzQijgdAwgc0wHQYD\nVR0OBBYEFDxBWfh2GH0hsuxqOBGOcROoM/gsMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiBAYPG4nZdD7U+p\nRU2l1UIlLNYJKl0cSF0ob0uj82RkaQIhAO4zeomlYkOar3mryVnJ43k49ES+qZdR\nh5SB/afECdfF\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..d9b44be192 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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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..2d70d720e8 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-----\nMIICdTCCAhGgAwIBAgIQbDl7Ehfzf9dq2/3dGWu3ejAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA3MzAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABMXyUxpFyTETYNOp2E4QMDX0323rRuD2GqML\nWXttE1W8KiFVe68U4aOQcYuyLvW5MOcLDX0LDnovCgWDMQhLSM+jgdAwgc0wHQYD\nVR0OBBYEFGM4lyXZJWkSdI+68K5oPyLA7r+vMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiA12w8RZBJEO76L\nVtvehuPM+dgCH2/zF73tjG14w8BtGgIhAKEgqToL6UfckNnbf15uAKmj9XPBZG22\noS8simwGxUSj\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..fe461f2d70 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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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..6cf6e715ad 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-----\nMIICdTCCAhGgAwIBAgIQdsDNMip6cOsCdlA+/ZxDYjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA3MzAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABM0dOVFxTr70JURj8XHB3qcuVH88rCZOex4z\nwBQryxAu9AKRNzmpSesbn9BnmPTvdoIaaJwYuRez2Q8+ZqTuzQijgdAwgc0wHQYD\nVR0OBBYEFDxBWfh2GH0hsuxqOBGOcROoM/gsMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiBAYPG4nZdD7U+p\nRU2l1UIlLNYJKl0cSF0ob0uj82RkaQIhAO4zeomlYkOar3mryVnJ43k49ES+qZdR\nh5SB/afECdfF\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..5b8be90977 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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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..2d70d720e8 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-----\nMIICdTCCAhGgAwIBAgIQbDl7Ehfzf9dq2/3dGWu3ejAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA3MzAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABMXyUxpFyTETYNOp2E4QMDX0323rRuD2GqML\nWXttE1W8KiFVe68U4aOQcYuyLvW5MOcLDX0LDnovCgWDMQhLSM+jgdAwgc0wHQYD\nVR0OBBYEFGM4lyXZJWkSdI+68K5oPyLA7r+vMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiA12w8RZBJEO76L\nVtvehuPM+dgCH2/zF73tjG14w8BtGgIhAKEgqToL6UfckNnbf15uAKmj9XPBZG22\noS8simwGxUSj\n-----END CERTIFICATE-----"]
     }
   }
 }
\ No newline at end of file
diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/remoteNetworkUsers/Corda_Network2_UsersAndCerts.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/remoteNetworkUsers/Corda_Network2_UsersAndCerts.json
index 419c33d0ef..6e971902a7 100644
--- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/remoteNetworkUsers/Corda_Network2_UsersAndCerts.json
+++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/remoteNetworkUsers/Corda_Network2_UsersAndCerts.json
@@ -1 +1 @@
-{"O=PartyA, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRYWovdHpTY09PcTVtQTZYT1o2eGxYVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEl4TVRBeU5qQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQVZ4R3pSbWFobHFpWVkxWGFlN2E0NjlVWUwwU1Q0NG15V2oxbG5BRi95dVdqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkExK2ZIbjVBcWU2MWd4UlZyWVl2ZXBsWENXcU1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGRllXRndCUjVWTWgKaTZXcisvbGREU1dVT0RnYk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUloQVBGbFhleU9QTS9OUjA1Y1NOd2JYMlRGb213VjA0c043ZVpGcENrelZ6NUhBaUFqCk5HbU5oSWJlaWt0ZmVoYzN0ZFVHa2Y3QlI2Um92STRyTHFNbERvOE1ZZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyB, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5akNDQVdlZ0F3SUJBZ0lRVmRkLzYrK0g5QkhhVWJlOG9nazI2ekFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQ01CNFhEVEl4TVRBeU5qQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbENNQ293QlFZREsyVncKQXlFQVJ0YkZ6aDg2amVLL0h2dTFxOXR1ZkdnbDlaaWFOLzJ5QmxXZnRaZFR0MUNqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkU0cysyckdnVkFlZkFTQkhqb0VMdWpSb2hZVE1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGTHdHVVV5WVprdTgKS1VSWng4TFdsK1JCTFh1Mk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFJ3QXdSQUlnU3pyUm9yZjZ4ejZFcS92VDhWdGxNQlRKQ3pVSnh1VHdmek9VNldwcHFnZ0NJSGwrCkNVNjRnOW1lR1A4bFNoQlprd3ZXd0Y4c2hRMjBYQ1doeHowdjZkOUkKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ=="}
\ No newline at end of file
+{"O=PartyA, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ6RENDQVdlZ0F3SUJBZ0lRZWh2cmlLYVRnODFKVGcvbWFXaWdmVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQThERC8rMEJ1VFlqaERIRjJESzJGU0VRYVhSb3UvSndsVDJKZ3ZHWmJyUGVqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRk1VTGVPWnhDQ1ZCM2trSHRlNWxBK2RJdEZRNE1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGR000bHlYWkpXa1MKZEkrNjhLNW9QeUxBN3Irdk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNRQXdSZ0loQUtFUFMwQkpRQ29sSDNRaEx5YzJDbC9ROE1Fa0tqc0thVEpWUFNidnllUk9BaUVBCnkwWDdvdXdDQnZHRndRMWhoVnJIem91N1NHNmxTeFBtVDdxRFhlSnloYUU9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyC, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRUnI2TWNQZVIvQ0RNZXIwT2s2NDI4VEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsRE1CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbERNQ293QlFZREsyVncKQXlFQUZkVWtQZnN5RlNSa2ZoQVVoYmlhaDZlYzM1S0s1cmhBK3pFcWdNSWt4UzJqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRk1ZRVQwWHNyQmtKalFPOEM1UHpwazBvS2NXZk1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGRkJyYmx2b0JUTVUKbWVDNmlhNXNVb1M0NlVuNU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUloQUoxWHZtMXNZbHNSR0Q5RG9UY0hVbmFtVndNdlhwTGJYd2RsSFZYbHByaTFBaUEyCnBaK2ZSNlI0dnZjUElWSW5QckpsQjcvaW8rQkZRNkxCbEZiSXlMK1dkdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyB, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ6RENDQVdlZ0F3SUJBZ0lRVlRZMU5KenNrWWNXVDhneXFDdUpQVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQ01CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbENNQ293QlFZREsyVncKQXlFQWxncFlZWnI1Y0ZaclpDMmFsVENlRFVRdVl5OFQ1TDNSNUhBQ1kxKzBmdXFqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRk1oYmdQcHdMNVc2LzNvU1YyejNnbUJBYk1UK01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGTGx5Yyt6S1ArWUQKV01odjFILzQxdTJhU3NVWk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNRQXdSZ0loQUtYUXVvY2s4UEN2RVBoVy8velBSZnczMWNodWhtbU9ublYvanFxQm1wejVBaUVBCm55MCsxb3VKSmN6N1graHdIdVBGcVJqaWRDcWRvaUQvRmRpWHRJUFJJQms9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="}
\ No newline at end of file
diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/remoteNetworkUsers/Corda_Network_UsersAndCerts.json b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/remoteNetworkUsers/Corda_Network_UsersAndCerts.json
index 4d4905c1e9..5f5e8339ad 100644
--- a/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/remoteNetworkUsers/Corda_Network_UsersAndCerts.json
+++ b/weaver/samples/corda/corda-simple-application/clients/src/main/resources/config/remoteNetworkUsers/Corda_Network_UsersAndCerts.json
@@ -1 +1 @@
-{"O=PartyA, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRYXF5cmhDeGx1bE1YUTJFUndyTjVGakFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEl4TVRBeU1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQU1hSFFJNThKanB1Z3Y2dUlaMXFlajJZREFrWU9kKzhJbmdPa3AxQVhpb0NqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRlBJNExNWTFkK2hEVkdKVFhuREp1UXZpQlE1OU1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGTTFjSDFBc1B4M0cKUDBjRmlPZkN5ay9lemV2VU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUlnY0tBdFRQem11R3R3R0hUeDRHcTA3SzBSOTZsR0ZnUWhGQ3ljRk5neGNqNENJUUQyCkUxclp4TFUycEthci9NQzg2YytMTkYxRjU1ZWhmOWVnY0RVekpPOEJqZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyB, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRV0ZjTWIzMElIcUI1OWFRRVFKM2VPekFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQ01CNFhEVEl4TVRBeU1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbENNQ293QlFZREsyVncKQXlFQTBQZHdVaHpoS2pWcEY1WFhUV2tKYkcwNm95eE1LaXdNQk1EZGlRL0tOejZqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkZhTUtkdUlSaStWamJXL28zN3ZEZmhZTWhZcE1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGTmZGU3RwbWppSkQKMEFQNE9oUENNMmwxY1RiNU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUlnSk5Ib0JObUNuekU2dkVEZUpxVGVTSXNNWWtHcVJQZUNORStDQmpLNVROOENJUURXClIvaGhVNDRlS0NBb3M3YktUQnI2enVERkRSUUdwaFpMU3QyT2NCdi9XZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="}
\ No newline at end of file
+{"O=PartyA, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ6RENDQVdlZ0F3SUJBZ0lRWUU0YnVpNURmWGovNEZ3bGZEa1hSekFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQTZ0elRDY0EyZHA1TDlGWWd4Ui9UQUE0dGhoNzJ3UUJuSXdMV25NYktDZ3lqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRklFRDQ0cXhpaFBYdWo0Sm4rcHpTYjcwZjFRcE1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGRHhCV2ZoMkdIMGgKc3V4cU9CR09jUk9vTS9nc01CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNRQXdSZ0loQUxYUWU0MUltdkJOWWJ6Y29mWlBXUFREU1JjUkFzUiszcXd6L1R5Z0NPUlhBaUVBCnNXV0x5RGN5d0oxemhjdzFScmFNMGxtd2Rua2ZBMXBWOTRYSGwxYTRRUVk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyC, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5akNDQVdlZ0F3SUJBZ0lRZmhVYnIzMXprZVd1dlUvK3Y3WGRkVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsRE1CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbERNQ293QlFZREsyVncKQXlFQUd1MUF6eUcvaEZXWG5TbjliTkhydTBOVG9vWUw4cmJwdmp4eVFaRlUzK1NqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRk00SnUra0Y1bFNOeHYzeVo3RTFrVWgvazlpME1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGSFdHY1NRUmJuRjMKdlZVb2FRSVduR0Uyd1dLTE1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFJ3QXdSQUlnSGFtNzE1bkxRdm51UXJ6a3JmNFRERGtPRnVXTjVKWG9hazhoZEd3bzREWUNJRk9PCkpMMlhnTGN2eVZLRHE5YUlDc3h4VGQ4YzJhUi9uLzZHN2dsRFF5Yk8KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ==","O=PartyB, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ6RENDQVdlZ0F3SUJBZ0lRUVFhdmhSRUtTZnBSWHpLODU3dUtkakFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQ01CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbENNQ293QlFZREsyVncKQXlFQTIvRjhJNDNVeHRwUE5yZUp1Z292MklaaXRqRmNRVXphdHlVMWpwUW5UbXFqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkJxY2xTd21ERWtUc3hwb0RiYlp1TmRteFpNL01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGSHlURGtsYVZqRzkKU0NwNk9iZGIzQUM4VWlObk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNRQXdSZ0loQU8vSUtReGlQVEpnSUFEb1llbkhLZVdpRXlMTGlKcGZHTmZXd1Zab0JKaEJBaUVBCm9pOVJSdnRWMDdUOWVNK25id0hTbk1xcEJYcTV2bjRjVGJ0MjVRWEw3U1E9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="}
\ 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 d17ffacee7..079b1c1fac 100644
--- a/weaver/samples/corda/corda-simple-application/constants.properties
+++ b/weaver/samples/corda/corda-simple-application/constants.properties
@@ -1,15 +1,19 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8.11
-cordaCoreVersion=4.8.11
-gradlePluginsVersion=5.0.17
-kotlinVersion=1.4.32
+cordaVersion=4.12
+cordaCoreVersion=4.12
+gradlePluginsVersion=5.1.1
+kotlinVersion=1.9.23
 junitVersion=4.12
-log4jVersion=2.17.1
-platformVersion=10
-slf4jVersion=1.7.25
-nettyVersion=4.1.22.Final
+log4jVersion=2.23.1
+platformVersion=140
+slf4jVersion=2.0.12
+nettyVersion=4.1.77.Final
 cordaTokenSDKGroup=com.r3.corda.lib.tokens
-cordaTokenSDKVersion=1.2.5
+cordaTokenSDKVersion=1.3-RC02
 cliktVersion=2.7.1
+arrowVersion=0.10.4
+grpcVersion=1.65.0
+grpcKotlinVersion=1.4.1
+coroutinesVersion=1.8.1
 cactiVersion=2.0.0-rc.3
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..b568fb76b1 100644
--- a/weaver/samples/corda/corda-simple-application/contracts-kotlin/build.gradle
+++ b/weaver/samples/corda/corda-simple-application/contracts-kotlin/build.gradle
@@ -14,16 +14,16 @@ cordapp {
 }
 
 dependencies {
-    compile 'com.google.code.gson:gson:2.8.6'
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "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"
+    testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
     
-    implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version")
+    cordaProvided(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/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..4ab12d5824 100644
--- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle
+++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle
@@ -40,21 +40,21 @@ 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")
+    implementation 'com.google.code.gson:gson:2.8.6'
+    cordaProvided(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version")
+    cordaProvided(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"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
-    testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
-    testCompile "junit:junit:$junit_version"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    testImplementation "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"
+    testImplementation "$corda_release_group:corda-node-driver:$corda_release_version"
 
     // CorDapp dependencies.
     cordapp project(":contracts-kotlin")
@@ -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..70bf0b701e 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
@@ -27,7 +26,6 @@ import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker
 import net.corda.core.utilities.ProgressTracker.Step
 import net.corda.core.contracts.requireThat
-import sun.security.x509.UniqueIdentity
 import java.util.*
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
@@ -174,7 +172,7 @@ class DeleteAssetState(val linearId: String) : FlowLogic<SignedTransaction>() {
         val assetStatesWithLinearId = serviceHub.vaultService.queryBy<AssetState>(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 +364,7 @@ class MergeAssetStates(val linearId1: String, val linearId2: String) : FlowLogic
             Vault.StateStatus.UNCONSUMED, null)
         var assetStatesWithLinearId = serviceHub.vaultService.queryBy<AssetState>(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 +373,7 @@ class MergeAssetStates(val linearId1: String, val linearId2: String) : FlowLogic
             Vault.StateStatus.UNCONSUMED, null)
         assetStatesWithLinearId = serviceHub.vaultService.queryBy<AssetState>(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 +482,7 @@ class SplitAssetState(val linearId: String, val quantity1: Long, val quantity2:
             Vault.StateStatus.UNCONSUMED, null)
         val assetStatesWithLinearId = serviceHub.vaultService.queryBy<AssetState>(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 +566,7 @@ class TransferAssetStateInitiator(val linearId: String, val otherParty: Party) :
             Vault.StateStatus.UNCONSUMED, null)
         val assetStatesWithLinearId = serviceHub.vaultService.queryBy<AssetState>(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..95a1b51c47 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
@@ -27,7 +26,6 @@ import net.corda.core.transactions.TransactionBuilder
 import net.corda.core.utilities.ProgressTracker
 import net.corda.core.utilities.ProgressTracker.Step
 import net.corda.core.contracts.requireThat
-import sun.security.x509.UniqueIdentity
 import java.util.*
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
@@ -174,7 +172,7 @@ class DeleteBondAssetState(val linearId: String) : FlowLogic<SignedTransaction>(
         val assetStatesWithLinearId = serviceHub.vaultService.queryBy<BondAssetState>(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 +397,7 @@ class TransferBondAssetStateInitiator(val linearId: String, val otherParty: Part
             Vault.StateStatus.UNCONSUMED, null)
         val assetStatesWithLinearId = serviceHub.vaultService.queryBy<BondAssetState>(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<SignedTransact
         val statesWithKey = serviceHub.vaultService.queryBy<SimpleState>().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<SignedTransaction>() {
         val statesWithKey = serviceHub.vaultService.queryBy<SimpleState>().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..2c7f00fc35 100644
--- a/weaver/samples/corda/fungible-house-token/build.gradle
+++ b/weaver/samples/corda/fungible-house-token/build.gradle
@@ -1,3 +1,6 @@
+import static org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+import static org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+
 buildscript {
     Properties constants = new Properties()
     file("$projectDir/../constants.properties").withInputStream { constants.load(it) }
@@ -19,15 +22,20 @@ buildscript {
         tokens_release_group = constants.getProperty('cordaTokenSDKGroup')
         tokens_release_version = constants.getProperty('cordaTokenSDKVersion')
         cacti_version = constants.getProperty("cactiVersion")
+
+        testJvmArgs = ['--add-opens', 'java.base/java.time=ALL-UNNAMED', '--add-opens', 'java.base/java.io=ALL-UNNAMED',
+                       '--add-opens', 'java.base/java.util=ALL-UNNAMED', '--add-opens', 'java.base/java.net=ALL-UNNAMED',
+                       '--add-opens', 'java.base/java.nio=ALL-UNNAMED', '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED',
+                       '--add-opens', 'java.base/java.security.cert=ALL-UNNAMED', '--add-opens', 'java.base/java.security=ALL-UNNAMED',
+                       '--add-opens', 'java.base/javax.net.ssl=ALL-UNNAMED', '--add-opens', 'java.base/java.lang=ALL-UNNAMED',
+                       '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens', 'java.sql/java.sql=ALL-UNNAMED',]
     }
 
     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' }
-        maven { url 'https://download.corda.net/maven/corda-lib' }
     }
 
     dependencies {
@@ -43,17 +51,22 @@ allprojects {
     apply from: "${rootProject.projectDir}/repositories.gradle"
     apply plugin: 'kotlin'
 
+    tasks.withType(Test) {
+        jvmArgs = rootProject.ext.testJvmArgs
+    }
+
     repositories {
         mavenLocal()
-        maven { url 'https://repo1.maven.org/maven2' }
+
         mavenCentral()
-        maven { url 'https://download.corda.net/maven/corda' }
+        maven { url 'https://download.corda.net/maven/corda-dependencies' }
         maven { url 'https://download.corda.net/maven/corda-releases' }
         maven { url 'https://jitpack.io' }
         //SDK lib
         maven { url 'https://download.corda.net/maven/corda-lib' }
         //Gradle Plugins
         maven { url 'https://repo.gradle.org/gradle/libs-releases' }
+        //Cacti repository
         if (file("$projectDir/../github.properties").exists()) {
             Properties constants = new Properties()
             file("$projectDir/../github.properties").withInputStream { constants.load(it) }
@@ -84,25 +97,35 @@ allprojects {
         }
     }
 
-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")
-}
+    dependencies {
+        implementation '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")
+    }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-        kotlinOptions {
-            languageVersion = "1.2"
-            apiVersion = "1.2"
-            jvmTarget = "1.8"
+        compilerOptions {
+            languageVersion = KOTLIN_1_9
+            apiVersion = KOTLIN_1_9
+            jvmTarget = JVM_17
             javaParameters = true   // Useful for reflection.
         }
     }
 
+    java {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    compileJava {
+        options.compilerArgs << '-parameters'
+    }
+
     jar {
         // This makes the JAR's SHA-256 hash repeatable.
         preserveFileTimestamps = false
         reproducibleFileOrder = true
+        duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
     }
 }
 
@@ -120,23 +143,31 @@ sourceSets {
 
 dependencies {
     // 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"
+    cordaBootstrapper ("$corda_release_group:corda-node-api:$corda_release_version") {
+        exclude group: "ch.qos.logback", module: "logback-classic"
+    }
+    corda "$corda_release_group:corda:$corda_release_version"
 
     // CorDapp dependencies.
     cordapp project(":workflows")
     cordapp project(":contracts")
 
-    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-slf4j2-impl:${log4j_version}"
+    cordaProvided "org.apache.logging.log4j:log4j-web:${log4j_version}"
+    cordaProvided "org.slf4j:jul-to-slf4j:$slf4j_version"
+    cordaDriver "net.corda:corda-shell:$corda_release_version"
 
     // Token SDK dependencies.
     cordapp "$tokens_release_group:tokens-contracts:$tokens_release_version"
     cordapp "$tokens_release_group:tokens-workflows:$tokens_release_version"
 }
 
+cordapp {
+    targetPlatformVersion corda_platform_version.toInteger()
+    minimumPlatformVersion corda_platform_version.toInteger()
+}
+
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         projectCordapp {
@@ -156,7 +187,6 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
             address("localhost:10003")
             adminAddress("localhost:10043")
         }
-        cordapps = []
     }
     node {
         name "O=Seller,L=London,C=GB"
diff --git a/weaver/samples/corda/fungible-house-token/constants.properties b/weaver/samples/corda/fungible-house-token/constants.properties
index 1b2d4a33a5..e365148236 100644
--- a/weaver/samples/corda/fungible-house-token/constants.properties
+++ b/weaver/samples/corda/fungible-house-token/constants.properties
@@ -1,15 +1,15 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8.11
-cordaCoreVersion=4.8.11
-gradlePluginsVersion=5.0.17
-kotlinVersion=1.4.32
+cordaVersion=4.12
+cordaCoreVersion=4.12
+gradlePluginsVersion=5.1.1
+kotlinVersion=1.9.23
 junitVersion=4.12
-quasarVersion=0.7.10
-log4jVersion=2.17.1
-platformVersion=10
-slf4jVersion=1.7.25
-nettyVersion=4.1.22.Final
+quasarVersion=0.9.0_r3
+log4jVersion=2.23.1
+platformVersion=140
+slf4jVersion=2.0.12
+nettyVersion=4.1.77.Final
 cordaTokenSDKGroup=com.r3.corda.lib.tokens
-cordaTokenSDKVersion=1.2.5
+cordaTokenSDKVersion=1.3-RC02
 cactiVersion=2.0.0-rc.3
diff --git a/weaver/samples/corda/fungible-house-token/makefile b/weaver/samples/corda/fungible-house-token/makefile
index 98e50c1d6d..f3cf5e3f4e 100644
--- a/weaver/samples/corda/fungible-house-token/makefile
+++ b/weaver/samples/corda/fungible-house-token/makefile
@@ -1,5 +1,6 @@
 source:
 	git clone https://github.com/corda/samples-kotlin.git
+	cd samples-kotlin && git checkout cc/dev/ent/4.12
 	mv samples-kotlin/Tokens/fungiblehousetoken source
 	#mv samples-kotlin/Tokens/constants.properties .
 	rm -rf samples-kotlin
@@ -9,7 +10,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..fc6d03f433 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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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..6cf6e715ad 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-----\nMIICdTCCAhGgAwIBAgIQdsDNMip6cOsCdlA+/ZxDYjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA3MzAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABM0dOVFxTr70JURj8XHB3qcuVH88rCZOex4z\nwBQryxAu9AKRNzmpSesbn9BnmPTvdoIaaJwYuRez2Q8+ZqTuzQijgdAwgc0wHQYD\nVR0OBBYEFDxBWfh2GH0hsuxqOBGOcROoM/gsMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiBAYPG4nZdD7U+p\nRU2l1UIlLNYJKl0cSF0ob0uj82RkaQIhAO4zeomlYkOar3mryVnJ43k49ES+qZdR\nh5SB/afECdfF\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..08ec81d863 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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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..2d70d720e8 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-----\nMIICdTCCAhGgAwIBAgIQbDl7Ehfzf9dq2/3dGWu3ejAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA3MzAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABMXyUxpFyTETYNOp2E4QMDX0323rRuD2GqML\nWXttE1W8KiFVe68U4aOQcYuyLvW5MOcLDX0LDnovCgWDMQhLSM+jgdAwgc0wHQYD\nVR0OBBYEFGM4lyXZJWkSdI+68K5oPyLA7r+vMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiA12w8RZBJEO76L\nVtvehuPM+dgCH2/zF73tjG14w8BtGgIhAKEgqToL6UfckNnbf15uAKmj9XPBZG22\noS8simwGxUSj\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..1405ee7bd6 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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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-----\nMIIBzDCCAWegAwIBAgIQYE4bui5DfXj/4FwlfDkXRzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA6tzTCcA2dp5L9FYgxR/TAA4thh72wQBnIwLWnMbKCgyjgYkwgYYwHQYDVR0O\nBBYEFIED44qxihPXuj4Jn+pzSb70f1QpMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDxBWfh2GH0h\nsuxqOBGOcROoM/gsMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhALXQe41ImvBNYbzcofZPWPTDSRcRAsR+3qwz/TygCORXAiEA\nsWWLyDcywJ1zhcw1RraM0lmwdnkfA1pV94XHl1a4QQY\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..6cf6e715ad 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-----\nMIICdTCCAhGgAwIBAgIQdsDNMip6cOsCdlA+/ZxDYjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA3MzAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABM0dOVFxTr70JURj8XHB3qcuVH88rCZOex4z\nwBQryxAu9AKRNzmpSesbn9BnmPTvdoIaaJwYuRez2Q8+ZqTuzQijgdAwgc0wHQYD\nVR0OBBYEFDxBWfh2GH0hsuxqOBGOcROoM/gsMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiBAYPG4nZdD7U+p\nRU2l1UIlLNYJKl0cSF0ob0uj82RkaQIhAO4zeomlYkOar3mryVnJ43k49ES+qZdR\nh5SB/afECdfF\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..08ec81d863 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-----\nMIIBzDCCAWegAwIBAgIQehvriKaTg81JTg/maWigfTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDczMDAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8DD/+0BuTYjhDHF2DK2FSEQaXRou/JwlT2JgvGZbrPejgYkwgYYwHQYDVR0O\nBBYEFMULeOZxCCVB3kkHte5lA+dItFQ4MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFGM4lyXZJWkS\ndI+68K5oPyLA7r+vMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhAKEPS0BJQColH3QhLyc2Cl/Q8MEkKjsKaTJVPSbvyeROAiEA\ny0X7ouwCBvGFwQ1hhVrHzou7SG6lSxPmT7qDXeJyhaE\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..2d70d720e8 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-----\nMIICdTCCAhGgAwIBAgIQbDl7Ehfzf9dq2/3dGWu3ejAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwYzELMAkGA1UEBhMCVVMxETAPBgNVBAcTCE5ldyBZb3JrMQ4wDAYDVQQL\nEwVDb3JkYTEWMBQGA1UEChMNUjMgSG9sZENvIExMQzEZMBcGA1UEAxMQQ29yZGEg\nRG9vcm1hbiBDQTAeFw0yNDA3MzAwMDAwMDBaFw0yNzA1MjAwMDAwMDBaMC8xCzAJ\nBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoMBlBhcnR5QTBZMBMG\nByqGSM49AgEGCCqGSM49AwEHA0IABMXyUxpFyTETYNOp2E4QMDX0323rRuD2GqML\nWXttE1W8KiFVe68U4aOQcYuyLvW5MOcLDX0LDnovCgWDMQhLSM+jgdAwgc0wHQYD\nVR0OBBYEFGM4lyXZJWkSdI+68K5oPyLA7r+vMA8GA1UdEwEB/wQFMAMBAf8wCwYD\nVR0PBAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFOvuLjAV\nKUCuGZge2G/jfX8HosITMBEGCisGAQQBg4piAQEEAwIBBDBFBgNVHR4BAf8EOzA5\noDUwM6QxMC8xCzAJBgNVBAYTAkdCMQ8wDQYDVQQHDAZMb25kb24xDzANBgNVBAoM\nBlBhcnR5QaEAMBQGCCqGSM49BAMCBggqhkjOPQMBBwNIADBFAiA12w8RZBJEO76L\nVtvehuPM+dgCH2/zF73tjG14w8BtGgIhAKEgqToL6UfckNnbf15uAKmj9XPBZG22\noS8simwGxUSj\n-----END CERTIFICATE-----"]
     }
   }
 }
\ No newline at end of file
diff --git a/weaver/samples/fabric/fabric-cli/src/data/remoteNetworkUsers/Corda_Network2_UsersAndCerts.json b/weaver/samples/fabric/fabric-cli/src/data/remoteNetworkUsers/Corda_Network2_UsersAndCerts.json
index 419c33d0ef..6e971902a7 100644
--- a/weaver/samples/fabric/fabric-cli/src/data/remoteNetworkUsers/Corda_Network2_UsersAndCerts.json
+++ b/weaver/samples/fabric/fabric-cli/src/data/remoteNetworkUsers/Corda_Network2_UsersAndCerts.json
@@ -1 +1 @@
-{"O=PartyA, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRYWovdHpTY09PcTVtQTZYT1o2eGxYVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEl4TVRBeU5qQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQVZ4R3pSbWFobHFpWVkxWGFlN2E0NjlVWUwwU1Q0NG15V2oxbG5BRi95dVdqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkExK2ZIbjVBcWU2MWd4UlZyWVl2ZXBsWENXcU1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGRllXRndCUjVWTWgKaTZXcisvbGREU1dVT0RnYk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUloQVBGbFhleU9QTS9OUjA1Y1NOd2JYMlRGb213VjA0c043ZVpGcENrelZ6NUhBaUFqCk5HbU5oSWJlaWt0ZmVoYzN0ZFVHa2Y3QlI2Um92STRyTHFNbERvOE1ZZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyB, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5akNDQVdlZ0F3SUJBZ0lRVmRkLzYrK0g5QkhhVWJlOG9nazI2ekFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQ01CNFhEVEl4TVRBeU5qQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbENNQ293QlFZREsyVncKQXlFQVJ0YkZ6aDg2amVLL0h2dTFxOXR1ZkdnbDlaaWFOLzJ5QmxXZnRaZFR0MUNqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkU0cysyckdnVkFlZkFTQkhqb0VMdWpSb2hZVE1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGTHdHVVV5WVprdTgKS1VSWng4TFdsK1JCTFh1Mk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFJ3QXdSQUlnU3pyUm9yZjZ4ejZFcS92VDhWdGxNQlRKQ3pVSnh1VHdmek9VNldwcHFnZ0NJSGwrCkNVNjRnOW1lR1A4bFNoQlprd3ZXd0Y4c2hRMjBYQ1doeHowdjZkOUkKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ=="}
\ No newline at end of file
+{"O=PartyA, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ6RENDQVdlZ0F3SUJBZ0lRZWh2cmlLYVRnODFKVGcvbWFXaWdmVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQThERC8rMEJ1VFlqaERIRjJESzJGU0VRYVhSb3UvSndsVDJKZ3ZHWmJyUGVqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRk1VTGVPWnhDQ1ZCM2trSHRlNWxBK2RJdEZRNE1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGR000bHlYWkpXa1MKZEkrNjhLNW9QeUxBN3Irdk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNRQXdSZ0loQUtFUFMwQkpRQ29sSDNRaEx5YzJDbC9ROE1Fa0tqc0thVEpWUFNidnllUk9BaUVBCnkwWDdvdXdDQnZHRndRMWhoVnJIem91N1NHNmxTeFBtVDdxRFhlSnloYUU9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyC, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRUnI2TWNQZVIvQ0RNZXIwT2s2NDI4VEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsRE1CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbERNQ293QlFZREsyVncKQXlFQUZkVWtQZnN5RlNSa2ZoQVVoYmlhaDZlYzM1S0s1cmhBK3pFcWdNSWt4UzJqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRk1ZRVQwWHNyQmtKalFPOEM1UHpwazBvS2NXZk1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGRkJyYmx2b0JUTVUKbWVDNmlhNXNVb1M0NlVuNU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUloQUoxWHZtMXNZbHNSR0Q5RG9UY0hVbmFtVndNdlhwTGJYd2RsSFZYbHByaTFBaUEyCnBaK2ZSNlI0dnZjUElWSW5QckpsQjcvaW8rQkZRNkxCbEZiSXlMK1dkdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyB, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ6RENDQVdlZ0F3SUJBZ0lRVlRZMU5KenNrWWNXVDhneXFDdUpQVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQ01CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbENNQ293QlFZREsyVncKQXlFQWxncFlZWnI1Y0ZaclpDMmFsVENlRFVRdVl5OFQ1TDNSNUhBQ1kxKzBmdXFqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRk1oYmdQcHdMNVc2LzNvU1YyejNnbUJBYk1UK01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGTGx5Yyt6S1ArWUQKV01odjFILzQxdTJhU3NVWk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNRQXdSZ0loQUtYUXVvY2s4UEN2RVBoVy8velBSZnczMWNodWhtbU9ublYvanFxQm1wejVBaUVBCm55MCsxb3VKSmN6N1graHdIdVBGcVJqaWRDcWRvaUQvRmRpWHRJUFJJQms9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="}
\ No newline at end of file
diff --git a/weaver/samples/fabric/fabric-cli/src/data/remoteNetworkUsers/Corda_Network_UsersAndCerts.json b/weaver/samples/fabric/fabric-cli/src/data/remoteNetworkUsers/Corda_Network_UsersAndCerts.json
index 4d4905c1e9..5f5e8339ad 100644
--- a/weaver/samples/fabric/fabric-cli/src/data/remoteNetworkUsers/Corda_Network_UsersAndCerts.json
+++ b/weaver/samples/fabric/fabric-cli/src/data/remoteNetworkUsers/Corda_Network_UsersAndCerts.json
@@ -1 +1 @@
-{"O=PartyA, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRYXF5cmhDeGx1bE1YUTJFUndyTjVGakFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEl4TVRBeU1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQU1hSFFJNThKanB1Z3Y2dUlaMXFlajJZREFrWU9kKzhJbmdPa3AxQVhpb0NqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRlBJNExNWTFkK2hEVkdKVFhuREp1UXZpQlE1OU1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGTTFjSDFBc1B4M0cKUDBjRmlPZkN5ay9lemV2VU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUlnY0tBdFRQem11R3R3R0hUeDRHcTA3SzBSOTZsR0ZnUWhGQ3ljRk5neGNqNENJUUQyCkUxclp4TFUycEthci9NQzg2YytMTkYxRjU1ZWhmOWVnY0RVekpPOEJqZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyB, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5ekNDQVdlZ0F3SUJBZ0lRV0ZjTWIzMElIcUI1OWFRRVFKM2VPekFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQ01CNFhEVEl4TVRBeU1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbENNQ293QlFZREsyVncKQXlFQTBQZHdVaHpoS2pWcEY1WFhUV2tKYkcwNm95eE1LaXdNQk1EZGlRL0tOejZqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkZhTUtkdUlSaStWamJXL28zN3ZEZmhZTWhZcE1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGTmZGU3RwbWppSkQKMEFQNE9oUENNMmwxY1RiNU1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNBQXdSUUlnSk5Ib0JObUNuekU2dkVEZUpxVGVTSXNNWWtHcVJQZUNORStDQmpLNVROOENJUURXClIvaGhVNDRlS0NBb3M3YktUQnI2enVERkRSUUdwaFpMU3QyT2NCdi9XZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="}
\ No newline at end of file
+{"O=PartyA, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ6RENDQVdlZ0F3SUJBZ0lRWUU0YnVpNURmWGovNEZ3bGZEa1hSekFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQk1CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbEJNQ293QlFZREsyVncKQXlFQTZ0elRDY0EyZHA1TDlGWWd4Ui9UQUE0dGhoNzJ3UUJuSXdMV25NYktDZ3lqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRklFRDQ0cXhpaFBYdWo0Sm4rcHpTYjcwZjFRcE1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGRHhCV2ZoMkdIMGgKc3V4cU9CR09jUk9vTS9nc01CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNRQXdSZ0loQUxYUWU0MUltdkJOWWJ6Y29mWlBXUFREU1JjUkFzUiszcXd6L1R5Z0NPUlhBaUVBCnNXV0x5RGN5d0oxemhjdzFScmFNMGxtd2Rua2ZBMXBWOTRYSGwxYTRRUVk9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0=","O=PartyC, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ5akNDQVdlZ0F3SUJBZ0lRZmhVYnIzMXprZVd1dlUvK3Y3WGRkVEFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsRE1CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbERNQ293QlFZREsyVncKQXlFQUd1MUF6eUcvaEZXWG5TbjliTkhydTBOVG9vWUw4cmJwdmp4eVFaRlUzK1NqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRk00SnUra0Y1bFNOeHYzeVo3RTFrVWgvazlpME1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGSFdHY1NRUmJuRjMKdlZVb2FRSVduR0Uyd1dLTE1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFJ3QXdSQUlnSGFtNzE1bkxRdm51UXJ6a3JmNFRERGtPRnVXTjVKWG9hazhoZEd3bzREWUNJRk9PCkpMMlhnTGN2eVZLRHE5YUlDc3h4VGQ4YzJhUi9uLzZHN2dsRFF5Yk8KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ==","O=PartyB, L=London, C=GB":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJ6RENDQVdlZ0F3SUJBZ0lRUVFhdmhSRUtTZnBSWHpLODU3dUtkakFVQmdncWhrak9QUVFEQWdZSUtvWkkKemowREFRY3dMekVMTUFrR0ExVUVCaE1DUjBJeER6QU5CZ05WQkFjTUJreHZibVJ2YmpFUE1BMEdBMVVFQ2d3RwpVR0Z5ZEhsQ01CNFhEVEkwTURjek1EQXdNREF3TUZvWERUSTNNRFV5TURBd01EQXdNRm93THpFTE1Ba0dBMVVFCkJoTUNSMEl4RHpBTkJnTlZCQWNNQmt4dmJtUnZiakVQTUEwR0ExVUVDZ3dHVUdGeWRIbENNQ293QlFZREsyVncKQXlFQTIvRjhJNDNVeHRwUE5yZUp1Z292MklaaXRqRmNRVXphdHlVMWpwUW5UbXFqZ1lrd2dZWXdIUVlEVlIwTwpCQllFRkJxY2xTd21ERWtUc3hwb0RiYlp1TmRteFpNL01BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0N3WURWUjBQCkJBUURBZ0tFTUJNR0ExVWRKUVFNTUFvR0NDc0dBUVVGQndNQ01COEdBMVVkSXdRWU1CYUFGSHlURGtsYVZqRzkKU0NwNk9iZGIzQUM4VWlObk1CRUdDaXNHQVFRQmc0cGlBUUVFQXdJQkJqQVVCZ2dxaGtqT1BRUURBZ1lJS29aSQp6ajBEQVFjRFNRQXdSZ0loQU8vSUtReGlQVEpnSUFEb1llbkhLZVdpRXlMTGlKcGZHTmZXd1Zab0JKaEJBaUVBCm9pOVJSdnRWMDdUOWVNK25id0hTbk1xcEJYcTV2bjRjVGJ0MjVRWEw3U1E9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0="}
\ No newline at end of file
diff --git a/weaver/sdks/corda/build.gradle b/weaver/sdks/corda/build.gradle
index 9928171eb1..8ff6b5d17e 100644
--- a/weaver/sdks/corda/build.gradle
+++ b/weaver/sdks/corda/build.gradle
@@ -1,3 +1,6 @@
+import static org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+import static org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
+
 buildscript {
     Properties constants = new Properties()
     file("$projectDir/./constants.properties").withInputStream { constants.load(it) }
@@ -5,8 +8,8 @@ buildscript {
     ext {
         kotlin_version = constants.getProperty("kotlinVersion")
         coroutines_version = constants.getProperty("coroutinesVersion")
-        protobuf_version = constants.getProperty("protobufVersion")
         bcprov_version = constants.getProperty("bcprovVersion")
+        bcprov_name = constants.getProperty("bcprovName")
         grpc_version = constants.getProperty("grpcVersion") // CURRENT_GRPC_VERSION
         grpc_kotlin_version = constants.getProperty("grpcKotlinVersion") // CURRENT_GRPC_KOTLIN_VERSION
         corda_release_group = constants.getProperty("cordaReleaseGroup")
@@ -14,7 +17,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")
@@ -66,24 +68,29 @@ repositories {
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile 'com.google.code.gson:gson:2.8.6'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation 'com.google.code.gson:gson:2.8.6'
 
     // Corda dependencies.
-    compile "$corda_release_group:corda-rpc:$corda_version"
+    implementation "$corda_core_release_group:corda-core:$corda_core_version"
+    implementation "$corda_release_group:corda-node-api:$corda_version"
+    implementation "$corda_release_group:corda:$corda_version"
+    implementation "$corda_release_group:corda-rpc:$corda_version"
 
     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")
     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"
     implementation "io.grpc:grpc-stub:$grpc_version"
     implementation "io.grpc:grpc-okhttp:$grpc_version"
-    implementation "org.bouncycastle:bcprov-jdk15on:$bcprov_version"
+    implementation "io.grpc:grpc-protobuf:$grpc_version"
+    compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
+    implementation "org.bouncycastle:$bcprov_name:$bcprov_version"
     implementation group: 'org.json', name: 'json', version: '20190722'
     
     // Logger dependencies
@@ -96,14 +103,24 @@ dependencies {
 
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-    kotlinOptions {
-        languageVersion = "1.3"
-        apiVersion = "1.3"
-        jvmTarget = "1.8"
+    compilerOptions {
+        languageVersion = KOTLIN_1_9
+        apiVersion = KOTLIN_1_9
+        jvmTarget = JVM_17
         javaParameters = true
     }
 }
 
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+compileJava {
+    options.compilerArgs << '-parameters'
+}
+
 dokka {
     outputFormat = 'html'
     outputDirectory = "$buildDir/dokka"
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 12a2f23e8f..8e61bc7e3a 100644
--- a/weaver/sdks/corda/constants.properties
+++ b/weaver/sdks/corda/constants.properties
@@ -1,16 +1,16 @@
 cordaReleaseGroup=net.corda
 cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8.11
-cordaCoreVersion=4.8.11
-gradlePluginsVersion=5.0.17
-kotlinVersion=1.4.32
+cordaVersion=4.12
+cordaCoreVersion=4.12
+gradlePluginsVersion=5.1.1
+kotlinVersion=1.9.23
 junitVersion=4.12
-log4jVersion=2.17.1
-slf4jVersion=1.7.25
+log4jVersion=2.23.1
+slf4jVersion=2.0.12
 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-rc.3
+grpcVersion=1.65.0
+grpcKotlinVersion=1.4.1
+coroutinesVersion=1.8.1
+bcprovName=bcpkix-jdk18on
+bcprovVersion=1.78.1
+cactiVersion=2.0.0-rc.3
\ No newline at end of file
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/constants.properties b/weaver/tests/network-setups/corda/constants.properties
index 8893fdf42d..eb937235c7 100644
--- a/weaver/tests/network-setups/corda/constants.properties
+++ b/weaver/tests/network-setups/corda/constants.properties
@@ -1,2 +1,13 @@
-cordaTokenSDKVersion=1.2.5
-cactiVersion=2.0.0-rc.3
\ No newline at end of file
+cordaReleaseGroup=net.corda
+cordaCoreReleaseGroup=net.corda
+cordaVersion=4.12
+cordaCoreVersion=4.12
+gradlePluginsVersion=5.1.1
+kotlinVersion=1.9.23
+junitVersion=4.12
+log4jVersion=2.23.1
+platformVersion=140
+slf4jVersion=2.0.12
+nettyVersion=4.1.77.Final
+cordaTokenSDKVersion=1.3-RC02
+cactiVersion=2.0.0-rc.3
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..a16fbf4ce6 100644
--- a/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle
+++ b/weaver/tests/network-setups/corda/dev/Corda_Network/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     Properties constants = new Properties()
-    file("$projectDir/./constants.properties").withInputStream { constants.load(it) }
+    file("$projectDir/../../constants.properties").withInputStream { constants.load(it) }
 
     ext {
         corda_release_group = constants.getProperty("cordaReleaseGroup")
@@ -14,15 +14,13 @@ buildscript {
         slf4j_version = constants.getProperty("slf4jVersion")
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
         tokens_release_group = 'com.r3.corda.lib.tokens'
-        tokens_release_version = '1.2'
+        tokens_release_version = constants.getProperty("cordaTokenSDKVersion")
     }
 
     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-openjdk"
     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..4750cac01d 100644
--- a/weaver/tests/network-setups/corda/dev/Corda_Network/constants.properties
+++ b/weaver/tests/network-setups/corda/dev/Corda_Network/constants.properties
@@ -1,15 +1,3 @@
-cordaReleaseGroup=net.corda
-cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8
-cordaCoreVersion=4.8
-gradlePluginsVersion=5.0.17
-kotlinVersion=1.4.32
-junitVersion=4.12
-log4jVersion =2.11.2
-platformVersion=10
-slf4jVersion=1.7.25
-nettyVersion=4.1.22.Final
-
 notaryRpcAddress=localhost:10003
 notaryAdminRpcAddress=localhost:10043
 partyARpcAddress=localhost:10006
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..29be1b684e 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.12-zulu-openjdk
     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.12-zulu-openjdk
     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.12-zulu-openjdk
     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.12-zulu-openjdk
     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..909df73b0d 100644
--- a/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle
+++ b/weaver/tests/network-setups/corda/dev/Corda_Network2/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     Properties constants = new Properties()
-    file("$projectDir/./constants.properties").withInputStream { constants.load(it) }
+    file("$projectDir/../../constants.properties").withInputStream { constants.load(it) }
 
     ext {
         corda_release_group = constants.getProperty("cordaReleaseGroup")
@@ -14,15 +14,13 @@ buildscript {
         slf4j_version = constants.getProperty("slf4jVersion")
         corda_platform_version = constants.getProperty("platformVersion").toInteger()
         tokens_release_group = 'com.r3.corda.lib.tokens'
-        tokens_release_version = '1.2'
+        tokens_release_version = constants.getProperty("cordaTokenSDKVersion")
     }
 
     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..e99afd28cf 100644
--- a/weaver/tests/network-setups/corda/dev/Corda_Network2/constants.properties
+++ b/weaver/tests/network-setups/corda/dev/Corda_Network2/constants.properties
@@ -1,15 +1,3 @@
-cordaReleaseGroup=net.corda
-cordaCoreReleaseGroup=net.corda
-cordaVersion=4.8
-cordaCoreVersion=4.8
-gradlePluginsVersion=5.0.17
-kotlinVersion=1.4.32
-junitVersion=4.12
-log4jVersion =2.11.2
-platformVersion=10
-slf4jVersion=1.7.25
-nettyVersion=4.1.22.Final
-
 notaryRpcAddress=localhost:30003
 notaryAdminRpcAddress=localhost:30043
 partyARpcAddress=localhost:30006
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..6d63ee8a97 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.12-zulu-openjdk
     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.12-zulu-openjdk
     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.12-zulu-openjdk
     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.12-zulu-openjdk
     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 b898627d72..8452932db3 100644
--- a/weaver/tests/network-setups/corda/makefile
+++ b/weaver/tests/network-setups/corda/makefile
@@ -66,11 +66,19 @@ restart-with-new-interop-app: stop
 
 .PHONY:	stop-network1
 stop-network1: 
-	docker compose -f dev/Corda_Network/docker-compose.yml -p corda --profile $(PROFILE) down --volumes || true
+	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 compose -f dev/Corda_Network2/docker-compose.yml -p corda_network2 --profile $(PROFILE) down --volumes || true
+	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/scripts/start-nodes.sh b/weaver/tests/network-setups/corda/scripts/start-nodes.sh
index 5317d4d50a..1dee0ff060 100755
--- a/weaver/tests/network-setups/corda/scripts/start-nodes.sh
+++ b/weaver/tests/network-setups/corda/scripts/start-nodes.sh
@@ -46,4 +46,3 @@ fi
 
 docker compose -f dev/${nw}/docker-compose.yml -p $dockerProject --profile $profile up -d
 docker ps -a
-#docker logs corda_partya_1 -f
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..2dddcd1b13
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..d4fb2d48ca 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..4ec27dc947 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..6b02c359f1 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..65a012aec7 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..7a29e0c2b0 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..0806003a2b 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..f3343f89b3 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..7d4a4eeaca 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..d4fb2d48ca 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..d6d3a2b339 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..14b2f77613 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,54 +1,85 @@
-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-07-30 10:41:49.879434Z 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-07-30 10:41:53.056620Z 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-07-30 10:41:55.214298Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
@@ -57,51 +88,166 @@ 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-07-30 10:41:55.718787Z 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:110)
+	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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
+	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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:107)
+	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-07-30 10:41:56.421547Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
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..d4fb2d48ca 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..4ec27dc947 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..6b02c359f1 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..65a012aec7 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..04b8b044ae 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..262511d39c 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..d8ffa59120 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..7d4a4eeaca 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..65a012aec7 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..e7b4211c39 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..8bbb1eca83 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,54 +1,85 @@
-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-07-30 10:41:52.682365Z 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-07-30 10:41:56.089352Z 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-07-30 10:41:58.231729Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
@@ -57,51 +88,166 @@ 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-07-30 10:41:58.561350Z 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:110)
+	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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
+	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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:107)
+	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-07-30 10:41:59.288443Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
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..d4fb2d48ca 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..4ec27dc947 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..6b02c359f1 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..65a012aec7 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..1f09c587d7 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..b7c7959ca7 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..9f39518b1b 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..7d4a4eeaca 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..6b02c359f1 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..d7c68b1ebc 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..f9831afb90 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,54 +1,85 @@
-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-07-30 10:41:53.027915Z 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-07-30 10:41:56.136848Z 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-07-30 10:41:58.286915Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
@@ -57,51 +88,166 @@ 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-07-30 10:41:58.702390Z 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:110)
+	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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
+	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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:107)
+	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-07-30 10:41:59.368660Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
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..d4fb2d48ca 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..4ec27dc947 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..6b02c359f1 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..65a012aec7 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..0bf4de2ed9 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..db6c7469ae 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..99c1d92d54 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..7d4a4eeaca 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..4ec27dc947 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..7f186978de 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..101e2b1710 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,54 +1,85 @@
-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-07-30 10:41:53.341275Z 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-07-30 10:41:56.874759Z 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-07-30 10:41:58.823587Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
@@ -57,51 +88,166 @@ 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-07-30 10:41:59.171418Z 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:110)
+	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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
+	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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:107)
+	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-07-30 10:42:00.162029Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
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..2302003db3 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-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/node.conf:/etc/corda/node.conf',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/certificates:/opt/corda/certificates',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/logs:/opt/corda/logs',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/persistence:/opt/corda/persistence',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/cordapps:/opt/corda/cordapps',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/network-parameters:/opt/corda/network-parameters',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/Notary/additional-node-infos:/opt/corda/additional-node-infos',
+      '/data/dlt-interop/cacti-s/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.12-zulu-openjdk
   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-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/node.conf:/etc/corda/node.conf',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/certificates:/opt/corda/certificates',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/logs:/opt/corda/logs',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/persistence:/opt/corda/persistence',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/cordapps:/opt/corda/cordapps',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/network-parameters:/opt/corda/network-parameters',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyA/additional-node-infos:/opt/corda/additional-node-infos',
+      '/data/dlt-interop/cacti-s/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.12-zulu-openjdk
   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-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/node.conf:/etc/corda/node.conf',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/certificates:/opt/corda/certificates',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/logs:/opt/corda/logs',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/persistence:/opt/corda/persistence',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/cordapps:/opt/corda/cordapps',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/network-parameters:/opt/corda/network-parameters',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyB/additional-node-infos:/opt/corda/additional-node-infos',
+      '/data/dlt-interop/cacti-s/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.12-zulu-openjdk
   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-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/node.conf:/etc/corda/node.conf',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/certificates:/opt/corda/certificates',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/logs:/opt/corda/logs',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/persistence:/opt/corda/persistence',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/cordapps:/opt/corda/cordapps',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/network-parameters:/opt/corda/network-parameters',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network/build/nodes/PartyC/additional-node-infos:/opt/corda/additional-node-infos',
+      '/data/dlt-interop/cacti-s/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.12-zulu-openjdk
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..0c79d4dc31 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..f11cc8a756 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..6bc56392c3 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..46b9b7a2fb 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..ce18b6b6dd 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..d6fc95363c 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..5483bec3c1 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..407957ec45 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..4f830e3137 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..f11cc8a756 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..a087625fae 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..3f4e28432e 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,54 +1,85 @@
-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-07-30 10:45:27.839674Z 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-07-30 10:45:31.196918Z 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-07-30 10:45:33.395425Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
@@ -57,51 +88,166 @@ 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-07-30 10:45:33.566036Z 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:110)
+	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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
+	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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:107)
+	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-07-30 10:45:34.281319Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
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..f11cc8a756 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..6bc56392c3 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..46b9b7a2fb 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..ce18b6b6dd 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..b6c6aab014 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..6069e37bb8 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..c168ca18ad 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..4f830e3137 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..ce18b6b6dd 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..dff88446c5 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..a0e217b9bb 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,54 +1,85 @@
-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-07-30 10:45:29.146185Z 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-07-30 10:45:32.838039Z 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-07-30 10:45:34.681646Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
@@ -57,51 +88,166 @@ 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-07-30 10:45:35.028680Z 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:110)
+	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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
+	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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:107)
+	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-07-30 10:45:35.850428Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
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..f11cc8a756 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..6bc56392c3 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..46b9b7a2fb 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..ce18b6b6dd 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..5586ccaac8 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..040e144b8f 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..622b51ef2f 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..4f830e3137 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..46b9b7a2fb 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..4fd2f349b8 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..7fe893f1ea 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,54 +1,85 @@
-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-07-30 10:45:29.842361Z 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-07-30 10:45:33.445696Z 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-07-30 10:45:35.608609Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
@@ -57,51 +88,166 @@ 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-07-30 10:45:35.895980Z 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:110)
+	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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
+	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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:107)
+	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-07-30 10:45:36.591044Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
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..f11cc8a756 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..6bc56392c3 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..46b9b7a2fb 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..ce18b6b6dd 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..85f76e769b 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..1279ec2848 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..1a31269573 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..4f830e3137 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..6bc56392c3 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..15a261bbd3 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..d88225d497 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,54 +1,85 @@
-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-07-30 10:45:25.793949Z 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-07-30 10:45:29.144086Z 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-07-30 10:45:30.947695Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
@@ -57,51 +88,166 @@ 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-07-30 10:45:31.328963Z 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:110)
+	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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
+	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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:107)
+	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-07-30 10:45:32.096593Z 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)
-	at com.zaxxer.hikari.pool.ProxyStatement.executeQuery(ProxyStatement.java:111)
+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:110)
 	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 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 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:466)
+	at net.corda.node.internal.AbstractNode$runDatabaseMigrationScripts$3.invoke(AbstractNode.kt:463)
+	at net.corda.node.internal.AbstractNodeKt.startHikariPool(AbstractNode.kt:1403)
+	at net.corda.node.internal.AbstractNode.runDatabaseMigrationScripts(AbstractNode.kt:463)
+	at net.corda.node.internal.Node.runDatabaseMigrationScripts(Node.kt:481)
 	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:229)
+	at net.corda.node.internal.NodeStartupLogging.attempt(NodeStartup.kt:558)
+	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 net.corda.cliutils.CliWrapperBase.call(CordaCliWrapper.kt:107)
 	at picocli.CommandLine.execute(CommandLine.java:1173)
 	at picocli.CommandLine.access$800(CommandLine.java:141)
 	at picocli.CommandLine$RunLast.handle(CommandLine.java:1367)
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..b05783d76d 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-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/node.conf:/etc/corda/node.conf',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/certificates:/opt/corda/certificates',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/logs:/opt/corda/logs',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/persistence:/opt/corda/persistence',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/cordapps:/opt/corda/cordapps',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/network-parameters:/opt/corda/network-parameters',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/Notary/additional-node-infos:/opt/corda/additional-node-infos',
+      '/data/dlt-interop/cacti-s/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.12-zulu-openjdk
   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-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/node.conf:/etc/corda/node.conf',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/certificates:/opt/corda/certificates',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/logs:/opt/corda/logs',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/persistence:/opt/corda/persistence',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/cordapps:/opt/corda/cordapps',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/network-parameters:/opt/corda/network-parameters',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyA/additional-node-infos:/opt/corda/additional-node-infos',
+      '/data/dlt-interop/cacti-s/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.12-zulu-openjdk
   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-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/node.conf:/etc/corda/node.conf',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/certificates:/opt/corda/certificates',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/logs:/opt/corda/logs',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/persistence:/opt/corda/persistence',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/cordapps:/opt/corda/cordapps',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/network-parameters:/opt/corda/network-parameters',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyB/additional-node-infos:/opt/corda/additional-node-infos',
+      '/data/dlt-interop/cacti-s/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.12-zulu-openjdk
   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-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/node.conf:/etc/corda/node.conf',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/certificates:/opt/corda/certificates',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/logs:/opt/corda/logs',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/persistence:/opt/corda/persistence',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/cordapps:/opt/corda/cordapps',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/network-parameters:/opt/corda/network-parameters',
+      '/data/dlt-interop/cacti-s/weaver/tests/network-setups/corda/dev/Corda_Network2/build/nodes/PartyC/additional-node-infos:/opt/corda/additional-node-infos',
+      '/data/dlt-interop/cacti-s/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.12-zulu-openjdk
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