Upgrade Blockchain Explorer

Signed-off-by: Osama Rabea <osrab3@gmail.com>

Author: OsamaRab3

e2e-network/docker/test-04-v2-snapshot.sh

@@ -56,7 +56,6 @@ waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
 waitForContainer "couchdb.peer0.org1.example.com" "Apache CouchDB has started. Time to relax."
 waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
 waitForContainer "db.explorer.example.com" "database system is ready to accept connections" "200"
-waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
 waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
 
 fablo_rest_org1="localhost:8801"
@@ -113,6 +112,8 @@ hook_command="perl -i -pe 's/FABRIC_VERSION=2\.3\.3/FABRIC_VERSION=2\.4\.2/g' ./
     "$FABLO_HOME/fablo.sh" restore "$snapshot_name" "$hook_command" &&
     "$FABLO_HOME/fablo.sh" start
 )
+
+waitForContainer "explorer.example.com" "Successfully created channel event hub for \[my-channel1\]" "200"
 waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"
 
 sleep 5

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap

@@ -1527,7 +1527,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.json should cre
 "FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
-HYPERLEDGER_EXPLORER_VERSION=1.1.8
+HYPERLEDGER_EXPLORER_VERSION=2.0.0
 
 COUCHDB_VERSION=3.1
 FABRIC_COUCHDB_VERSION=0.4.18
@@ -2121,14 +2121,14 @@ services:
       - basic
 
   db.explorer.example.com:
-    image: hyperledger/explorer-db:\${HYPERLEDGER_EXPLORER_VERSION}
+    image: ghcr.io/hyperledger-labs/explorer-db:latest
     container_name: db.explorer.example.com
     environment:
       - DATABASE_DATABASE=fabricexplorer
       - DATABASE_USERNAME=hppoc
       - DATABASE_PASSWORD=password
     healthcheck:
-      test: "pg_isready -h localhost -p 5432 -q -U postgres"
+      test: "pg_isready -h localhost -p 5432 -q -U hppoc -d fabricexplorer"
       interval: 5s
       timeout: 10s
       retries: 7
@@ -2138,7 +2138,7 @@ services:
       - basic
 
   explorer.example.com:
-    image: hyperledger/explorer:\${HYPERLEDGER_EXPLORER_VERSION}
+    image:  ghcr.io/hyperledger-labs/explorer:latest
     restart: on-failure:8
     container_name: explorer.example.com
     environment:

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap

@@ -1438,7 +1438,7 @@ exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e
 "FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
-HYPERLEDGER_EXPLORER_VERSION=1.1.8
+HYPERLEDGER_EXPLORER_VERSION=2.0.0
 
 COUCHDB_VERSION=3.1
 FABRIC_COUCHDB_VERSION=0.4.18

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap

@@ -2099,7 +2099,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should cr
 "FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
-HYPERLEDGER_EXPLORER_VERSION=1.1.8
+HYPERLEDGER_EXPLORER_VERSION=2.0.0
 
 COUCHDB_VERSION=3.1
 FABRIC_COUCHDB_VERSION=0.4.18

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap

@@ -3022,7 +3022,7 @@ exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml should create pro
 "FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
-HYPERLEDGER_EXPLORER_VERSION=1.1.8
+HYPERLEDGER_EXPLORER_VERSION=2.0.0
 
 COUCHDB_VERSION=3.1
 FABRIC_COUCHDB_VERSION=0.4.18

e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap

@@ -3317,7 +3317,7 @@ exports[`samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json should cr
 "FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
-HYPERLEDGER_EXPLORER_VERSION=1.1.8
+HYPERLEDGER_EXPLORER_VERSION=2.0.0
 
 COUCHDB_VERSION=3.1
 FABRIC_COUCHDB_VERSION=0.4.18
@@ -4823,14 +4823,14 @@ services:
       - basic
 
   db.explorer.example.com:
-    image: hyperledger/explorer-db:\${HYPERLEDGER_EXPLORER_VERSION}
+    image: ghcr.io/hyperledger-labs/explorer-db:latest
     container_name: db.explorer.example.com
     environment:
       - DATABASE_DATABASE=fabricexplorer
       - DATABASE_USERNAME=hppoc
       - DATABASE_PASSWORD=password
     healthcheck:
-      test: "pg_isready -h localhost -p 5432 -q -U postgres"
+      test: "pg_isready -h localhost -p 5432 -q -U hppoc -d fabricexplorer"
       interval: 5s
       timeout: 10s
       retries: 7
@@ -4840,7 +4840,7 @@ services:
       - basic
 
   explorer.example.com:
-    image: hyperledger/explorer:\${HYPERLEDGER_EXPLORER_VERSION}
+    image:  ghcr.io/hyperledger-labs/explorer:latest
     restart: on-failure:8
     container_name: explorer.example.com
     environment:

e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap

@@ -1514,7 +1514,7 @@ exports[`samples/fablo-config-hlf3-1orgs-1chaincode.json should create proper e2
 "FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
-HYPERLEDGER_EXPLORER_VERSION=1.1.8
+HYPERLEDGER_EXPLORER_VERSION=2.0.0
 
 COUCHDB_VERSION=3.1
 FABRIC_COUCHDB_VERSION=0.4.18

e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap

@@ -1539,7 +1539,7 @@ exports[`samples/fablo-config-hlf3-bft-1orgs-1chaincode.json should create prope
 "FABLO_VERSION=2.2.0
 FABLO_BUILD=<date with git hash>
 FABLO_REST_VERSION=0.1.2
-HYPERLEDGER_EXPLORER_VERSION=1.1.8
+HYPERLEDGER_EXPLORER_VERSION=2.0.0
 
 COUCHDB_VERSION=3.1
 FABRIC_COUCHDB_VERSION=0.4.18

src/setup-docker/index.ts

@@ -169,7 +169,7 @@ export default class SetupDockerGenerator extends Generator {
       fabloVersion: config.fabloVersion,
       fabloBuild: getBuildInfo(),
       fabloRestVersion: "0.1.2",
-      hyperledgerExplorerVersion: "1.1.8",
+      hyperledgerExplorerVersion: "2.0.0",
       fabricCouchDbVersion: "0.4.18",
       couchDbVersion: "3.1",
       fabricCaPostgresVersion: "14",

src/setup-docker/templates/fabric-docker/docker-compose.yaml

@@ -138,14 +138,14 @@ services:
 
   <%_ if (org.tools.explorer && !global.tools.explorer) { _%>
   db.<%= org.tools.explorer.address %>:
-    image: hyperledger/explorer-db:${HYPERLEDGER_EXPLORER_VERSION}
+    image:  ghcr.io/hyperledger-labs/explorer-db:latest
     container_name: db.<%= org.tools.explorer.address %>
     environment:
       - DATABASE_DATABASE=fabricexplorer
       - DATABASE_USERNAME=hppoc
       - DATABASE_PASSWORD=password
     healthcheck:
-      test: "pg_isready -h localhost -p 5432 -q -U postgres"
+      test: "pg_isready -h localhost -p 5432 -q -U hppoc -d fabricexplorer"
       interval: 5s
       timeout: 10s
       retries: 7
@@ -155,7 +155,7 @@ services:
       - basic
 
   <%= org.tools.explorer.address %>:
-    image: hyperledger/explorer:${HYPERLEDGER_EXPLORER_VERSION}
+    image: ghcr.io/hyperledger-labs/explorer:latest
     restart: on-failure:8
     container_name: <%= org.tools.explorer.address %>
     environment:
@@ -329,14 +329,14 @@ services:
 
   <%_ if (global.tools.explorer) { _%>
   db.<%= global.tools.explorer.address %>:
-    image: hyperledger/explorer-db:${HYPERLEDGER_EXPLORER_VERSION}
+    image: ghcr.io/hyperledger-labs/explorer-db:latest
     container_name: db.<%= global.tools.explorer.address %>
     environment:
       - DATABASE_DATABASE=fabricexplorer
       - DATABASE_USERNAME=hppoc
       - DATABASE_PASSWORD=password
     healthcheck:
-      test: "pg_isready -h localhost -p 5432 -q -U postgres"
+      test: "pg_isready -h localhost -p 5432 -q -U hppoc -d fabricexplorer"
       interval: 5s
       timeout: 10s
       retries: 7
@@ -346,7 +346,7 @@ services:
       - basic
 
   <%= global.tools.explorer.address %>:
-    image: hyperledger/explorer:${HYPERLEDGER_EXPLORER_VERSION}
+    image:  ghcr.io/hyperledger-labs/explorer:latest
     restart: on-failure:8
     container_name: <%= global.tools.explorer.address %>
     environment: