Update explorer artifacts path

hyperledger_fabric/latest/base.yaml

@@ -1,10 +1,20 @@
-# This is the default base file to config env and command
+# Contains the base template for all Hyperledger Fabric services
-# All element in this file is abstract without knowing the org and consensus type
+# Never directly use services in this template, but inherent
+# All services are abstract without any names, config or port mapping
 # https://github.com/yeasy/docker-compose-files
+#
+# * ca-base: base for fabric-ca
+# * orderer-base: base for fabric-orderer
+# * peer-base: base for fabric-peer
+# * cli-base: base for fabric peer client
+# * event-listener-base: base for fabric eventhub listener
+# * kafka-base: base for kafka
+# * zookeeper-base: base for fabric-zookeeper
+# * couchdb-base: base for couchdb
+# * explorer-base: base for Hyperledger blockchain-explorer
+# * mysql-base: base for MySQL
 
-# Depends on the hyperledger/fabric-peer image.
+version: '2' # compose v3 still doesn't support `extends`, shame!
-
-version: '2'
 
 services:
   ca-base:
@@ -12,8 +22,7 @@ services:
     restart: always
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
-      - FABRIC_CA_SERVER_TLS_ENABLED=true
+      - FABRIC_CA_SERVER_TLS_ENABLED=true # change to false to disable TLS
-      #- FABRIC_CA_SERVER_TLS_ENABLED=false
 
   orderer-base:
     image: yeasy/hyperledger-fabric-orderer:latest
@@ -108,14 +117,6 @@ services:
     #command: bash -c 'block-listener -events-address=peer0.org1.example.com:7053 -events-mspdir=/etc/hyperledger/fabric/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/ -events-mspid=Org1MSP'
     command: bash -c 'while true; do sleep 20170504; done'
 
-  couchdb-base:
-    #container_name: couchdb0
-    image: hyperledger/fabric-couchdb:x86_64-1.1.0-preview
-    restart: always
-    tty: true
-    # Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service,
-    # for example map it to utilize Fauxton User Interface in dev environments.
-
   zookeeper-base:
     image: hyperledger/fabric-zookeeper:x86_64-1.1.0-preview
     restart: always
@@ -126,7 +127,6 @@ services:
       - '3888'
 
   kafka-base:
-    # official repo doesn't have latest tag, however, kafka changes version recently
     #image: yeasy/hyperledger-fabric-kafka:0.10.2.0
     image: hyperledger/fabric-kafka:x86_64-1.1.0-preview
     restart: always
@@ -137,4 +137,21 @@ services:
       - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false
       - KAFKA_LOG_RETENTION_MS=-1
     expose:
-      - '9092'
+      - '9092'
+
+  couchdb-base:
+    image: hyperledger/fabric-couchdb:x86_64-1.1.0-preview
+    restart: always
+    tty: true
+
+  explorer-base:
+    image: yeasy/blockchain-explorer:0.1.0-preview # Till we have official image
+    expose:
+      - "8080"  # HTTP port
+    command: bash -c 'sleep 10; node main.js'
+
+  mysql-base: # mysql service
+    image: mysql:8.0
+    restart: always
+    expose:
+      - "3306"

hyperledger_fabric/latest/docker-compose-2orgs-4peers-solo-be.yaml

@@ -50,31 +50,32 @@ services:
       service: peer1.org2.example.com
 
   explorer:
-    image: yeasy/blockchain-explorer:latest
+    extends:
+      file: base.yaml
+      service: explorer-base
     container_name: explorer
     hostname: explorer
     depends_on:
       - mysql
     volumes:
-      - ./explorer/config.json:/blockchain-explorer/config.json
+      - ./explorer-artifacts/config.json:/blockchain-explorer/config.json
       - ./solo/crypto-config:/blockchain-explorer/first-network/crypto-config
     ports:
       - "8080:8080"  # HTTP port
-    command: bash -c 'sleep 10; node main.js'
 
   mysql: # mysql service
-    image: mysql:8.0
+    extends:
+      file: base.yaml
+      service: mysql-base
     container_name: mysql
     hostname: mysql
-    restart: always
     environment:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_DATABASE=fabricexplorer
     volumes:
-      - ./explorer/fabricexplorer.sql:/docker-entrypoint-initdb.d/fabricexplorer.sql
+      - ./explorer-artifacts/fabricexplorer.sql:/docker-entrypoint-initdb.d/fabricexplorer.sql
-    expose:
-      - "3306"
     #command: bash -c 'mysqld; sleep 1; mysql -uroot -proot < /tmp/fabricexplorer.sql; while true; do sleep 20171117; done'
+
 #networks:
 #  default:
 #    external:

hyperledger_fabric/latest/explorer-artifacts/config.json

@@ -0,0 +1,57 @@
+{
+   "network-config": {
+      "org1": {
+         "name": "peerOrg1",
+         "mspid": "Org1MSP",
+         "peer1": {
+            "requests": "grpcs://peer0.org1.example.com:7051",
+            "events": "grpcs://peer0.org1.example.com:7053",
+            "server-hostname": "peer0.org1.example.com",
+            "tls_cacerts": "/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt"
+         },
+         "peer2": {
+            "requests": "grpcs://peer1.org1.example.com:7051",
+            "events": "grpcs://peer1.org1.example.com:7053",
+            "server-hostname": "peer1.org1.example.com",
+            "tls_cacerts": "/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt"
+         },
+         "admin": {
+            "key": "/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore",
+            "cert": "/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts"
+         }
+      },
+      "org2": {
+        "name": "peerOrg2",
+        "mspid": "Org2MSP",
+        "peer1": {
+           "requests": "grpcs://peer0.org2.example.com:7051",
+           "events": "grpcs://peer0.org2.example.com:7053",
+           "server-hostname": "peer0.org2.example.com",
+           "tls_cacerts": "/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt"
+        },
+        "peer2": {
+           "requests": "grpcs://peer1.org2.example.com:7051",
+           "events": "grpcs://peer1.org2.example.com:7053",
+           "server-hostname": "peer1.org2.example.com",
+           "tls_cacerts": "/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt"
+        },
+        "admin": {
+           "key": "/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore",
+           "cert": "/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts"
+        }
+      }
+   },
+   "host":"explorer",
+   "port":"8080",
+   "channel": "businesschannel",
+   "GOPATH":"/opt/gopath",
+   "keyValueStore":"/tmp/fabric-client-kvs",
+   "eventWaitTime":"30000",
+   "mysql":{
+      "host":"mysql",
+      "port":"3306",
+      "database":"fabricexplorer",
+      "username":"root",
+      "passwd":"root"
+   }
+}

hyperledger_fabric/latest/explorer/config.json

@@ -1,73 +0,0 @@
-{
-  "network-config": {
-	"orderer": [
-	  {
-		"url": "grpcs://orderer.example.com:7050",
-		"server-hostname": "orderer.example.com",
-		"tls_cacerts": "/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt"
-	  }
-	],
-	"org1": {
-	  "name": "peerOrg1",
-	  "mspid": "Org1MSP",
-	  "peer1": {
-		"requests": "grpcs://peer0.org1.example.com:7051",
-		"events": "grpcs://peer0.org1.example.com:7053",
-		"server-hostname": "peer0.org1.example.com",
-		"tls_cacerts": "/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt"
-	  },
-	  "peer2": {
-		"requests": "grpcs://peer1.org1.example.com:7051",
-		"events": "grpcs://peer1.org1.example.com:7053",
-		"server-hostname": "peer1.org1.example.com",
-		"tls_cacerts": "/first-network/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls/ca.crt"
-	  },
-	  "admin": {
-		"key": "/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore",
-		"cert": "/first-network/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts"
-	  }
-	},
-	"org2": {
-	  "name": "peerOrg2",
-	  "mspid": "Org2MSP",
-	  "ca": "https://ca.org2.example.com:7054",
-	  "peer1": {
-		"requests": "grpcs://peer0.org2.example.com:7051",
-		"events": "grpcs://peer0.org2.example.com:7053",
-		"server-hostname": "peer0.org2.example.com",
-		"tls_cacerts": "/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt"
-	  },
-	  "peer2": {
-		"requests": "grpcs://peer1.org2.example.com:7051",
-		"events": "grpcs://peer1.org2.example.com:7053",
-		"server-hostname": "peer1.org2.example.com",
-		"tls_cacerts": "/first-network/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls/ca.crt"
-	  },
-	  "admin": {
-		"key": "/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/keystore",
-		"cert": "/first-network/crypto-config/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp/signcerts"
-	  }
-	}
-  },
-  "host":"explorer",
-  "port":"8080",
-  "channel": "businesschannel",
-  "GOPATH":"../artifacts",
-  "keyValueStore":"/tmp/fabric-client-kvs",
-  "eventWaitTime":"30000",
-  "peer":"peer1",
-  "org":["org1"],
-  "users":[
-	{
-	  "username":"admin",
-	  "secret":"adminpw"
-      }
-   ],
-   "mysql":{
-      "host":"mysql",
-      "port":"3306",
-      "database":"fabricexplorer",
-      "username":"root",
-      "passwd":"root"
-   }
-}

hyperledger_fabric/latest/scripts/test_lscc.sh

@@ -29,7 +29,7 @@ chaincodeQuery "${APP_CHANNEL}" $org $peer lscc '{"Args":["getdepspec","'${APP_C
 echo_b "LSCC Get cc bytes"
 chaincodeQuery "${APP_CHANNEL}" $org $peer lscc '{"Args":["getccdata","'${APP_CHANNEL}'", "'${CC_NAME}'"]}'
 
-echo_b "LSCC Get all chaincodes installed on the channel"
+echo_b "LSCC Get all chaincodes installed on the peer"
 chaincodeQuery "${APP_CHANNEL}" $org $peer lscc '{"Args":["getinstalledchaincodes"]}'
 
 echo_b "LSCC Get all chaincodes instantiated on the channel"

hyperledger_fabric/latest/solo/channel-artifacts/businesschannel_config.block.json

@@ -698,13 +698,13 @@
 									},
 									"signatures": [
 										{
-											"signature": "MEUCIQDJ/PJG5coifK0MyZomxvdZOPc+UoDL+DrOLGR6ShgGdgIgMp/p3sXXIDwY9dnvn66fL1FixnJi5YZVcmNGOGWRx2A=",
+											"signature": "MEQCIH+KpjmrE2cQGF7yMN7btcJgex0vtbxsqsycaR04MMmkAiAEwbWLb8fR9sNCiKpmnMbK9FvPg7FyEp/9FtQDAXyyVQ==",
 											"signature_header": {
 												"creator": {
 													"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWIrZ0F3SUJBZ0lRWGFsZS9zSnJHUnlVQVc3dmQ4eWhHakFLQmdncWhrak9QUVFEQWpCek1Rc3cKQ1FZRFZRUUdFd0pWVXpFVE1CRUdBMVVFQ0JNS1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ4TU5VMkZ1SUVaeQpZVzVqYVhOamJ6RVpNQmNHQTFVRUNoTVFiM0puTWk1bGVHRnRjR3hsTG1OdmJURWNNQm9HQTFVRUF4TVRZMkV1CmIzSm5NaTVsZUdGdGNHeGxMbU52YlRBZUZ3MHhOekV5TWprd05qSTJNemxhRncweU56RXlNamN3TmpJMk16bGEKTUZzeEN6QUpCZ05WQkFZVEFsVlRNUk13RVFZRFZRUUlFd3BEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIRXcxVApZVzRnUm5KaGJtTnBjMk52TVI4d0hRWURWUVFEREJaQlpHMXBia0J2Y21jeUxtVjRZVzF3YkdVdVkyOXRNRmt3CkV3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFNE5aaE5Bek9ReUlweXZnQnNWeDRMN2NreHYrSCtERGwKM2lTNGF2ekJ3czFWeXRjWXBtVVFNN2g3R3Z0VDJjOGJtTjFQZFBqbEdCWnJ2cEdHb2ZTeDJLTk5NRXN3RGdZRApWUjBQQVFIL0JBUURBZ2VBTUF3R0ExVWRFd0VCL3dRQ01BQXdLd1lEVlIwakJDUXdJb0FnK1pVVXZjUi9CWVZGCm1DMmdxS1FBWi93QTBpM3NXSkZvY3BpeEtJQ00rMVl3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQU1DdjNNME8KQXFIOUJkdlVjYlRXd3BOM09PcGcrKzJETTAxRFY0b1UyRkhNQWlBMk9iL0pLTnl2YS9meFJQRnEyOWkrNVphTApSMEw1SnI4ODc4YkxVNkljRUE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
 													"mspid": "Org2MSP"
 												},
-												"nonce": "uFcUC8UcXpNuUO6lljTHKn1K1NpjmN/O"
+												"nonce": "DzV4k5vcxRqqH4G3RsLdMm0SewzzMmL+"
 											}
 										}
 									]
@@ -713,7 +713,7 @@
 									"channel_header": {
 										"channel_id": "businesschannel",
 										"epoch": "0",
-										"timestamp": "2018-01-05T06:36:30.000Z",
+										"timestamp": "2018-01-13T06:14:15.000Z",
 										"tx_id": "",
 										"type": 2,
 										"version": 0
@@ -723,18 +723,18 @@
 											"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWIrZ0F3SUJBZ0lRWGFsZS9zSnJHUnlVQVc3dmQ4eWhHakFLQmdncWhrak9QUVFEQWpCek1Rc3cKQ1FZRFZRUUdFd0pWVXpFVE1CRUdBMVVFQ0JNS1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ4TU5VMkZ1SUVaeQpZVzVqYVhOamJ6RVpNQmNHQTFVRUNoTVFiM0puTWk1bGVHRnRjR3hsTG1OdmJURWNNQm9HQTFVRUF4TVRZMkV1CmIzSm5NaTVsZUdGdGNHeGxMbU52YlRBZUZ3MHhOekV5TWprd05qSTJNemxhRncweU56RXlNamN3TmpJMk16bGEKTUZzeEN6QUpCZ05WQkFZVEFsVlRNUk13RVFZRFZRUUlFd3BEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIRXcxVApZVzRnUm5KaGJtTnBjMk52TVI4d0hRWURWUVFEREJaQlpHMXBia0J2Y21jeUxtVjRZVzF3YkdVdVkyOXRNRmt3CkV3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFNE5aaE5Bek9ReUlweXZnQnNWeDRMN2NreHYrSCtERGwKM2lTNGF2ekJ3czFWeXRjWXBtVVFNN2g3R3Z0VDJjOGJtTjFQZFBqbEdCWnJ2cEdHb2ZTeDJLTk5NRXN3RGdZRApWUjBQQVFIL0JBUURBZ2VBTUF3R0ExVWRFd0VCL3dRQ01BQXdLd1lEVlIwakJDUXdJb0FnK1pVVXZjUi9CWVZGCm1DMmdxS1FBWi93QTBpM3NXSkZvY3BpeEtJQ00rMVl3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQU1DdjNNME8KQXFIOUJkdlVjYlRXd3BOM09PcGcrKzJETTAxRFY0b1UyRkhNQWlBMk9iL0pLTnl2YS9meFJQRnEyOWkrNVphTApSMEw1SnI4ODc4YkxVNkljRUE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
 											"mspid": "Org2MSP"
 										},
-										"nonce": "8jn6u8Ccuswbf3vIsdm/LFNqCsxUcv6F"
+										"nonce": "9Rq8IwRJe4sgkbZL5b2iGMrQI6Q4w74Y"
 									}
 								}
 							},
-							"signature": "MEQCIH0YvyTo+CqRgciMU6SiIcTyw4I3psnLrWMZVsKPPFv7AiAc3ZoyL4+KQ5FjKr5vsR+l6SxmpQ5qvCKqCJ7MDUHStA=="
+							"signature": "MEQCIH+u78PSoT/LKS4Ivj4cu8FdpeGx5TlJNZtA3RowwJmZAiBiZUcbhGIFwlpSJC8iWXtkmc7ImbVAo4e9jc3reEMV2w=="
 						}
 					},
 					"header": {
 						"channel_header": {
 							"channel_id": "businesschannel",
 							"epoch": "0",
-							"timestamp": "2018-01-05T06:36:30.000Z",
+							"timestamp": "2018-01-13T06:14:15.000Z",
 							"tx_id": "",
 							"type": 1,
 							"version": 0
@@ -744,23 +744,23 @@
 								"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNERENDQWJPZ0F3SUJBZ0lSQU8zb3g2UGwva1N2d2ZnT25YVUxBQzh3Q2dZSUtvWkl6ajBFQXdJd2FURUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhGREFTQmdOVkJBb1RDMlY0WVcxd2JHVXVZMjl0TVJjd0ZRWURWUVFERXc1allTNWxlR0Z0CmNHeGxMbU52YlRBZUZ3MHhOekV5TWprd05qSTJNemxhRncweU56RXlNamN3TmpJMk16bGFNRmd4Q3pBSkJnTlYKQkFZVEFsVlRNUk13RVFZRFZRUUlFd3BEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIRXcxVFlXNGdSbkpoYm1OcApjMk52TVJ3d0dnWURWUVFERXhOdmNtUmxjbVZ5TG1WNFlXMXdiR1V1WTI5dE1Ga3dFd1lIS29aSXpqMENBUVlJCktvWkl6ajBEQVFjRFFnQUVtM0ZzdE15T0xCUmwrWDFSVGtJaFhDdHF4VU1vckdPblBsT0FVRFhiK3d6VmNKalIKb3lCZjY4Q25yMFVtWGJzTFRiU0doNnlJZzRsQ3NrcFNwKzF5UktOTk1Fc3dEZ1lEVlIwUEFRSC9CQVFEQWdlQQpNQXdHQTFVZEV3RUIvd1FDTUFBd0t3WURWUjBqQkNRd0lvQWc3ZTQ2aUh6eTgzNURGNlo2MktkbG5DbHFSRkFZClY5cDc4WmxrRmtJd3Bpc3dDZ1lJS29aSXpqMEVBd0lEUndBd1JBSWdLNS9tSHJkcGRqY21tSGV0cW9sWGZvcTMKU09FcTFDTmdHVDF0ZHBLMlozc0NJQ0I3OEUzeXVpVXBtaWVsVnhlc1hMOGo5b0RiK0xLK3NHYWkvRzUyT2U1WAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
 								"mspid": "OrdererMSP"
 							},
-							"nonce": "9TeXlpYDlodfd+HGxdYSLhjwXEHTML8p"
+							"nonce": "b1Q5M53JY43iL1TXZk1uEH5DpMyglzym"
 						}
 					}
 				},
-				"signature": "MEQCICOAf/sDK4B3upuec5ny0khKUaEAbxNS/4l6vbNd0jy3AiBCZI8KE6+cc3B+Jgx0CcNGGLnw2V6v+AEiopl0y/NNVA=="
+				"signature": "MEUCIQC+2HEiQRZhk/0HlqUpgh5Cmpa6xCd+60gySobzSxd7gAIgcWe0BRNI36lEjvT/1Nc5QHDtJ/HnygJMuhIe2aVO6cM="
 			}
 		]
 	},
 	"header": {
-		"data_hash": "odmOEv05/T2C6GmKC2vsh5bkueAH5/q/PVucn8iUc6A=",
+		"data_hash": "FxmxYvT5bZ57G3gLXT58UjKuUcK/y+ukDBFeCeO+oGY=",
 		"number": "2",
-		"previous_hash": "ZERGtQYOmHA0pvWOz4QJM5AYnEkaZg/jt5gzIHQ7120="
+		"previous_hash": "+QoFgYN1/VbmSxS45lkwcG9Og6e4I5Opfo0mvfssEK8="
 	},
 	"metadata": {
 		"metadata": [
-			"EvgGCq0GCpAGCgpPcmRlcmVyTVNQEoEGLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNERENDQWJPZ0F3SUJBZ0lSQU8zb3g2UGwva1N2d2ZnT25YVUxBQzh3Q2dZSUtvWkl6ajBFQXdJd2FURUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhGREFTQmdOVkJBb1RDMlY0WVcxd2JHVXVZMjl0TVJjd0ZRWURWUVFERXc1allTNWxlR0Z0CmNHeGxMbU52YlRBZUZ3MHhOekV5TWprd05qSTJNemxhRncweU56RXlNamN3TmpJMk16bGFNRmd4Q3pBSkJnTlYKQkFZVEFsVlRNUk13RVFZRFZRUUlFd3BEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIRXcxVFlXNGdSbkpoYm1OcApjMk52TVJ3d0dnWURWUVFERXhOdmNtUmxjbVZ5TG1WNFlXMXdiR1V1WTI5dE1Ga3dFd1lIS29aSXpqMENBUVlJCktvWkl6ajBEQVFjRFFnQUVtM0ZzdE15T0xCUmwrWDFSVGtJaFhDdHF4VU1vckdPblBsT0FVRFhiK3d6VmNKalIKb3lCZjY4Q25yMFVtWGJzTFRiU0doNnlJZzRsQ3NrcFNwKzF5UktOTk1Fc3dEZ1lEVlIwUEFRSC9CQVFEQWdlQQpNQXdHQTFVZEV3RUIvd1FDTUFBd0t3WURWUjBqQkNRd0lvQWc3ZTQ2aUh6eTgzNURGNlo2MktkbG5DbHFSRkFZClY5cDc4WmxrRmtJd3Bpc3dDZ1lJS29aSXpqMEVBd0lEUndBd1JBSWdLNS9tSHJkcGRqY21tSGV0cW9sWGZvcTMKU09FcTFDTmdHVDF0ZHBLMlozc0NJQ0I3OEUzeXVpVXBtaWVsVnhlc1hMOGo5b0RiK0xLK3NHYWkvRzUyT2U1WAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tChIYt0MLNFJZzwYyCh+J3WTh7orO0wDR/dNrEkYwRAIgBJIEnA2SUpYsw2+nSBBDVSsYVaGpUQGpSwDNQcrLef0CIFNHIOgdh8RWNl9P/7exTllF9ei3nvMfyJjyODgcZEfE",
+			"EvkGCq0GCpAGCgpPcmRlcmVyTVNQEoEGLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNERENDQWJPZ0F3SUJBZ0lSQU8zb3g2UGwva1N2d2ZnT25YVUxBQzh3Q2dZSUtvWkl6ajBFQXdJd2FURUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhGREFTQmdOVkJBb1RDMlY0WVcxd2JHVXVZMjl0TVJjd0ZRWURWUVFERXc1allTNWxlR0Z0CmNHeGxMbU52YlRBZUZ3MHhOekV5TWprd05qSTJNemxhRncweU56RXlNamN3TmpJMk16bGFNRmd4Q3pBSkJnTlYKQkFZVEFsVlRNUk13RVFZRFZRUUlFd3BEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIRXcxVFlXNGdSbkpoYm1OcApjMk52TVJ3d0dnWURWUVFERXhOdmNtUmxjbVZ5TG1WNFlXMXdiR1V1WTI5dE1Ga3dFd1lIS29aSXpqMENBUVlJCktvWkl6ajBEQVFjRFFnQUVtM0ZzdE15T0xCUmwrWDFSVGtJaFhDdHF4VU1vckdPblBsT0FVRFhiK3d6VmNKalIKb3lCZjY4Q25yMFVtWGJzTFRiU0doNnlJZzRsQ3NrcFNwKzF5UktOTk1Fc3dEZ1lEVlIwUEFRSC9CQVFEQWdlQQpNQXdHQTFVZEV3RUIvd1FDTUFBd0t3WURWUjBqQkNRd0lvQWc3ZTQ2aUh6eTgzNURGNlo2MktkbG5DbHFSRkFZClY5cDc4WmxrRmtJd3Bpc3dDZ1lJS29aSXpqMEVBd0lEUndBd1JBSWdLNS9tSHJkcGRqY21tSGV0cW9sWGZvcTMKU09FcTFDTmdHVDF0ZHBLMlozc0NJQ0I3OEUzeXVpVXBtaWVsVnhlc1hMOGo5b0RiK0xLK3NHYWkvRzUyT2U1WAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tChIYQ/VRkaANUWo1d8/GIn+Wb3yDwFuZao2jEkcwRQIhAMsYTtK5DLRyQtebFv+00nMGOTXfMfx1cn3Si0njAcEwAiBqOvlIe8Oq91odC0s9nnrjmJtmNqxcJN5Vym2CQPBxmw==",
-			"CgIIAhL5BgqtBgqQBgoKT3JkZXJlck1TUBKBBi0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQpNSUlDRERDQ0FiT2dBd0lCQWdJUkFPM294NlBsL2tTdndmZ09uWFVMQUM4d0NnWUlLb1pJemowRUF3SXdhVEVMCk1Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBZ1RDa05oYkdsbWIzSnVhV0V4RmpBVUJnTlZCQWNURFZOaGJpQkcKY21GdVkybHpZMjh4RkRBU0JnTlZCQW9UQzJWNFlXMXdiR1V1WTI5dE1SY3dGUVlEVlFRREV3NWpZUzVsZUdGdApjR3hsTG1OdmJUQWVGdzB4TnpFeU1qa3dOakkyTXpsYUZ3MHlOekV5TWpjd05qSTJNemxhTUZneEN6QUpCZ05WCkJBWVRBbFZUTVJNd0VRWURWUVFJRXdwRFlXeHBabTl5Ym1saE1SWXdGQVlEVlFRSEV3MVRZVzRnUm5KaGJtTnAKYzJOdk1Sd3dHZ1lEVlFRREV4TnZjbVJsY21WeUxtVjRZVzF3YkdVdVkyOXRNRmt3RXdZSEtvWkl6ajBDQVFZSQpLb1pJemowREFRY0RRZ0FFbTNGc3RNeU9MQlJsK1gxUlRrSWhYQ3RxeFVNb3JHT25QbE9BVURYYit3elZjSmpSCm95QmY2OENucjBVbVhic0xUYlNHaDZ5SWc0bENza3BTcCsxeVJLTk5NRXN3RGdZRFZSMFBBUUgvQkFRREFnZUEKTUF3R0ExVWRFd0VCL3dRQ01BQXdLd1lEVlIwakJDUXdJb0FnN2U0NmlIenk4MzVERjZaNjJLZGxuQ2xxUkZBWQpWOXA3OFpsa0ZrSXdwaXN3Q2dZSUtvWkl6ajBFQXdJRFJ3QXdSQUlnSzUvbUhyZHBkamNtbUhldHFvbFhmb3EzClNPRXExQ05nR1QxdGRwSzJaM3NDSUNCNzhFM3l1aVVwbWllbFZ4ZXNYTDhqOW9EYitMSytzR2FpL0c1Mk9lNVgKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQoSGAv9Y+9pB2HYf7lRSgwo1yyx90XPZjWoABJHMEUCIQCuYJfq/st7AKIroj+XoTR5wr1Vc2ft4pQ2OFFvcHzITgIgettMSWfkUU9ENxecKGmmDWjIuagxZ/OX4N6bUj+4fSg=",
+			"CgIIAhL4BgqtBgqQBgoKT3JkZXJlck1TUBKBBi0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQpNSUlDRERDQ0FiT2dBd0lCQWdJUkFPM294NlBsL2tTdndmZ09uWFVMQUM4d0NnWUlLb1pJemowRUF3SXdhVEVMCk1Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBZ1RDa05oYkdsbWIzSnVhV0V4RmpBVUJnTlZCQWNURFZOaGJpQkcKY21GdVkybHpZMjh4RkRBU0JnTlZCQW9UQzJWNFlXMXdiR1V1WTI5dE1SY3dGUVlEVlFRREV3NWpZUzVsZUdGdApjR3hsTG1OdmJUQWVGdzB4TnpFeU1qa3dOakkyTXpsYUZ3MHlOekV5TWpjd05qSTJNemxhTUZneEN6QUpCZ05WCkJBWVRBbFZUTVJNd0VRWURWUVFJRXdwRFlXeHBabTl5Ym1saE1SWXdGQVlEVlFRSEV3MVRZVzRnUm5KaGJtTnAKYzJOdk1Sd3dHZ1lEVlFRREV4TnZjbVJsY21WeUxtVjRZVzF3YkdVdVkyOXRNRmt3RXdZSEtvWkl6ajBDQVFZSQpLb1pJemowREFRY0RRZ0FFbTNGc3RNeU9MQlJsK1gxUlRrSWhYQ3RxeFVNb3JHT25QbE9BVURYYit3elZjSmpSCm95QmY2OENucjBVbVhic0xUYlNHaDZ5SWc0bENza3BTcCsxeVJLTk5NRXN3RGdZRFZSMFBBUUgvQkFRREFnZUEKTUF3R0ExVWRFd0VCL3dRQ01BQXdLd1lEVlIwakJDUXdJb0FnN2U0NmlIenk4MzVERjZaNjJLZGxuQ2xxUkZBWQpWOXA3OFpsa0ZrSXdwaXN3Q2dZSUtvWkl6ajBFQXdJRFJ3QXdSQUlnSzUvbUhyZHBkamNtbUhldHFvbFhmb3EzClNPRXExQ05nR1QxdGRwSzJaM3NDSUNCNzhFM3l1aVVwbWllbFZ4ZXNYTDhqOW9EYitMSytzR2FpL0c1Mk9lNVgKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQoSGEx3LizuyeEWFvFJjpdzrHErEIrsTaTHFBJGMEQCICldzKCSzIs89ywGDsvU1oEh+/CMcAtU4smCL0Jp0UVdAiBEON+2HRTK7LWAOaUbbcZ0RepAQBQXvkUWYN79fl9gPA==",
 			"",
 			""
 		]

hyperledger_fabric/v1.0.2/Makefile

@@ -50,7 +50,7 @@ ready: # create/join channel, install/instantiate cc
 	#make update_anchors
 
 	make test_cc_install
-	make test_cc_instantiate
+	#make test_cc_instantiate
 	#make test_cc_invoke_query
 
 	#make test_lscc # test lscc operations

hyperledger_fabric/v1.0.2/scripts/test_lscc.sh

@@ -28,7 +28,7 @@ chaincodeQuery "${APP_CHANNEL}" $org $peer lscc '{"Args":["getdepspec","'${APP_C
 echo_b "LSCC Get cc bytes"
 chaincodeQuery "${APP_CHANNEL}" $org $peer lscc '{"Args":["getccdata","'${APP_CHANNEL}'", "'$CC_02_NAME'"]}'
 
-echo_b "LSCC Get all chaincodes installed on the channel"
+echo_b "LSCC Get all chaincodes installed on the peer"
 chaincodeQuery "${APP_CHANNEL}" $org $peer lscc '{"Args":["getinstalledchaincodes"]}'
 
 echo_b "LSCC Get all chaincodes instantiated on the channel"

hyperledger_fabric/v1.0.2/scripts/variables.sh

@@ -42,6 +42,7 @@ ORG2_PEER1_URL="peer1.org2.example.com:7051"
 # Chaincode related
 CC_02_NAME="exp02"
 CC_02_PATH="examples/chaincode/go/chaincode_example02"
+CC_02_PATH="examples/chaincode/go/fabcar2"
 CC_INIT_VERSION=1.0
 CC_UPGRADE_VERSION=1.1
 

hyperledger_fabric/v1.0.5/solo/channel-artifacts/new_businesschannel.tx.json

@@ -1,113 +0,0 @@
-{
-	"payload": {
-		"data": {
-			"config_update": {
-				"channel_id": "businesschannel",
-				"read_set": {
-					"groups": {
-						"Application": {
-							"groups": {
-								"Org1MSP": {
-									"mod_policy": "",
-									"version": "0"
-								},
-								"Org2MSP": {
-									"mod_policy": "",
-									"version": "0"
-								}
-							},
-							"mod_policy": "",
-							"version": "0"
-						}
-					},
-					"mod_policy": "",
-					"values": {
-						"Consortium": {
-							"mod_policy": "",
-							"value": {
-								"name": "SampleConsortium"
-							},
-							"version": "0"
-						}
-					},
-					"version": "0"
-				},
-				"type": 0,
-				"write_set": {
-					"groups": {
-						"Application": {
-							"groups": {
-								"Org1MSP": {
-									"mod_policy": "",
-									"version": "0"
-								},
-								"Org2MSP": {
-									"mod_policy": "",
-									"version": "0"
-								}
-							},
-							"mod_policy": "Admins",
-							"policies": {
-								"Admins": {
-									"mod_policy": "Admins",
-									"policy": {
-										"type": 3,
-										"value": {
-											"rule": "MAJORITY",
-											"sub_policy": "Admins"
-										}
-									},
-									"version": "0"
-								},
-								"Readers": {
-									"mod_policy": "Admins",
-									"policy": {
-										"type": 3,
-										"value": {
-											"rule": "ANY",
-											"sub_policy": "Readers"
-										}
-									},
-									"version": "0"
-								},
-								"Writers": {
-									"mod_policy": "Admins",
-									"policy": {
-										"type": 3,
-										"value": {
-											"rule": "ANY",
-											"sub_policy": "Writers"
-										}
-									},
-									"version": "0"
-								}
-							},
-							"version": "1"
-						}
-					},
-					"mod_policy": "",
-					"values": {
-						"Consortium": {
-							"mod_policy": "",
-							"value": {
-								"name": "SampleConsortium"
-							},
-							"version": "0"
-						}
-					},
-					"version": "0"
-				}
-			}
-		},
-		"header": {
-			"channel_header": {
-				"channel_id": "businesschannel",
-				"epoch": "0",
-				"timestamp": "2017-12-29T14:04:09.000Z",
-				"tx_id": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-				"type": 2,
-				"version": 0
-			}
-		}
-	}
-}