Add fabric v1.0.5

hyperledger_fabric/v1.0.5/Makefile

@@ -18,7 +18,9 @@ else ifeq ($(HLF_MODE),dev)
 	COMPOSE_FILE="docker-compose-1orgs-1peers-dev.yaml"
 endif
 
-all:
+all: test
+
+test:
 	@echo "Run test with $(COMPOSE_FILE)"
 	@echo "Please make sure u have setup Docker and pulled images by 'make setup'."
 
@@ -29,15 +31,18 @@ all:
 ready: # create/join channel, install/instantiate cc
 	make gen_config  # Will ignore if local config path exists
 	make restart
+
 	make test_channel_create
 	make test_channel_join
 	# make update_anchors
+
 	make test_cc_install
 	make test_cc_instantiate
-
 	make test_cc_invoke_query
+
 	make test_lscc # test lscc operations
 	make test_qscc # test qscc operations
+
 	make test_fetch_blocks # fetch block files
 
 	make logs_save
@@ -110,7 +115,7 @@ test_lscc: # test lscc quries
 # FIXME: docker doesn't support wildcard in cp right now
 test_fetch_blocks: # test fetching channel blocks fetch
 	@echo "Test fetching block files"
-	docker exec -it fabric-cli bash -c "cd /tmp; bash scripts/test_fetch.sh"
+	docker exec -it fabric-cli bash -c "cd /tmp; bash scripts/test_fetch_blocks.sh"
 
 ################## Env setup related, no need to see usually ################
 

hyperledger_fabric/v1.0.5/kafka/README.md

@@ -1,13 +1,8 @@
 ## Start a network base on kafka
 
-### Quick testing with kafka
+### Quick testing
+
 ```bash
-$ KAFKA_ENABLED=true make
+$ HLF_MODE=kafka make
 ```
 When the fabric-network fully started, it takes about 30~60s to finish all the test. 
-
-## Generate crypto-config and channel-artifacts
-
-```bash
-$ make gen_kafka
-```

hyperledger_fabric/v1.0.5/scripts/func.sh

@@ -254,7 +254,7 @@ chaincodeInstantiate () {
 	res=$?
 	cat log.txt
 	verifyResult $res "ChaincodeInstantiation on peer$peer in channel ${channel} failed"
-	echo_g "=== ChaincodeInstantiation on peer$peer in channel ${channel} is successful ==="
+	echo_g "=== Chaincode Instantiated in channel ${channel} by  peer$peer ==="
 }
 
 

hyperledger_fabric/v1.0.5/solo/README.md

@@ -1,13 +1,7 @@
 ## Start a network base on solo
 
-### Quick testing with solo
+### Quick testing
 ```bash
 $ HLF_MODE=solo make
 ```
 When the fabric-network fully started, it takes about 30~60s to finish all the test. 
-
-## Generate crypto-config and channel-artifacts
-
-```bash
-$ make gen_solo gen_kafka
-```

hyperledger_fabric/v1.0.5/solo/channel-artifacts/businesschannel_0.block.json

@@ -559,10 +559,10 @@
 									},
 									"signatures": [
 										{
-											"signature": "MEQCICBTK1NtaSzO/8bprLBFMVFKGhswtwX3IfjNRRlT3sIPAiBhpY6TxP8exxi69vVh5jFY/l2FClT9QXJ9yDdnzch6RA==",
+											"signature": "MEQCICZu9ZcgnYABjfUS4AUocqGytSoo8xm5MxvVGrYgg9ZSAiA7hqvERaGGIjsdvb98ib2KxP06/pO/S6k6lLkozf7eOA==",
 											"signature_header": {
 												"creator": "CgdPcmcxTVNQEoAGLS0tLS1CRUdJTiAtLS0tLQpNSUlDR1RDQ0FjQ2dBd0lCQWdJUkFKMmZWcUdDMzJYQzVRcGdZc212WXhFd0NnWUlLb1pJemowRUF3SXdjekVMCk1Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBZ1RDa05oYkdsbWIzSnVhV0V4RmpBVUJnTlZCQWNURFZOaGJpQkcKY21GdVkybHpZMjh4R1RBWEJnTlZCQW9URUc5eVp6RXVaWGhoYlhCc1pTNWpiMjB4SERBYUJnTlZCQU1URTJOaApMbTl5WnpFdVpYaGhiWEJzWlM1amIyMHdIaGNOTVRjeE1qQXhNVE0xTnpFNVdoY05NamN4TVRJNU1UTTFOekU1CldqQmJNUXN3Q1FZRFZRUUdFd0pWVXpFVE1CRUdBMVVFQ0JNS1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ4TU4KVTJGdUlFWnlZVzVqYVhOamJ6RWZNQjBHQTFVRUF3d1dRV1J0YVc1QWIzSm5NUzVsZUdGdGNHeGxMbU52YlRCWgpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJHVXVSSHFReXdRUVFpd0J3L3B4NTFPekRxRnhPUHM1ClRuWm4vQm1NbFN4eDBUWTA4bHltWUxyYmdKVG5ablFFbTJGQmpLSWhYbllmaUt5SVNraEdmQStqVFRCTE1BNEcKQTFVZER3RUIvd1FFQXdJSGdEQU1CZ05WSFJNQkFmOEVBakFBTUNzR0ExVWRJd1FrTUNLQUlIbzQyZVBwMDE4aApkOFl0YlNpTnd5L0ZjcFIvcno1QkJUaTVvRVV1b2F2NE1Bb0dDQ3FHU000OUJBTUNBMGNBTUVRQ0lBS3d0RUJBCmZpVkpOaDFMWjlGUXZCWEFrYUlmaFpSY25tOTJWSVBEZzdjWUFpQVU3eE1KRzkwZURqMkJTSWliL1I3UU5rRngKemVrTFNVTEk5RzJVVVlBNzdBPT0KLS0tLS1FTkQgLS0tLS0K",
-												"nonce": "TaPOBI/rPSIRyqlTojL6YECz93n+nZtw"
+												"nonce": "9LYlZJILJsKHphljGXkf/sPl9ZShT8qG"
 											}
 										}
 									]
@@ -570,36 +570,36 @@
 								"header": {
 									"channel_header": {
 										"channel_id": "businesschannel",
-										"timestamp": "2017-12-06T07:59:09.000Z",
+										"timestamp": "2017-12-07T05:53:33.000Z",
 										"type": 2
 									},
 									"signature_header": {
 										"creator": "CgdPcmcxTVNQEoAGLS0tLS1CRUdJTiAtLS0tLQpNSUlDR1RDQ0FjQ2dBd0lCQWdJUkFKMmZWcUdDMzJYQzVRcGdZc212WXhFd0NnWUlLb1pJemowRUF3SXdjekVMCk1Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBZ1RDa05oYkdsbWIzSnVhV0V4RmpBVUJnTlZCQWNURFZOaGJpQkcKY21GdVkybHpZMjh4R1RBWEJnTlZCQW9URUc5eVp6RXVaWGhoYlhCc1pTNWpiMjB4SERBYUJnTlZCQU1URTJOaApMbTl5WnpFdVpYaGhiWEJzWlM1amIyMHdIaGNOTVRjeE1qQXhNVE0xTnpFNVdoY05NamN4TVRJNU1UTTFOekU1CldqQmJNUXN3Q1FZRFZRUUdFd0pWVXpFVE1CRUdBMVVFQ0JNS1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ4TU4KVTJGdUlFWnlZVzVqYVhOamJ6RWZNQjBHQTFVRUF3d1dRV1J0YVc1QWIzSm5NUzVsZUdGdGNHeGxMbU52YlRCWgpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJHVXVSSHFReXdRUVFpd0J3L3B4NTFPekRxRnhPUHM1ClRuWm4vQm1NbFN4eDBUWTA4bHltWUxyYmdKVG5ablFFbTJGQmpLSWhYbllmaUt5SVNraEdmQStqVFRCTE1BNEcKQTFVZER3RUIvd1FFQXdJSGdEQU1CZ05WSFJNQkFmOEVBakFBTUNzR0ExVWRJd1FrTUNLQUlIbzQyZVBwMDE4aApkOFl0YlNpTnd5L0ZjcFIvcno1QkJUaTVvRVV1b2F2NE1Bb0dDQ3FHU000OUJBTUNBMGNBTUVRQ0lBS3d0RUJBCmZpVkpOaDFMWjlGUXZCWEFrYUlmaFpSY25tOTJWSVBEZzdjWUFpQVU3eE1KRzkwZURqMkJTSWliL1I3UU5rRngKemVrTFNVTEk5RzJVVVlBNzdBPT0KLS0tLS1FTkQgLS0tLS0K",
-										"nonce": "Mpgw/vN+llFMDAPkn0zN8KSAMEKfZtQh"
+										"nonce": "l5Qi1dlw5YpcOpGNMvcPnCFmiLNvLCaf"
 									}
 								}
 							},
-							"signature": "MEQCIGxgjbuBt9IA1yguwihb5AQE/qz63hlmksrYa/LWh1q8AiByTmZMABzk22Dvs00qaHyEA8O66R0wygeyZ9FCg9sM7A=="
+							"signature": "MEQCIA4M5HzZ1UgqBsyHdXcv5qktNRezVFTEQlia7WfMMoEmAiBeymYcu15ERnRE74LEpJ8ktMQNxmzFD/XLmoUc3pHzZA=="
 						}
 					},
 					"header": {
 						"channel_header": {
 							"channel_id": "businesschannel",
-							"timestamp": "2017-12-06T07:59:09.000Z",
+							"timestamp": "2017-12-07T05:53:33.000Z",
 							"type": 1
 						},
 						"signature_header": {
 							"creator": "CgpPcmRlcmVyTVNQEvAFLS0tLS1CRUdJTiAtLS0tLQpNSUlDRFRDQ0FiT2dBd0lCQWdJUkFOTjlZdXZ0UFdtL2J4dEQ0QTB6UUMwd0NnWUlLb1pJemowRUF3SXdhVEVMCk1Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBZ1RDa05oYkdsbWIzSnVhV0V4RmpBVUJnTlZCQWNURFZOaGJpQkcKY21GdVkybHpZMjh4RkRBU0JnTlZCQW9UQzJWNFlXMXdiR1V1WTI5dE1SY3dGUVlEVlFRREV3NWpZUzVsZUdGdApjR3hsTG1OdmJUQWVGdzB4TnpFeU1ERXhNelUzTWpCYUZ3MHlOekV4TWpreE16VTNNakJhTUZneEN6QUpCZ05WCkJBWVRBbFZUTVJNd0VRWURWUVFJRXdwRFlXeHBabTl5Ym1saE1SWXdGQVlEVlFRSEV3MVRZVzRnUm5KaGJtTnAKYzJOdk1Sd3dHZ1lEVlFRREV4TnZjbVJsY21WeUxtVjRZVzF3YkdVdVkyOXRNRmt3RXdZSEtvWkl6ajBDQVFZSQpLb1pJemowREFRY0RRZ0FFb2FUYXdWbmI2d0lKR3YvTWtLWFd0RG02YzQ5a0V4YWg3VS9Vb2k4SjBJdFJFRUJMCmdWc1pYUVBtZUxjaEptRVFmQkplT2JDOERVSmk5aVdrZ213djRhTk5NRXN3RGdZRFZSMFBBUUgvQkFRREFnZUEKTUF3R0ExVWRFd0VCL3dRQ01BQXdLd1lEVlIwakJDUXdJb0FnRk1nWHZyVTJOVXByTGQ3enBic1ozV1VqY2ZSWApLaFQ3My9QWnNiQjZhaDR3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQVBiSVdvdkpqZEVWYlFlWmxyV2EzQytVCmlYbWtuSzlHSUU1cnVaazI4cC9OQWlCbWk3aFhUQlovZE8vR1RPbDhid2RBRWNqb1ZrdEpuMjlUbFpVVG9SaHYKVGc9PQotLS0tLUVORCAtLS0tLQo=",
-							"nonce": "3joZIkVo7xTr02j7LhFJgFngHHu/uB0d"
+							"nonce": "ZirOeA5+JJSNM+f+2Iu43SGUZoOmUrrO"
 						}
 					}
 				},
-				"signature": "MEQCIFd08iyXEw34+unyd+Ia/B9m0VBgiaaj+Mgbuzw5UjOBAiBMQjoI3tgTnSRzb0dzQBDcusMuHux02wOpp+/lRqsMnQ=="
+				"signature": "MEQCIDX9EZGzXLT+BpXZxDSLc1dJJAfsj+Q3f2Fu3h/W3JyGAiAjjiJ1Ib2Shv3nlgP/BxnULojvjquONtuGQN+l9oQ5KA=="
 			}
 		]
 	},
 	"header": {
-		"data_hash": "hP1oLEZeDUUqLNBHZf1XPkH8udJRVz/RCDz5+q+KkLc="
+		"data_hash": "MuG+xv+hfx+ATlQs7usHoHUBKFMe/M8X07tqsLK6K+k="
 	},
 	"metadata": {
 		"metadata": [

hyperledger_fabric/v1.0.5/solo/channel-artifacts/businesschannel_0.block_payload.json

@@ -555,10 +555,10 @@
           },
           "signatures": [
             {
-              "signature": "MEQCICBTK1NtaSzO/8bprLBFMVFKGhswtwX3IfjNRRlT3sIPAiBhpY6TxP8exxi69vVh5jFY/l2FClT9QXJ9yDdnzch6RA==",
+              "signature": "MEQCICZu9ZcgnYABjfUS4AUocqGytSoo8xm5MxvVGrYgg9ZSAiA7hqvERaGGIjsdvb98ib2KxP06/pO/S6k6lLkozf7eOA==",
               "signature_header": {
                 "creator": "CgdPcmcxTVNQEoAGLS0tLS1CRUdJTiAtLS0tLQpNSUlDR1RDQ0FjQ2dBd0lCQWdJUkFKMmZWcUdDMzJYQzVRcGdZc212WXhFd0NnWUlLb1pJemowRUF3SXdjekVMCk1Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBZ1RDa05oYkdsbWIzSnVhV0V4RmpBVUJnTlZCQWNURFZOaGJpQkcKY21GdVkybHpZMjh4R1RBWEJnTlZCQW9URUc5eVp6RXVaWGhoYlhCc1pTNWpiMjB4SERBYUJnTlZCQU1URTJOaApMbTl5WnpFdVpYaGhiWEJzWlM1amIyMHdIaGNOTVRjeE1qQXhNVE0xTnpFNVdoY05NamN4TVRJNU1UTTFOekU1CldqQmJNUXN3Q1FZRFZRUUdFd0pWVXpFVE1CRUdBMVVFQ0JNS1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ4TU4KVTJGdUlFWnlZVzVqYVhOamJ6RWZNQjBHQTFVRUF3d1dRV1J0YVc1QWIzSm5NUzVsZUdGdGNHeGxMbU52YlRCWgpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJHVXVSSHFReXdRUVFpd0J3L3B4NTFPekRxRnhPUHM1ClRuWm4vQm1NbFN4eDBUWTA4bHltWUxyYmdKVG5ablFFbTJGQmpLSWhYbllmaUt5SVNraEdmQStqVFRCTE1BNEcKQTFVZER3RUIvd1FFQXdJSGdEQU1CZ05WSFJNQkFmOEVBakFBTUNzR0ExVWRJd1FrTUNLQUlIbzQyZVBwMDE4aApkOFl0YlNpTnd5L0ZjcFIvcno1QkJUaTVvRVV1b2F2NE1Bb0dDQ3FHU000OUJBTUNBMGNBTUVRQ0lBS3d0RUJBCmZpVkpOaDFMWjlGUXZCWEFrYUlmaFpSY25tOTJWSVBEZzdjWUFpQVU3eE1KRzkwZURqMkJTSWliL1I3UU5rRngKemVrTFNVTEk5RzJVVVlBNzdBPT0KLS0tLS1FTkQgLS0tLS0K",
-                "nonce": "TaPOBI/rPSIRyqlTojL6YECz93n+nZtw"
+                "nonce": "9LYlZJILJsKHphljGXkf/sPl9ZShT8qG"
               }
             }
           ]
@@ -566,27 +566,27 @@
         "header": {
           "channel_header": {
             "channel_id": "businesschannel",
-            "timestamp": "2017-12-06T07:59:09.000Z",
+            "timestamp": "2017-12-07T05:53:33.000Z",
             "type": 2
           },
           "signature_header": {
             "creator": "CgdPcmcxTVNQEoAGLS0tLS1CRUdJTiAtLS0tLQpNSUlDR1RDQ0FjQ2dBd0lCQWdJUkFKMmZWcUdDMzJYQzVRcGdZc212WXhFd0NnWUlLb1pJemowRUF3SXdjekVMCk1Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBZ1RDa05oYkdsbWIzSnVhV0V4RmpBVUJnTlZCQWNURFZOaGJpQkcKY21GdVkybHpZMjh4R1RBWEJnTlZCQW9URUc5eVp6RXVaWGhoYlhCc1pTNWpiMjB4SERBYUJnTlZCQU1URTJOaApMbTl5WnpFdVpYaGhiWEJzWlM1amIyMHdIaGNOTVRjeE1qQXhNVE0xTnpFNVdoY05NamN4TVRJNU1UTTFOekU1CldqQmJNUXN3Q1FZRFZRUUdFd0pWVXpFVE1CRUdBMVVFQ0JNS1EyRnNhV1p2Y201cFlURVdNQlFHQTFVRUJ4TU4KVTJGdUlFWnlZVzVqYVhOamJ6RWZNQjBHQTFVRUF3d1dRV1J0YVc1QWIzSm5NUzVsZUdGdGNHeGxMbU52YlRCWgpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJHVXVSSHFReXdRUVFpd0J3L3B4NTFPekRxRnhPUHM1ClRuWm4vQm1NbFN4eDBUWTA4bHltWUxyYmdKVG5ablFFbTJGQmpLSWhYbllmaUt5SVNraEdmQStqVFRCTE1BNEcKQTFVZER3RUIvd1FFQXdJSGdEQU1CZ05WSFJNQkFmOEVBakFBTUNzR0ExVWRJd1FrTUNLQUlIbzQyZVBwMDE4aApkOFl0YlNpTnd5L0ZjcFIvcno1QkJUaTVvRVV1b2F2NE1Bb0dDQ3FHU000OUJBTUNBMGNBTUVRQ0lBS3d0RUJBCmZpVkpOaDFMWjlGUXZCWEFrYUlmaFpSY25tOTJWSVBEZzdjWUFpQVU3eE1KRzkwZURqMkJTSWliL1I3UU5rRngKemVrTFNVTEk5RzJVVVlBNzdBPT0KLS0tLS1FTkQgLS0tLS0K",
-            "nonce": "Mpgw/vN+llFMDAPkn0zN8KSAMEKfZtQh"
+            "nonce": "l5Qi1dlw5YpcOpGNMvcPnCFmiLNvLCaf"
           }
         }
       },
-      "signature": "MEQCIGxgjbuBt9IA1yguwihb5AQE/qz63hlmksrYa/LWh1q8AiByTmZMABzk22Dvs00qaHyEA8O66R0wygeyZ9FCg9sM7A=="
+      "signature": "MEQCIA4M5HzZ1UgqBsyHdXcv5qktNRezVFTEQlia7WfMMoEmAiBeymYcu15ERnRE74LEpJ8ktMQNxmzFD/XLmoUc3pHzZA=="
     }
   },
   "header": {
     "channel_header": {
       "channel_id": "businesschannel",
-      "timestamp": "2017-12-06T07:59:09.000Z",
+      "timestamp": "2017-12-07T05:53:33.000Z",
       "type": 1
     },
     "signature_header": {
       "creator": "CgpPcmRlcmVyTVNQEvAFLS0tLS1CRUdJTiAtLS0tLQpNSUlDRFRDQ0FiT2dBd0lCQWdJUkFOTjlZdXZ0UFdtL2J4dEQ0QTB6UUMwd0NnWUlLb1pJemowRUF3SXdhVEVMCk1Ba0dBMVVFQmhNQ1ZWTXhFekFSQmdOVkJBZ1RDa05oYkdsbWIzSnVhV0V4RmpBVUJnTlZCQWNURFZOaGJpQkcKY21GdVkybHpZMjh4RkRBU0JnTlZCQW9UQzJWNFlXMXdiR1V1WTI5dE1SY3dGUVlEVlFRREV3NWpZUzVsZUdGdApjR3hsTG1OdmJUQWVGdzB4TnpFeU1ERXhNelUzTWpCYUZ3MHlOekV4TWpreE16VTNNakJhTUZneEN6QUpCZ05WCkJBWVRBbFZUTVJNd0VRWURWUVFJRXdwRFlXeHBabTl5Ym1saE1SWXdGQVlEVlFRSEV3MVRZVzRnUm5KaGJtTnAKYzJOdk1Sd3dHZ1lEVlFRREV4TnZjbVJsY21WeUxtVjRZVzF3YkdVdVkyOXRNRmt3RXdZSEtvWkl6ajBDQVFZSQpLb1pJemowREFRY0RRZ0FFb2FUYXdWbmI2d0lKR3YvTWtLWFd0RG02YzQ5a0V4YWg3VS9Vb2k4SjBJdFJFRUJMCmdWc1pYUVBtZUxjaEptRVFmQkplT2JDOERVSmk5aVdrZ213djRhTk5NRXN3RGdZRFZSMFBBUUgvQkFRREFnZUEKTUF3R0ExVWRFd0VCL3dRQ01BQXdLd1lEVlIwakJDUXdJb0FnRk1nWHZyVTJOVXByTGQ3enBic1ozV1VqY2ZSWApLaFQ3My9QWnNiQjZhaDR3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUloQVBiSVdvdkpqZEVWYlFlWmxyV2EzQytVCmlYbWtuSzlHSUU1cnVaazI4cC9OQWlCbWk3aFhUQlovZE8vR1RPbDhid2RBRWNqb1ZrdEpuMjlUbFpVVG9SaHYKVGc9PQotLS0tLUVORCAtLS0tLQo=",
-      "nonce": "3joZIkVo7xTr02j7LhFJgFngHHu/uB0d"
+      "nonce": "ZirOeA5+JJSNM+f+2Iu43SGUZoOmUrrO"
     }
   }
 }