Merge pull request #335 from sanvenDev/relay-fix

Relay Improvements and Protos Rust module
hyperledger-labs · Dec 2, 2022 · b5dc050 · b5dc050
2 parents e6d8b02 + ef45552
commit b5dc050
Show file tree

Hide file tree

Showing 120 changed files with 4,112 additions and 494 deletions.
diff --git a/.github/workflows/test_asset-transfer.yml b/.github/workflows/test_asset-transfer.yml
@@ -440,6 +440,7 @@ jobs:
 
       - name: Get Latest Relay Dependencies
         run: |
+          make protos-local
           cargo update -p nom
           cargo update -p lexical-core
         working-directory: core/relay

diff --git a/.github/workflows/test_data-sharing.yml b/.github/workflows/test_data-sharing.yml
@@ -692,6 +692,7 @@ jobs:
 
       - name: Get Latest Relay Dependencies
         run: |
+          make protos-local
           cargo update -p nom
           cargo update -p lexical-core
         working-directory: core/relay

diff --git a/.github/workflows/test_relay.yml b/.github/workflows/test_relay.yml
@@ -24,18 +24,23 @@ jobs:
           profile: minimal
           toolchain: stable
           components: rustfmt, clippy
+
+      - name: Use Protoc 3.15
+        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
+            
+      - name: Build Protos RS
+        run: make build
+        working-directory: common/protos-rs
 
       - name: Get Latest Relay Dependencies
         run: |
+          make protos-local
           cargo update -p nom
           cargo update -p lexical-core
         working-directory: core/relay
 
-      - name: Use Protoc 3.15
-        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
-          
       - name: Build Image
         run: make
         working-directory: core/relay

diff --git a/common/protos-go/VERSION b/common/protos-go/VERSION
@@ -1 +1 @@
-1.5.3
+1.5.4
diff --git a/common/protos-go/common/access_control.pb.go b/common/protos-go/common/access_control.pb.go
diff --git a/common/protos-go/common/ack.pb.go b/common/protos-go/common/ack.pb.go
diff --git a/common/protos-go/common/asset_locks.pb.go b/common/protos-go/common/asset_locks.pb.go
diff --git a/common/protos-go/common/asset_transfer.pb.go b/common/protos-go/common/asset_transfer.pb.go
diff --git a/common/protos-go/common/events.pb.go b/common/protos-go/common/events.pb.go
diff --git a/common/protos-go/common/interop_payload.pb.go b/common/protos-go/common/interop_payload.pb.go
diff --git a/common/protos-go/common/membership.pb.go b/common/protos-go/common/membership.pb.go
diff --git a/common/protos-go/common/proofs.pb.go b/common/protos-go/common/proofs.pb.go
diff --git a/common/protos-go/common/query.pb.go b/common/protos-go/common/query.pb.go
diff --git a/common/protos-go/common/state.pb.go b/common/protos-go/common/state.pb.go
diff --git a/common/protos-go/common/verification_policy.pb.go b/common/protos-go/common/verification_policy.pb.go
diff --git a/common/protos-go/corda/view_data.pb.go b/common/protos-go/corda/view_data.pb.go
diff --git a/common/protos-go/driver/driver.pb.go b/common/protos-go/driver/driver.pb.go
diff --git a/common/protos-go/driver/driver_grpc.pb.go b/common/protos-go/driver/driver_grpc.pb.go
diff --git a/common/protos-go/fabric/view_data.pb.go b/common/protos-go/fabric/view_data.pb.go
diff --git a/common/protos-go/identity/agent.pb.go b/common/protos-go/identity/agent.pb.go
diff --git a/common/protos-go/identity/agent_grpc.pb.go b/common/protos-go/identity/agent_grpc.pb.go
diff --git a/common/protos-go/networks/networks.pb.go b/common/protos-go/networks/networks.pb.go
diff --git a/common/protos-go/networks/networks_grpc.pb.go b/common/protos-go/networks/networks_grpc.pb.go
diff --git a/common/protos-go/relay/datatransfer.pb.go b/common/protos-go/relay/datatransfer.pb.go
diff --git a/common/protos-go/relay/datatransfer_grpc.pb.go b/common/protos-go/relay/datatransfer_grpc.pb.go
diff --git a/common/protos-go/relay/events.pb.go b/common/protos-go/relay/events.pb.go
diff --git a/common/protos-go/relay/events_grpc.pb.go b/common/protos-go/relay/events_grpc.pb.go
diff --git a/common/protos-java-kt/README.md b/common/protos-java-kt/README.md
@@ -1,5 +1,15 @@
 # Compiled Protos for Java and Kotlin
 
+## Updating Version
+
+If updating Protos version for Java/Kotlin, update the dependency version for in (can be done in same PR):
+* `core/network/corda-interop-app/constants.properties`
+* `core/drivers/corda-driver/build.gradle`
+* `sdks/corda/build.gradle`
+* `samples/corda/corda-simple-application/constants.properties`
+* `tests/network-setups/corda/scripts/get-cordapps.sh`
+* `tests/network-setups/corda/scripts/start-nodes.sh`
+
 ## Steps to publish:
 
 1) Create a Personal Access Token from Github with write/read/delete access to packages. Refer [Creating a Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) for help.

diff --git a/common/protos-js/package.json b/common/protos-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hyperledger-labs/weaver-protos-js",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Interop protos for Node JS (Weaver)",
   "main": "index.js",
   "exports": {

diff --git a/common/protos-rs/.gitignore b/common/protos-rs/.gitignore
@@ -0,0 +1 @@
+target