Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions weaver/common/protos-java-kt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
ext.protobuf_version = "3.11.1"
ext.grpc_version = "1.29.0" // CURRENT_GRPC_VERSION
ext.grpc_kotlin_version = "0.1.4" // CURRENT_GRPC_KOTLIN_VERSION
ext.kotlin_version = "1.4.32"
ext.kotlin_version = "1.3.72"

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand All @@ -15,7 +15,7 @@ buildscript {
plugins {
id "maven-publish"
id 'java'
id 'com.google.protobuf' version '0.8.12'
id 'com.google.protobuf' version '0.9.4'
id 'idea'
}

Expand Down Expand Up @@ -60,7 +60,7 @@ dependencies {

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
implementation "io.grpc:grpc-kotlin-stub:$grpc_kotlin_version"
compile "com.google.protobuf:protobuf-java:$protobuf_version"
implementation "com.google.protobuf:protobuf-java:$protobuf_version"
implementation "com.google.protobuf:protobuf-java-util:$protobuf_version"
implementation "io.grpc:grpc-netty-shaded:$grpc_version"
implementation "io.grpc:grpc-protobuf:$grpc_version"
Expand Down
Binary file modified weaver/common/protos-java-kt/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
12 changes: 8 additions & 4 deletions weaver/common/protos-java-kt/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions weaver/common/protos-java-kt/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions weaver/core/drivers/corda-driver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ buildscript {
ext {
kotlin_version = constants.getProperty("kotlinVersion")
coroutines_version = constants.getProperty("coroutinesVersion")
protobuf_version = constants.getProperty("protobufVersion")
bcprov_version = constants.getProperty("bcprovVersion")
grpc_version = constants.getProperty("grpcVersion") // CURRENT_GRPC_VERSION
grpc_kotlin_version = constants.getProperty("grpcKotlinVersion") // CURRENT_GRPC_KOTLIN_VERSION
Expand All @@ -20,8 +19,6 @@ buildscript {
repositories {
mavenCentral()
maven { url 'https://download.corda.net/maven/corda-dependencies' }
maven { url 'https://download.corda.net/maven/corda-releases' }
maven { url 'https://download.corda.net/maven/corda-lib' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
Expand All @@ -31,7 +28,6 @@ buildscript {
plugins {
id "idea"
id "application"
id "com.google.protobuf" version "0.8.12"
id 'org.jetbrains.dokka' version '0.10.1'
id 'maven-publish'
}
Expand Down Expand Up @@ -117,12 +113,9 @@ dependencies {
implementation(group: 'org.hyperledger.cacti.weaver.sdk.corda', name: 'weaver-sdk-corda', version: "$cacti_version")
implementation(group: 'org.hyperledger.cacti.weaver.protos', name: 'protos-java-kt', version: "$cacti_version")

// gRPC and protobuf dependencies
// gRPC dependencies
implementation "io.grpc:grpc-kotlin-stub:$grpc_kotlin_version"
implementation "com.google.protobuf:protobuf-java:$protobuf_version"
implementation "com.google.protobuf:protobuf-java-util:$protobuf_version"
implementation "io.grpc:grpc-netty-shaded:$grpc_version"
implementation "io.grpc:grpc-protobuf:$grpc_version"
implementation "io.grpc:grpc-stub:$grpc_version"

testImplementation("org.junit.jupiter:junit-jupiter:5.6.2")
Expand Down
8 changes: 3 additions & 5 deletions weaver/core/drivers/corda-driver/constants.properties
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
cordaReleaseGroup=net.corda
cordaCoreReleaseGroup=net.corda
cordaVersion=4.8.11
cordaCoreVersion=4.8.11
gradlePluginsVersion=5.0.17
kotlinVersion=1.4.32
cordaVersion=4.11.2
cordaCoreVersion=4.11.2
kotlinVersion=1.3.72
junitVersion=4.12
log4jVersion=2.17.1
slf4jVersion=1.7.25
arrowVersion=0.10.4
grpcVersion=1.28.1
grpcKotlinVersion=0.1.3
protobufVersion=3.11.1
coroutinesVersion=1.3.3
bcprovVersion=1.53
cactiVersion=2.0.0-alpha.2
4 changes: 4 additions & 0 deletions weaver/core/drivers/corda-driver/corda-driver.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
Corda driver gRPC server started. Listening on port 9099
58 changes: 58 additions & 0 deletions weaver/core/drivers/corda-driver/corda2-driver.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
Corda driver gRPC server started. Listening on port 9098
Request received with request: policy: "PartyA"
address: "localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H"
requesting_relay: "Corda_Relay"
requesting_network: "Corda_Network"
certificate: "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQbegAkzWcX6OtUTjSxUFqDzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDQwMzAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8dXDfPWS+bdtEos6Qfdn3JF+4HPK1awT2ZxDTOatbJqjgYkwgYYwHQYDVR0O\nBBYEFHs332oSTBtWVMUUvbUIlvseMMhFMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFPsSlKzW4bnK\nIvXuCXfQ7DNG4PnGMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhANlDCcnECJlBJg2/8DMQHzgdmfmpmDRZUN9PrrFwsG/VAiEA\n22e5ScYUlh1GuzU6gdhD9cApoDYRcJNNkx72hf+yYfc=\n-----END CERTIFICATE-----"
requestor_signature: "z6+b1Nj9/0J63+G9LIFLB6jVJs8neIB7DvurXO5DD7FR/fk3cFqPX4QSR77ENQOBzPAzQUJZRMDeL1VgA0/fAA=="
nonce: "b0709b3a-9b07-4a59-b3c9-a99fa40a5f58"
request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
requesting_org: "PartyA"

Fetching state from the Corda network.

Sending back Ack: request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
message: "Received query with request id 06a5e496-a422-4adc-a6e7-8059d7d17ae5"


UseHandleExternalRequest Query: policy: "PartyA"
address: "localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H"
requesting_relay: "Corda_Relay"
requesting_network: "Corda_Network"
certificate: "-----BEGIN CERTIFICATE-----\nMIIBzDCCAWegAwIBAgIQbegAkzWcX6OtUTjSxUFqDzAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDQwMzAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEA8dXDfPWS+bdtEos6Qfdn3JF+4HPK1awT2ZxDTOatbJqjgYkwgYYwHQYDVR0O\nBBYEFHs332oSTBtWVMUUvbUIlvseMMhFMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFPsSlKzW4bnK\nIvXuCXfQ7DNG4PnGMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSQAwRgIhANlDCcnECJlBJg2/8DMQHzgdmfmpmDRZUN9PrrFwsG/VAiEA\n22e5ScYUlh1GuzU6gdhD9cApoDYRcJNNkx72hf+yYfc=\n-----END CERTIFICATE-----"
requestor_signature: "z6+b1Nj9/0J63+G9LIFLB6jVJs8neIB7DvurXO5DD7FR/fk3cFqPX4QSR77ENQOBzPAzQUJZRMDeL1VgA0/fAA=="
nonce: "b0709b3a-9b07-4a59-b3c9-a99fa40a5f58"
request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
requesting_org: "PartyA"

Corda node returned: Right(b=meta {
protocol: CORDA
timestamp: "Wed Apr 03 11:36:07 GMT 2024"
proof_type: "Notarization"
serialization_format: "JSON"
}
data: "\n\340\a\nXcXr2W+0ybX1JMPqeMjf2j8kV+FLxKA9FVZb0TK1JFfv28e3nfn6hNrSKHmstnc1AfeZJ8E2cTOHWhym9M55+AQ==\022\253\005-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRpFm6AV5iiyqlbYzaSYdKTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDQwMzAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAny/nlO4++cTKtX84FvSMMiIhhCP0FTnfE74ZDB2rD96jgYkwgYYwHQYDVR0O\nBBYEFBMga2ymFN2aODB4qnJpPr7tCUrAMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFP2u0aRPecA0\nu9iPLdjjsED4kakYMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPLUoVyWaGHyPXeNYGcNhlmVWoBuRXDBqiNJhqMNuignAiB+\nyH5XnaSOtZiXc2JezzvYaF8QJ6QzPV5K6dA67VD+VA==\n-----END CERTIFICATE-----\032\006PartyA\"\315\001\nl[SimpleState(key=H, value=1, owner=O=PartyA, L=London, C=GB, linearId=451a242f-20cd-42d1-a6b0-3ff2bf6e4393)]\022]localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H"
)

Aggregating the notarizedPayloads returned from all Corda nodes.

Sending state back to remote relay: request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"
view {
meta {
protocol: CORDA
timestamp: "Wed Apr 03 11:36:07 GMT 2024"
proof_type: "Notarization"
serialization_format: "JSON"
}
data: "\n\340\a\nXcXr2W+0ybX1JMPqeMjf2j8kV+FLxKA9FVZb0TK1JFfv28e3nfn6hNrSKHmstnc1AfeZJ8E2cTOHWhym9M55+AQ==\022\253\005-----BEGIN CERTIFICATE-----\nMIIByzCCAWegAwIBAgIQRpFm6AV5iiyqlbYzaSYdKTAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcwLzELMAkGA1UEBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwG\nUGFydHlBMB4XDTI0MDQwMzAwMDAwMFoXDTI3MDUyMDAwMDAwMFowLzELMAkGA1UE\nBhMCR0IxDzANBgNVBAcMBkxvbmRvbjEPMA0GA1UECgwGUGFydHlBMCowBQYDK2Vw\nAyEAny/nlO4++cTKtX84FvSMMiIhhCP0FTnfE74ZDB2rD96jgYkwgYYwHQYDVR0O\nBBYEFBMga2ymFN2aODB4qnJpPr7tCUrAMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P\nBAQDAgKEMBMGA1UdJQQMMAoGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFP2u0aRPecA0\nu9iPLdjjsED4kakYMBEGCisGAQQBg4piAQEEAwIBBjAUBggqhkjOPQQDAgYIKoZI\nzj0DAQcDSAAwRQIhAPLUoVyWaGHyPXeNYGcNhlmVWoBuRXDBqiNJhqMNuignAiB+\nyH5XnaSOtZiXc2JezzvYaF8QJ6QzPV5K6dA67VD+VA==\n-----END CERTIFICATE-----\032\006PartyA\"\315\001\nl[SimpleState(key=H, value=1, owner=O=PartyA, L=London, C=GB, linearId=451a242f-20cd-42d1-a6b0-3ff2bf6e4393)]\022]localhost:9082/Corda_Network2/localhost:30006#com.cordaSimpleApplication.flow.GetStateByKey:H"
}


Sending state back to the relay for request 06a5e496-a422-4adc-a6e7-8059d7d17ae5
Received from SendDriverState: request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"

Response back from relay from sendDriverState request: request_id: "06a5e496-a422-4adc-a6e7-8059d7d17ae5"

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
12 changes: 8 additions & 4 deletions weaver/core/drivers/corda-driver/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions weaver/core/drivers/corda-driver/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions weaver/core/drivers/corda-driver/jre8.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM debian:12

CMD ["bash"]
RUN /bin/sh -c set -eux; apt-get update; apt-get install -y --no-install-recommends ca-certificates curl netbase wget ; rm -rf /var/lib/apt/lists/*
RUN /bin/sh -c set -ex; if ! command -v gpg > /dev/null; then apt-get update; apt-get install -y --no-install-recommends gnupg dirmngr ; rm -rf /var/lib/apt/lists/*; fi
RUN /bin/sh -c set -eux; apt-get update; apt-get install -y --no-install-recommends bzip2 unzip xz-utils fontconfig libfreetype6 ca-certificates p11-kit ; rm -rf /var/lib/apt/lists/*

ENV JAVA_HOME=/usr/local/openjdk-8
RUN /bin/sh -c { echo '#/bin/sh'; echo 'echo "$JAVA_HOME"'; } > /usr/local/bin/docker-java-home && chmod +x /usr/local/bin/docker-java-home && [ "$JAVA_HOME" = "$(docker-java-home)" ] # backwards compatibility
ENV PATH=/usr/local/openjdk-8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV LANG=C.UTF-8
ENV JAVA_VERSION=8u402

RUN /bin/sh -c set -eux; arch="$(dpkg --print-architecture)"; case "$arch" in 'amd64') downloadUrl='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jre_x64_linux_hotspot_8u402b06.tar.gz'; ;; 'arm64') downloadUrl='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u402-b06/OpenJDK8U-jre_aarch64_linux_hotspot_8u402b06.tar.gz'; ;; *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; esac; wget --progress=dot:giga -O openjdk.tgz "$downloadUrl"; wget --progress=dot:giga -O openjdk.tgz.asc "$downloadUrl.sign"; export GNUPGHOME="$(mktemp -d)"; gpg --batch --keyserver keyserver.ubuntu.com --recv-keys EAC843EBD3EFDB98CC772FADA5CD6035332FA671; gpg --batch --keyserver keyserver.ubuntu.com --keyserver-options no-self-sigs-only --recv-keys CA5F11C6CE22644D42C6AC4492EF8D39DC13168F; gpg --batch --list-sigs --keyid-format 0xLONG CA5F11C6CE22644D42C6AC4492EF8D39DC13168F | tee /dev/stderr | grep '0xA5CD6035332FA671' | grep 'Andrew Haley'; gpg --batch --verify openjdk.tgz.asc openjdk.tgz; gpgconf --kill all; rm -rf "$GNUPGHOME"; mkdir -p "$JAVA_HOME"; tar --extract --file openjdk.tgz --directory "$JAVA_HOME" --strip-components 1 --no-same-owner ; rm openjdk.tgz*; { echo '#!/usr/bin/env bash'; echo 'set -Eeuo pipefail'; echo 'trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$JAVA_HOME/lib/security/cacerts"'; } > /etc/ca-certificates/update.d/docker-openjdk; chmod +x /etc/ca-certificates/update.d/docker-openjdk; /etc/ca-certificates/update.d/docker-openjdk; find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; ldconfig; java -version

20 changes: 8 additions & 12 deletions weaver/core/network/corda-interop-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -115,27 +115,23 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

// Corda dependencies.
cordaCompile "$corda_core_release_group:corda-core:$corda_core_release_version"
cordaRuntime "$corda_release_group:corda-node-api:$corda_release_version"
cordaRuntime "$corda_release_group:corda:$corda_release_version"
cordaProvided "$corda_core_release_group:corda-core:$corda_core_release_version"
cordaRuntimeOnly "$corda_release_group:corda-node-api:$corda_release_version"
cordaRuntimeOnly "$corda_release_group:corda:$corda_release_version"

// CorDapp dependencies.
cordapp project(":interop-workflows")
cordapp project(":interop-contracts")

// Logging dependencies.
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaCompile "org.slf4j:jul-to-slf4j:$slf4j_version"
cordaProvided "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
cordaProvided "org.apache.logging.log4j:log4j-web:${log4j_version}"
cordaProvided "org.slf4j:jul-to-slf4j:$slf4j_version"
}

cordapp {
info {
name "CorDapp Template"
vendor "Corda Open Source"
targetPlatformVersion corda_platform_version
minimumPlatformVersion corda_platform_version
}
targetPlatformVersion corda_platform_version
minimumPlatformVersion corda_platform_version
}

task installQuasar(type: Copy) {
Expand Down
10 changes: 5 additions & 5 deletions weaver/core/network/corda-interop-app/constants.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cordaReleaseGroup=net.corda
cordaCoreReleaseGroup=net.corda
cordaVersion=4.8.11
cordaCoreVersion=4.8.11
gradlePluginsVersion=5.0.17
kotlinVersion=1.4.32
cordaVersion=4.11.2
cordaCoreVersion=4.11.2
gradlePluginsVersion=5.1.1
kotlinVersion=1.3.72
junitVersion=4.12
log4jVersion=2.17.1
platformVersion=10
platformVersion=13
slf4jVersion=1.7.25
nettyVersion=4.1.22.Final
arrowVersion=0.10.4
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
12 changes: 8 additions & 4 deletions weaver/core/network/corda-interop-app/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions weaver/core/network/corda-interop-app/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading