Merge pull request #354 from VRamakrishna/main

Data Sharing Protocol Bug Fixes and RFC Specification Improvements
hyperledger-cacti · Dec 29, 2022 · fc30dcb · fc30dcb
2 parents aebfc9d + 292dac7
commit fc30dcb
Show file tree

Hide file tree

Showing 115 changed files with 612 additions and 367 deletions.
diff --git a/.github/workflows/test_asset-exchange-fabric.yml b/.github/workflows/test_asset-exchange-fabric.yml
@@ -21,7 +21,7 @@ on:
 jobs:
 
   asset-exchange-fabric:
-    if: ${{ false }}
+    # if: ${{ false }}
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -95,7 +95,7 @@ jobs:
         working-directory: samples/fabric/fabric-cli
 
   asset-exchange-fabric-local:
-    if: ${{ false }}
+    # if: ${{ false }}
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/test_asset-transfer.yml b/.github/workflows/test_asset-transfer.yml
@@ -406,7 +406,7 @@ jobs:
         working-directory: samples/fabric/fabric-cli
 
   fabric-asset-transfer-local:
-    if: ${{ false }}
+    # if: ${{ false }}
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/test_data-sharing.yml b/.github/workflows/test_data-sharing.yml
@@ -334,7 +334,7 @@ jobs:
         working-directory: samples/fabric/fabric-cli
 
   data-sharing-docker-local:
-    if: ${{ false }}
+    # if: ${{ false }}
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -646,7 +646,7 @@ jobs:
           cat tmp.out
 
           # FABRIC2 - FABRIC1 - CONFIDENTIAL
-          sed -i "s/\"args\"\: \[\"a\"/\"args\"\: \[\"b\"/g" chaincode.json
+          sed -i "s/\"args\"\: \[\"Arcturus\"/\"args\"\: \[\"b\"/g" chaincode.json
           ./bin/fabric-cli interop --local-network=network2 --requesting-org=Org1MSP --e2e-confidentiality=true relay-network1:9080/network1/mychannel:simplestate:Read:b &> tmp.out
           tail -n 1 tmp.out | grep "Args: b, Betelgeuse" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
@@ -656,7 +656,7 @@ jobs:
           cat tmp.out
 
           # FABRIC1 - FABRIC2 - CONFIDENTIAL
-          sed -i "s/\"args\"\: \[\"Arcturus\"/\"args\"\: \[\"Betelgeuse\"/g" chaincode.json
+          sed -i "s/\"args\"\: \[\"b\"/\"args\"\: \[\"Betelgeuse\"/g" chaincode.json
           ./bin/fabric-cli interop --local-network=network1 --requesting-org=Org1MSP --e2e-confidentiality=true relay-network2:9083/network2/mychannel:simplestate:Read:Betelgeuse &> tmp.out
           tail -n 1 tmp.out | grep "Args: Betelgeuse, 617.1" && COUNT=$(( COUNT + 1 )) && echo "PASS"
           cat tmp.out
@@ -699,7 +699,7 @@ jobs:
         working-directory: samples/fabric/fabric-cli
 
   data-sharing-local:
-    if: ${{ false }}
+    # if: ${{ false }}
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/test_go.yml b/.github/workflows/test_go.yml
@@ -12,7 +12,6 @@ on:
 
 jobs:
   test_interopcc:
-    if: ${{ false }}  # disable
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

diff --git a/common/protos-go/VERSION b/common/protos-go/VERSION
@@ -1 +1 @@
-1.5.5
+1.5.6
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-java-kt/gradle.properties b/common/protos-java-kt/gradle.properties
@@ -1,4 +1,4 @@
 name=Interop Protos
 group=com.weaver
-version=1.5.5
+version=1.5.6
 kotlin.incremental=false
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.5",
+  "version": "1.5.6",
   "description": "Interop protos for Node JS (Weaver)",
   "main": "index.js",
   "exports": {

diff --git a/common/protos/fabric/view_data.proto b/common/protos/fabric/view_data.proto
@@ -8,11 +8,6 @@ option go_package = "github.com/hyperledger-labs/weaver-dlt-interoperability/com
 import "peer/proposal_response.proto";
 
 message FabricView {
-  // `Response` from the peers
-  // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal_response.pb.go#L113
-  // We only need the `Payload` field though.
-  protos.Response response = 1;
-
   message EndorsedProposalResponse {
     // `ProposalResponsePayload` is the output produced by each peer and signed as a serialized blob
     // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal_response.pb.go#L176
@@ -24,5 +19,5 @@ message FabricView {
     // https://github.com/hyperledger/fabric-protos-go/blob/master/peer/proposal_response.pb.go#L242
     protos.Endorsement endorsement = 2;
   }
-  repeated EndorsedProposalResponse endorsed_proposal_responses = 2;
+  repeated EndorsedProposalResponse endorsed_proposal_responses = 1;
 }
diff --git a/core/drivers/corda-driver/build.gradle b/core/drivers/corda-driver/build.gradle
@@ -10,8 +10,8 @@ buildscript {
     ext.corda_version = "4.8"
     ext.corda_core_version = "4.8"
     ext.arrow_version = "0.10.4"
-    ext.weaver_protos_version = "1.5.5"
-    ext.weaver_corda_version = "1.2.11"
+    ext.weaver_protos_version = "1.5.6"
+    ext.weaver_corda_version = "1.2.12"
 
     repositories {
         mavenCentral()

diff --git a/core/drivers/corda-driver/gradle.properties b/core/drivers/corda-driver/gradle.properties
@@ -1,5 +1,5 @@
 kotlin.code.style=official
 name=corda-driver
 group=com.weaver.corda.driver
-version=1.2.11
+version=1.2.12
 kotlin.incremental=false
diff --git a/core/drivers/fabric-driver/VERSION b/core/drivers/fabric-driver/VERSION
@@ -1 +1 @@
-1.5.5
+1.5.6
diff --git a/core/drivers/fabric-driver/makefile b/core/drivers/fabric-driver/makefile
@@ -22,21 +22,21 @@ protos-js:
 		cp -r ../../../common/protos-js/relay ./protos-js/ && \
 		cp -r ../../../common/protos-js/package.json ./protos-js/
 
-weaver-fabric-interop-sdk:
+weaver-fabric-interop-sdk: protos-js
 	mkdir -p weaver-fabric-interop-sdk && \
 		cp -r ../../../sdks/fabric/interoperation-node-sdk/build ./weaver-fabric-interop-sdk/ && \
 		cp -r ../../../sdks/fabric/interoperation-node-sdk/index.js ./weaver-fabric-interop-sdk/ && \
-		cp -r ../../../sdks/fabric/interoperation-node-sdk/package-local.json ./weaver-fabric-interop-sdk/package.json
+		cp -r ../../../sdks/fabric/interoperation-node-sdk/package.json ./weaver-fabric-interop-sdk/package.json
 
-build-local: protos-js weaver-fabric-interop-sdk
-	(cp package.json package-remote.json && \
-		cp package-local.json package.json && \
-		npm install) || \
+build-local: weaver-fabric-interop-sdk
+	cp package.json package-remote.json
+	cp package-local.json package.json
+	(npm install --unsafe-perm) || \
 		(mv package-remote.json package.json && exit 1) # Only if fails	
 	mv package-remote.json package.json # Only if success
 	npm run build
 
-build-image-local: protos-js weaver-fabric-interop-sdk
+build-image-local: weaver-fabric-interop-sdk
 	cp package.json package-remote.json
 	cp package-local.json package.json
 	(docker build --build-arg BUILD_TAG="local" --build-arg GIT_URL=$(GIT_URL) -t ${DOCKER_IMAGE_NAME}:$(DOCKER_TAG) -f fabricDriver.dockerfile.local . ) || \

diff --git a/core/drivers/fabric-driver/package-local.json b/core/drivers/fabric-driver/package-local.json
@@ -1,6 +1,6 @@
 {
     "name": "fabric-driver",
-    "version": "1.5.4",
+    "version": "1.5.6",
     "description": "",
     "main": "out/server.js",
     "scripts": {

diff --git a/core/drivers/fabric-driver/package.json b/core/drivers/fabric-driver/package.json
@@ -1,6 +1,6 @@
 {
     "name": "fabric-driver",
-    "version": "1.5.4",
+    "version": "1.5.6",
     "description": "",
     "main": "out/server.js",
     "scripts": {

diff --git a/core/drivers/fabric-driver/server/events.ts b/core/drivers/fabric-driver/server/events.ts
@@ -406,14 +406,14 @@ async function writeExternalStateHelper(
         const view: state_pb.View = viewPayload.getView();
 
         const result = InteroperableHelper.getResponseDataFromView(view, keyCert.key.toBytes());
-        if (result.interopPayload.getConfidential()) {
-            viewContentsBase64.push(result.contents.toString("base64"));
+        if (result.contents) {
+            viewContentsBase64.push(result.contents);
         } else {
-            viewContentsBase64.push("");
+            viewContentsBase64.push([]);
         }
 
         interopArgIndices.push(ctx.getReplaceArgIndex());
-        addresses.push(result.interopPayload.getAddress());
+        addresses.push(result.viewAddress);
         viewsSerializedBase64.push(Buffer.from(viewPayload.getView().serializeBinary()).toString("base64"));
 
         let ccArgsB64 = ctx.getArgsList();

diff --git a/core/drivers/fabric-driver/server/fabric-code.ts b/core/drivers/fabric-driver/server/fabric-code.ts
@@ -164,13 +164,6 @@ async function invoke(
         //@ts-ignore
         let endorsementCounter = 0;
         proposalResponseResult.responses.forEach((response) => {
-            // Set single (last) InteropPayload as response
-            const currentResponse = new proposalResponse.Response();
-            currentResponse.setStatus(response.response.status);
-            currentResponse.setMessage(response.response.message);
-            currentResponse.setPayload(response.response.payload);
-            viewPayload.setResponse(currentResponse);
-
             const endorsement = new proposalResponse.Endorsement();
             endorsement.setSignature(response.endorsement.signature);
             endorsement.setEndorser(response.endorsement.endorser);

diff --git a/core/network/corda-interop-app/constants.properties b/core/network/corda-interop-app/constants.properties
@@ -11,4 +11,4 @@ slf4jVersion=1.7.25
 nettyVersion=4.1.22.Final
 arrowVersion=0.10.4
 
-weaverVersion=1.5.5
+weaverVersion=1.5.6
diff --git a/core/network/corda-interop-app/gradle.properties b/core/network/corda-interop-app/gradle.properties
@@ -1,4 +1,4 @@
 name=Interoperability CorDapp
 group=com.weaver.corda.app.interop
-version=1.2.11
+version=1.2.12
 kotlin.incremental=false