Updating my repo (#4)

* new file repolint-json (hyperledger-labs#223) Signed-off-by: Anil Kumar <anil.special2018@gmail.com> * Bump jinja2 from 2.10.1 to 2.11.3 in /docs (hyperledger-labs#224) Bumps [jinja2](https://github.com/pallets/jinja) from 2.10.1 to 2.11.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst) - [Commits](pallets/jinja@2.10.1...2.11.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump pygments from 2.1.3 to 2.7.4 in /docs (hyperledger-labs#225) Bumps [pygments](https://github.com/pygments/pygments) from 2.1.3 to 2.7.4. - [Release notes](https://github.com/pygments/pygments/releases) - [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES) - [Commits](pygments/pygments@2.1.3...2.7.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump y18n from 3.2.1 to 3.2.2 (hyperledger-labs#226) Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Be 694 UI link to trans (hyperledger-labs#227) * Bump react-dev-utils from 11.0.3 to 11.0.4 in /client (hyperledger-labs#222) Bumps [react-dev-utils](https://github.com/facebook/create-react-app/tree/HEAD/packages/react-dev-utils) from 11.0.3 to 11.0.4. - [Release notes](https://github.com/facebook/create-react-app/releases) - [Changelog](https://github.com/facebook/create-react-app/blob/master/CHANGELOG-1.x.md) - [Commits](https://github.com/facebook/create-react-app/commits/HEAD/packages/react-dev-utils) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Anil Kumar <anil.special2018@gmail.com> * new file repolint-json (hyperledger-labs#223) (#3) Signed-off-by: Anil Kumar <anil.special2018@gmail.com> * direct link to a transaction Signed-off-by: Anil Kumar <anil.special2018@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Be 862 Fix sync error (hyperledger-labs#228) * BE-862 Add null validation for sync error And upgraded fabric version Explorer supports Signed-off-by: Atsushi Neki <nekiaiken@gmail.com> * BE-862 Add test case to validate the fix Signed-off-by: Atsushi Neki <nekiaiken@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Atsushin <atsushin@fast.au.fujitsu.com>
anilspecial · Apr 15, 2021 · 9467801 · 9467801
1 parent c9fd2ec
commit 9467801
Show file tree

Hide file tree

Showing 15 changed files with 2,255 additions and 2,022 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-FROM node:14.16.0-alpine3.13 AS BUILD_IMAGE
+FROM node:13-alpine AS BUILD_IMAGE
 
 # default values pf environment variables
 # that are used inside container
@@ -18,10 +18,10 @@ COPY . .
 
 # install required dependencies by NPM packages:
 # current dependencies are: python, make, g++
-RUN apk add --no-cache --virtual npm-deps python make g++ curl bash && \
-    python -m ensurepip && \
+RUN apk add --no-cache --virtual npm-deps python3 make g++ curl bash && \
+    python3 -m ensurepip && \
     rm -r /usr/lib/python*/ensurepip && \
-    pip install --upgrade pip setuptools && \
+    pip3 install --upgrade pip setuptools && \
     rm -r /root/.cache
 
 # install node-prune (https://github.com/tj/node-prune)
@@ -43,7 +43,7 @@ RUN rm -rf node_modules/rxjs/_esm5/
 RUN rm -rf node_modules/rxjs/_esm2015/
 RUN rm -rf node_modules/grpc/deps/grpc/third_party/
 
-FROM node:10.19-alpine3.9
+FROM node:13-alpine
 
 # database configuration
 ENV DATABASE_HOST 127.0.0.1

diff --git a/app/platform/fabric/e2e-test/runTestSuite.sh b/app/platform/fabric/e2e-test/runTestSuite.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 ROOTDIR="$(cd "$(dirname "$0")"/../../../.. && pwd)"
-FABRIC_V1_VERSION=1.4.9
+FABRIC_V1_VERSION=1.4.11
 FABRIC_CA_V1_VERSION=1.4.9
-FABRIC_V2_VERSION=2.2.1
+FABRIC_V2_VERSION=2.3.1
 FABRIC_CA_V2_VERSION=1.4.9
 
 echo "#### Downloaded fabric-test repo"

diff --git a/app/platform/fabric/e2e-test/specs/apitest-network-spec-v2.yml b/app/platform/fabric/e2e-test/specs/apitest-network-spec-v2.yml
@@ -4,7 +4,7 @@
 
 ---
 dockerOrg: hyperledger
-dockerTag: 2.2.1
+dockerTag: 2.3.1
 
 #! peer database ledger type (couchdb, goleveldb)
 dbType: goleveldb

diff --git a/app/platform/fabric/e2e-test/specs/apitest-network-spec.yml b/app/platform/fabric/e2e-test/specs/apitest-network-spec.yml
@@ -7,7 +7,7 @@
 #! Released images are pulled from docker hub hyperledger/, e.g. 1.4.5 or 2.0.0
 #! Development stream images are pulled from
 #! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
-fabricVersion: 1.4.9
+fabricVersion: 1.4.11
 #! peer database ledger type (couchdb, goleveldb)
 dbType: goleveldb
 #! This parameter is used to define fabric logging spec in peers

diff --git a/app/platform/fabric/sync/SyncService.ts b/app/platform/fabric/sync/SyncService.ts
@@ -602,9 +602,9 @@ export class SyncServices {
 			if (txObj.payload.header.channel_header.typeString === 'CONFIG') {
 				txid = sha.sha256(txStr);
 				readSet =
-					txObj.payload.data.last_update.payload.data.config_update.read_set;
+					txObj.payload.data.last_update.payload?.data.config_update.read_set;
 				writeSet =
-					txObj.payload.data.last_update.payload.data.config_update.write_set;
+					txObj.payload.data.last_update.payload?.data.config_update.write_set;
 			}
 
 			const read_set = JSON.stringify(readSet, null, 2);

diff --git a/app/test/SyncService.test.ts b/app/test/SyncService.test.ts
@@ -176,4 +176,12 @@ describe('processBlockEvent', () => {
 		);
 		clock.restore();
 	});
+
+	it("should be done without any errors when config block doesn't have any payload in last updated data", async () => {
+		const stubClient = setupClient();
+
+		stubConfigBlock.data.data[0].payload.data.last_update.payload = null;
+		await expect(sync.processBlockEvent(stubClient, stubConfigBlock)).to
+			.eventually.to.be.true;
+	});
 });
diff --git a/client/e2e-test/gui-e2e-test-start.sh b/client/e2e-test/gui-e2e-test-start.sh
@@ -8,9 +8,9 @@ TIMEOUT=600
 DELAY=10
 
 ROOTDIR="$(cd "$(dirname "$0")"/../.. && pwd)"
-FABRIC_V1_VERSION=1.4.9
+FABRIC_V1_VERSION=1.4.11
 FABRIC_CA_V1_VERSION=1.4.9
-FABRIC_V2_VERSION=2.2.1
+FABRIC_V2_VERSION=2.3.1
 FABRIC_CA_V2_VERSION=1.4.9
 
 echo "#### Downloaded fabric-test repo"

diff --git a/client/e2e-test/specs/gui-e2e-test-network-spec-v2.yml b/client/e2e-test/specs/gui-e2e-test-network-spec-v2.yml
@@ -8,7 +8,7 @@
 #! Development stream images are pulled from
 #! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
 dockerOrg: hyperledger
-dockerTag: 2.2.1
+dockerTag: 2.3.1
 
 #! peer database ledger type (couchdb, goleveldb)
 dbType: goleveldb

diff --git a/client/e2e-test/specs/gui-e2e-test-network-spec.yml b/client/e2e-test/specs/gui-e2e-test-network-spec.yml
@@ -7,7 +7,7 @@
 #! Released images are pulled from docker hub hyperledger/, e.g. 1.4.5 or 2.0.0
 #! Development stream images are pulled from
 #! hyperledger-fabric.jfrog.io/, e.g. 1.4.5-stable or 2.0.0-stable
-fabricVersion: 1.4.9
+fabricVersion: 1.4.11
 #! peer database ledger type (couchdb, goleveldb)
 dbType: goleveldb
 #! This parameter is used to define fabric logging spec in peers