Get the latest from main repo

CHANGELOG.md

@@ -1,3 +1,20 @@
+## v1.1.5
+
+* [5ce121a](https://github.com/hyperledger/blockchain-explorer/commit/5ce121a) Be 862 Fix sync error  (#228)
+* [b28b16e](https://github.com/hyperledger/blockchain-explorer/commit/b28b16e) Be 694 UI link to trans (#227)
+* [f658497](https://github.com/hyperledger/blockchain-explorer/commit/f658497) Bump y18n from 3.2.1 to 3.2.2 (#226)
+* [a3ec219](https://github.com/hyperledger/blockchain-explorer/commit/a3ec219) Bump pygments from 2.1.3 to 2.7.4 in /docs (#225)
+* [8c85d2a](https://github.com/hyperledger/blockchain-explorer/commit/8c85d2a) Bump jinja2 from 2.10.1 to 2.11.3 in /docs (#224)
+* [183a717](https://github.com/hyperledger/blockchain-explorer/commit/183a717) new file repolint-json (#223)
+* [157423b](https://github.com/hyperledger/blockchain-explorer/commit/157423b) Bump react-dev-utils from 11.0.3 to 11.0.4 in /client (#222)
+* [356804b](https://github.com/hyperledger/blockchain-explorer/commit/356804b) [BE-858](https://jira.hyperledger.org/browse/BE-858) Upgrade base image of Explorer container image (#220)
+* [b330520](https://github.com/hyperledger/blockchain-explorer/commit/b330520) Bump elliptic from 6.5.3 to 6.5.4 (#221)
+* [ab91ca7](https://github.com/hyperledger/blockchain-explorer/commit/ab91ca7) [BE-801](https://jira.hyperledger.org/browse/BE-801) Add the steps to configure a subdomain (#219)
+* [9834430](https://github.com/hyperledger/blockchain-explorer/commit/9834430) Fix layout of icons on navigation bar (#218)
+* [88b534d](https://github.com/hyperledger/blockchain-explorer/commit/88b534d) [BE-820](https://jira.hyperledger.org/browse/BE-820) fix vulnerabilities (#216)
+* [44a3065](https://github.com/hyperledger/blockchain-explorer/commit/44a3065) Change default branch to main (#215)
+* [0eb3340](https://github.com/hyperledger/blockchain-explorer/commit/0eb3340) [BE-854](https://jira.hyperledger.org/browse/BE-854) v1.1.4 release (2) (#214)
+
 ## v1.1.4
 
 * [2556be6](https://github.com/hyperledger/blockchain-explorer/commit/2556be6) [BE-853](https://jira.hyperledger.org/browse/BE-853) Resolve race condition of discovery request (#212)

CODE_OF_CONDUCT.md

@@ -0,0 +1,8 @@
+Code of Conduct Guidelines
+==========================
+
+Please review the Hyperledger [Code of
+Conduct](https://wiki.hyperledger.org/community/hyperledger-project-code-of-conduct)
+before participating. It is important that we keep things civil.
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

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

MAINTAINERS.md

@@ -9,6 +9,7 @@ Maintainers
 | Name | GitHub | Chat | email
 |------|--------|------|----------------------
 | Atsushi Neki | [nekia][nekia] | nekia | <atsushin@fast.au.fujitsu.com>
+| Anil Kumar | [anilkumargr][anilkumargr] | anilkumargr | <anil.special2018@gmail.com>
 | Jeeva Sankarapandian | [jeevasang][jeevasang] | jeevasang | <jeevasang@gmail.com>
 | Mekia Edwards | [mekiae] | edwardsm26 | <dev.edwardsm@gmail.com>
 
@@ -37,3 +38,4 @@ Maintainers
 [xspeedcruiser]: https://github.com/xspeedcruiser
 [umadiraju]: https://github.com/umadiraju
 [mekiae]: https://github.com/mekiae
+[anilkumargr]: https://github.com/anilspecial

README.md

@@ -27,13 +27,13 @@ Hyperledger Explorer is a simple, powerful, easy-to-use, well maintained, open s
 
 | Hyperledger Explorer Version                                | Fabric Version Supported                                         | NodeJS Version Supported                          |
 | --                                                          | --                                                               | --                                                |
+| <b>[v1.1.5](release_notes/v1.1.5.md)</b> (Apr 20, 2021)  | [v1.4 to v2.3](https://hyperledger-fabric.readthedocs.io/en/release-2.3) | [^12.13.1, ^14.13.1](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.4](release_notes/v1.1.4.md)</b> (Jan 29, 2021)  | [v1.4 to v2.2](https://hyperledger-fabric.readthedocs.io/en/release-2.2) | [^12.13.1, ^14.13.1](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.3](release_notes/v1.1.3.md)</b> (Sep 28, 2020)  | [v1.4.0 to v2.2.0](https://hyperledger-fabric.readthedocs.io/en/release-2.2) | [12.16.x](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.2](release_notes/v1.1.2.md)</b> (Aug 12, 2020)  | [v1.4.0 to v2.2.0](https://hyperledger-fabric.readthedocs.io/en/release-2.2) | [12.16.x](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.1](release_notes/v1.1.1.md)</b> (Jul 17, 2020)  | [v1.4.0 to v2.1.1](https://hyperledger-fabric.readthedocs.io/en/release-2.1) | [12.16.x](https://nodejs.org/en/download/releases) |
 | <b>[v1.1.0](release_notes/v1.1.0.md)</b> (Jul 01, 2020)  | [v1.4.0 to v2.1.1](https://hyperledger-fabric.readthedocs.io/en/release-2.1) | [12.16.x](https://nodejs.org/en/download/releases) |
 | <b>[v1.0.0](release_notes/v1.0.0.md)</b> (Apr 09, 2020)  | [v1.4.0 to v1.4.8](https://hyperledger-fabric.readthedocs.io/en/release-1.4) | [10.19.x](https://nodejs.org/en/download/releases) |
-| <b>[v1.0.0-rc3](release_notes/v1.0.0-rc3.md)</b> (Apr 01, 2020)  | [v1.4.0 to v1.4.6](https://hyperledger-fabric.readthedocs.io/en/release-1.4) | [10.19.x](https://nodejs.org/en/download/releases) |
 
 ---
 

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"

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

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

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);

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;
+	});
 });

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"

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

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