Update with new configtx.yaml

pull/108/head
Baohua Yang 2017-12-07 14:18:16 +08:00
parent 09b0726eae
commit 752a51446b
43 changed files with 41827 additions and 16595 deletions

View File

@ -8,8 +8,11 @@ NETWORK_INIT_WAIT=2 # time to wait the fabric network finish initialization
COMPOSE_FILE ?= "docker-compose-2orgs-4peers-solo.yaml"
LOG_PATH ?= "solo/logs"
ifeq ($(HLF_MODE),kafka)
COMPOSE_FILE="docker-compose-2orgs-4peers-kafka.yaml"
LOG_PATH="kafka/logs"
else ifeq ($(HLF_MODE),couchdb)
COMPOSE_FILE="docker-compose-2orgs-4peers-couchdb.yaml"
else ifeq ($(HLF_MODE),event)
@ -34,7 +37,7 @@ ready: # create/join channel, install/instantiate cc
make test_channel_create
make test_channel_join
# make update_anchors
make update_anchors
make test_cc_install
make test_cc_instantiate
@ -153,25 +156,26 @@ logs: # show logs
logs_check: logs_save logs_view
logs_save: # save logs
docker logs peer0.org1.example.com >& /tmp/dev_peer0.log
docker logs orderer.example.com >& /tmp/dev_orderer.log
docker-compose -f ${COMPOSE_FILE} logs >& /tmp/dev_all.log
[ -d $(LOG_PATH) ] || mkdir $(LOG_PATH)
docker logs peer0.org1.example.com >& $(LOG_PATH)/dev_peer0.log
docker logs orderer.example.com >& $(LOG_PATH)/dev_orderer.log
docker-compose -f ${COMPOSE_FILE} logs >& $(LOG_PATH)/dev_all.log
logs_view: # view logs
less /tmp/dev_peer.log
less $(LOG_PATH)/dev_peer.log
gen_config: # generate config artifacts
if [ "$(HLF_MODE)" = "solo" ]; then \
bash scripts/gen_config.sh solo; \
else \
if [ "$(HLF_MODE)" = "kafka" ]; then \
bash scripts/gen_config.sh kafka; \
else \
bash scripts/gen_config.sh solo; \
fi
test_configtxlator: # Test change config using configtxlator
if [ "$(HLF_MODE)" = "solo" ]; then \
bash scripts/test_configtxlator.sh solo; \
else \
if [ "$(HLF_MODE)" = "kafka" ]; then \
bash scripts/test_configtxlator.sh kafka; \
else \
bash scripts/test_configtxlator.sh solo; \
fi
download: # download required images

View File

@ -1,27 +0,0 @@
#! /bin/bash
echo "replace configtx.yaml and crypto-config.yaml"
cp ./peer/example2/configtx.yaml ./peer
cp ./peer/example2/crypto-config.yaml ./peer
echo "replace auto-test script "
cp ./peer/example2/new-channel-auto-test-5-peers.sh ./peer/scripts
echo "replace configtx.yaml"
cp ./peer/configtx.yaml /etc/hyperledger/fabric
echo "Generate new certificates"
cryptogen generate --config=./peer/crypto-config.yaml --output ./peer/crypto
echo "Generate new certificates"
configtxgen -profile TwoOrgsOrdererGenesis -outputBlock ./peer/channel-artifacts/orderer_genesis.block
echo "Create the configuration tx"
APP_CHANNEL=newchannel
configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ./peer/channel-artifacts/channel.tx -channelID ${APP_CHANNEL}
echo "Define the anchor peer for Org1 on the channel"
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org1MSPanchors.tx -channelID ${APP_CHANNEL} -asOrg Org1MSP
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org2MSPanchors.tx -channelID ${APP_CHANNEL} -asOrg Org2MSP
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org3MSPanchors.tx -channelID ${APP_CHANNEL} -asOrg Org3MSP

View File

@ -689,13 +689,13 @@
},
"signatures": [
{
"signature": "MEUCIQD+oELtRSIPbxC7qvcRJD+M7rQfgY8loE9+NmnMSt3lPgIgK5cYNJDtFSneSSjYQqmZeq/QcNB9TzlOHcHUbFBCnB4=",
"signature": "MEUCIQDdfFb6SEtd52kC9nqw7XbctULj9QgNej5tVfpL4O/cqAIgEulhe+SHkx/aetHvkYnSMWIGUyr1uN5926twVdlsFZ4=",
"signature_header": {
"creator": {
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWNDZ0F3SUJBZ0lSQUp0RGdiWk9oWTdBM1pxK29pbEIxVDR3Q2dZSUtvWkl6ajBFQXdJd2N6RUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhHVEFYQmdOVkJBb1RFRzl5WnpFdVpYaGhiWEJzWlM1amIyMHhIREFhQmdOVkJBTVRFMk5oCkxtOXlaekV1WlhoaGJYQnNaUzVqYjIwd0hoY05NVGN4TWpBMk1UUXlNek01V2hjTk1qY3hNakEwTVRReU16TTUKV2pCYk1Rc3dDUVlEVlFRR0V3SlZVekVUTUJFR0ExVUVDQk1LUTJGc2FXWnZjbTVwWVRFV01CUUdBMVVFQnhNTgpVMkZ1SUVaeVlXNWphWE5qYnpFZk1CMEdBMVVFQXd3V1FXUnRhVzVBYjNKbk1TNWxlR0Z0Y0d4bExtTnZiVEJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkxXMCt1dmRvTVM0RjhkL1JpWHZCOS9yZHRydnV4dnkKOXN1bTJDL2l3ZkJiS0IwbUZ1SG1Kd2VweWxtd05lbGxWRHZtQUVaaXpHTEgzeUF1RDFOS0xRS2pUVEJMTUE0RwpBMVVkRHdFQi93UUVBd0lIZ0RBTUJnTlZIUk1CQWY4RUFqQUFNQ3NHQTFVZEl3UWtNQ0tBSUlGaVBBNXBrT1ZzClBCRVZrQU9mZlJnUjc5dzRFbHFZRVNFU1picUUrTGRCTUFvR0NDcUdTTTQ5QkFNQ0EwY0FNRVFDSUZzZlNsR3cKWEVQbTdTdWsrcFYvMVF4aWthQ09YeFgvQmxJa0o2N2NqaGxqQWlCdFl2bkxtcWROcEhmNXg5YUQzZ2FGcFVvZgpSaGppR0UyZFIvU3EyRm1pWEE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
"mspid": "Org1MSP"
},
"nonce": "PLBMDox4EUNrmlZ1z2ksFjtdp8pDkezM"
"nonce": "aMMHMz9ZXF1FvOsTqTg8oVwGNRS0HstN"
}
}
]
@ -704,7 +704,7 @@
"channel_header": {
"channel_id": "businesschannel",
"epoch": "0",
"timestamp": "2017-12-06T14:29:27.000Z",
"timestamp": "2017-12-07T06:13:20.000Z",
"tx_id": "",
"type": 2,
"version": 0
@ -714,18 +714,18 @@
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWNDZ0F3SUJBZ0lSQUp0RGdiWk9oWTdBM1pxK29pbEIxVDR3Q2dZSUtvWkl6ajBFQXdJd2N6RUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhHVEFYQmdOVkJBb1RFRzl5WnpFdVpYaGhiWEJzWlM1amIyMHhIREFhQmdOVkJBTVRFMk5oCkxtOXlaekV1WlhoaGJYQnNaUzVqYjIwd0hoY05NVGN4TWpBMk1UUXlNek01V2hjTk1qY3hNakEwTVRReU16TTUKV2pCYk1Rc3dDUVlEVlFRR0V3SlZVekVUTUJFR0ExVUVDQk1LUTJGc2FXWnZjbTVwWVRFV01CUUdBMVVFQnhNTgpVMkZ1SUVaeVlXNWphWE5qYnpFZk1CMEdBMVVFQXd3V1FXUnRhVzVBYjNKbk1TNWxlR0Z0Y0d4bExtTnZiVEJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkxXMCt1dmRvTVM0RjhkL1JpWHZCOS9yZHRydnV4dnkKOXN1bTJDL2l3ZkJiS0IwbUZ1SG1Kd2VweWxtd05lbGxWRHZtQUVaaXpHTEgzeUF1RDFOS0xRS2pUVEJMTUE0RwpBMVVkRHdFQi93UUVBd0lIZ0RBTUJnTlZIUk1CQWY4RUFqQUFNQ3NHQTFVZEl3UWtNQ0tBSUlGaVBBNXBrT1ZzClBCRVZrQU9mZlJnUjc5dzRFbHFZRVNFU1picUUrTGRCTUFvR0NDcUdTTTQ5QkFNQ0EwY0FNRVFDSUZzZlNsR3cKWEVQbTdTdWsrcFYvMVF4aWthQ09YeFgvQmxJa0o2N2NqaGxqQWlCdFl2bkxtcWROcEhmNXg5YUQzZ2FGcFVvZgpSaGppR0UyZFIvU3EyRm1pWEE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
"mspid": "Org1MSP"
},
"nonce": "C45KnZaOv8P/biZYenbx6Gu5rmMLnxyb"
"nonce": "X95tpKi1cbmXoeIPGK603zYIsXpODm5J"
}
}
},
"signature": "MEUCIQCkt1GuEg++hxFAeCJGoq57oCM9og0pVpDzWFizsk9ImwIgO2mLVhl0UGfTrHlttHf+NhAdrLxPeiDWB8eOR3Ij+Qw="
"signature": "MEQCIHVpO2hbn546I/lAwJs3xKvW1wVMyGUb4/TxSUoOqrvsAiBzBso6/YWenmfszdJstaRR7nuBgm1wNodNaD2uYDP6cQ=="
}
},
"header": {
"channel_header": {
"channel_id": "businesschannel",
"epoch": "0",
"timestamp": "2017-12-06T14:29:27.000Z",
"timestamp": "2017-12-07T06:13:20.000Z",
"tx_id": "",
"type": 1,
"version": 0
@ -735,16 +735,16 @@
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNEVENDQWJPZ0F3SUJBZ0lSQVBoRWhYSWk0bTlETEQ3aXNoVmlxOEl3Q2dZSUtvWkl6ajBFQXdJd2FURUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhGREFTQmdOVkJBb1RDMlY0WVcxd2JHVXVZMjl0TVJjd0ZRWURWUVFERXc1allTNWxlR0Z0CmNHeGxMbU52YlRBZUZ3MHhOekV5TURZeE5ESXpNemxhRncweU56RXlNRFF4TkRJek16bGFNRmd4Q3pBSkJnTlYKQkFZVEFsVlRNUk13RVFZRFZRUUlFd3BEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIRXcxVFlXNGdSbkpoYm1OcApjMk52TVJ3d0dnWURWUVFERXhOdmNtUmxjbVZ5TG1WNFlXMXdiR1V1WTI5dE1Ga3dFd1lIS29aSXpqMENBUVlJCktvWkl6ajBEQVFjRFFnQUVQWURkNDhSTWp0QnRtb053MzhueDFEVS85dVRiZEhyYjRJQ2hvOEhNdVhINm5CTFkKK1haSFQyYnhObHNESGhxeWNkQVo4TDdqNWZmTzdIdEdNc082YWFOTk1Fc3dEZ1lEVlIwUEFRSC9CQVFEQWdlQQpNQXdHQTFVZEV3RUIvd1FDTUFBd0t3WURWUjBqQkNRd0lvQWdibmpROHgwVW1MZnVrdXVJQm1hNFRPZGZBWjFOCkNPZ00vVno4bVFiWG5LMHdDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWhBTk9Tc2hKUVZKVWsrZG5DWiszbWFoeEgKNEthMm5iZHR4dndsY0hSVmVDV0VBaUFqMjRMUHNKZm9GTXJ2UEpndTdsK2d6RXVSY3V5cE5EbHltQ3RWSU5Scwp3UT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
"mspid": "OrdererMSP"
},
"nonce": "hUKuwNA6Hsbepud46XsgIqX9oYHXgq6u"
"nonce": "04XbGtSPFvfRQx+PTRI0tbS9Jn44JNPY"
}
}
},
"signature": "MEQCIAsONufWdopKX/qDUxTvhU7a8hIqkzKS2UhLZXt6iPkEAiBKkAZjV89jLNkYxAdO9Y1bhaXkulBRc+xJRnwPrI5SWQ=="
"signature": "MEQCIGZGwkrvw6ugv9zMfE6VT3U4y2z5yDkalAP9rOVRJN1yAiAj33ZpjpF0i4qlusneJTkripbmMsaDrjbGN5CJrlP78Q=="
}
]
},
"header": {
"data_hash": "DOF11wq912weIq9ToJML8BZK9kkl1BuL/U/kuXFdehs=",
"data_hash": "hLp5FcDZqCrsw7RneqeltL3VdunNpv3xfLgS1a7A2Ys=",
"number": "0"
},
"metadata": {

View File

@ -685,13 +685,13 @@
},
"signatures": [
{
"signature": "MEUCIQD+oELtRSIPbxC7qvcRJD+M7rQfgY8loE9+NmnMSt3lPgIgK5cYNJDtFSneSSjYQqmZeq/QcNB9TzlOHcHUbFBCnB4=",
"signature": "MEUCIQDdfFb6SEtd52kC9nqw7XbctULj9QgNej5tVfpL4O/cqAIgEulhe+SHkx/aetHvkYnSMWIGUyr1uN5926twVdlsFZ4=",
"signature_header": {
"creator": {
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWNDZ0F3SUJBZ0lSQUp0RGdiWk9oWTdBM1pxK29pbEIxVDR3Q2dZSUtvWkl6ajBFQXdJd2N6RUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhHVEFYQmdOVkJBb1RFRzl5WnpFdVpYaGhiWEJzWlM1amIyMHhIREFhQmdOVkJBTVRFMk5oCkxtOXlaekV1WlhoaGJYQnNaUzVqYjIwd0hoY05NVGN4TWpBMk1UUXlNek01V2hjTk1qY3hNakEwTVRReU16TTUKV2pCYk1Rc3dDUVlEVlFRR0V3SlZVekVUTUJFR0ExVUVDQk1LUTJGc2FXWnZjbTVwWVRFV01CUUdBMVVFQnhNTgpVMkZ1SUVaeVlXNWphWE5qYnpFZk1CMEdBMVVFQXd3V1FXUnRhVzVBYjNKbk1TNWxlR0Z0Y0d4bExtTnZiVEJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkxXMCt1dmRvTVM0RjhkL1JpWHZCOS9yZHRydnV4dnkKOXN1bTJDL2l3ZkJiS0IwbUZ1SG1Kd2VweWxtd05lbGxWRHZtQUVaaXpHTEgzeUF1RDFOS0xRS2pUVEJMTUE0RwpBMVVkRHdFQi93UUVBd0lIZ0RBTUJnTlZIUk1CQWY4RUFqQUFNQ3NHQTFVZEl3UWtNQ0tBSUlGaVBBNXBrT1ZzClBCRVZrQU9mZlJnUjc5dzRFbHFZRVNFU1picUUrTGRCTUFvR0NDcUdTTTQ5QkFNQ0EwY0FNRVFDSUZzZlNsR3cKWEVQbTdTdWsrcFYvMVF4aWthQ09YeFgvQmxJa0o2N2NqaGxqQWlCdFl2bkxtcWROcEhmNXg5YUQzZ2FGcFVvZgpSaGppR0UyZFIvU3EyRm1pWEE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
"mspid": "Org1MSP"
},
"nonce": "PLBMDox4EUNrmlZ1z2ksFjtdp8pDkezM"
"nonce": "aMMHMz9ZXF1FvOsTqTg8oVwGNRS0HstN"
}
}
]
@ -700,7 +700,7 @@
"channel_header": {
"channel_id": "businesschannel",
"epoch": "0",
"timestamp": "2017-12-06T14:29:27.000Z",
"timestamp": "2017-12-07T06:13:20.000Z",
"tx_id": "",
"type": 2,
"version": 0
@ -710,18 +710,18 @@
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWNDZ0F3SUJBZ0lSQUp0RGdiWk9oWTdBM1pxK29pbEIxVDR3Q2dZSUtvWkl6ajBFQXdJd2N6RUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhHVEFYQmdOVkJBb1RFRzl5WnpFdVpYaGhiWEJzWlM1amIyMHhIREFhQmdOVkJBTVRFMk5oCkxtOXlaekV1WlhoaGJYQnNaUzVqYjIwd0hoY05NVGN4TWpBMk1UUXlNek01V2hjTk1qY3hNakEwTVRReU16TTUKV2pCYk1Rc3dDUVlEVlFRR0V3SlZVekVUTUJFR0ExVUVDQk1LUTJGc2FXWnZjbTVwWVRFV01CUUdBMVVFQnhNTgpVMkZ1SUVaeVlXNWphWE5qYnpFZk1CMEdBMVVFQXd3V1FXUnRhVzVBYjNKbk1TNWxlR0Z0Y0d4bExtTnZiVEJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQkxXMCt1dmRvTVM0RjhkL1JpWHZCOS9yZHRydnV4dnkKOXN1bTJDL2l3ZkJiS0IwbUZ1SG1Kd2VweWxtd05lbGxWRHZtQUVaaXpHTEgzeUF1RDFOS0xRS2pUVEJMTUE0RwpBMVVkRHdFQi93UUVBd0lIZ0RBTUJnTlZIUk1CQWY4RUFqQUFNQ3NHQTFVZEl3UWtNQ0tBSUlGaVBBNXBrT1ZzClBCRVZrQU9mZlJnUjc5dzRFbHFZRVNFU1picUUrTGRCTUFvR0NDcUdTTTQ5QkFNQ0EwY0FNRVFDSUZzZlNsR3cKWEVQbTdTdWsrcFYvMVF4aWthQ09YeFgvQmxJa0o2N2NqaGxqQWlCdFl2bkxtcWROcEhmNXg5YUQzZ2FGcFVvZgpSaGppR0UyZFIvU3EyRm1pWEE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
"mspid": "Org1MSP"
},
"nonce": "C45KnZaOv8P/biZYenbx6Gu5rmMLnxyb"
"nonce": "X95tpKi1cbmXoeIPGK603zYIsXpODm5J"
}
}
},
"signature": "MEUCIQCkt1GuEg++hxFAeCJGoq57oCM9og0pVpDzWFizsk9ImwIgO2mLVhl0UGfTrHlttHf+NhAdrLxPeiDWB8eOR3Ij+Qw="
"signature": "MEQCIHVpO2hbn546I/lAwJs3xKvW1wVMyGUb4/TxSUoOqrvsAiBzBso6/YWenmfszdJstaRR7nuBgm1wNodNaD2uYDP6cQ=="
}
},
"header": {
"channel_header": {
"channel_id": "businesschannel",
"epoch": "0",
"timestamp": "2017-12-06T14:29:27.000Z",
"timestamp": "2017-12-07T06:13:20.000Z",
"tx_id": "",
"type": 1,
"version": 0
@ -731,7 +731,7 @@
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNEVENDQWJPZ0F3SUJBZ0lSQVBoRWhYSWk0bTlETEQ3aXNoVmlxOEl3Q2dZSUtvWkl6ajBFQXdJd2FURUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhGREFTQmdOVkJBb1RDMlY0WVcxd2JHVXVZMjl0TVJjd0ZRWURWUVFERXc1allTNWxlR0Z0CmNHeGxMbU52YlRBZUZ3MHhOekV5TURZeE5ESXpNemxhRncweU56RXlNRFF4TkRJek16bGFNRmd4Q3pBSkJnTlYKQkFZVEFsVlRNUk13RVFZRFZRUUlFd3BEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIRXcxVFlXNGdSbkpoYm1OcApjMk52TVJ3d0dnWURWUVFERXhOdmNtUmxjbVZ5TG1WNFlXMXdiR1V1WTI5dE1Ga3dFd1lIS29aSXpqMENBUVlJCktvWkl6ajBEQVFjRFFnQUVQWURkNDhSTWp0QnRtb053MzhueDFEVS85dVRiZEhyYjRJQ2hvOEhNdVhINm5CTFkKK1haSFQyYnhObHNESGhxeWNkQVo4TDdqNWZmTzdIdEdNc082YWFOTk1Fc3dEZ1lEVlIwUEFRSC9CQVFEQWdlQQpNQXdHQTFVZEV3RUIvd1FDTUFBd0t3WURWUjBqQkNRd0lvQWdibmpROHgwVW1MZnVrdXVJQm1hNFRPZGZBWjFOCkNPZ00vVno4bVFiWG5LMHdDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWhBTk9Tc2hKUVZKVWsrZG5DWiszbWFoeEgKNEthMm5iZHR4dndsY0hSVmVDV0VBaUFqMjRMUHNKZm9GTXJ2UEpndTdsK2d6RXVSY3V5cE5EbHltQ3RWSU5Scwp3UT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
"mspid": "OrdererMSP"
},
"nonce": "hUKuwNA6Hsbepud46XsgIqX9oYHXgq6u"
"nonce": "04XbGtSPFvfRQx+PTRI0tbS9Jn44JNPY"
}
}
}

View File

@ -37,6 +37,8 @@ Profiles:
- *Org2
Capabilities:
<<: *ApplicationCapabilities
Resources:
DefaultModPolicy: /Channel/Application/Writers
################################################################################
#
@ -204,4 +206,5 @@ Capabilities:
# determined to be desired for all peers running v1.0.x, but the
# modification of which would cause imcompatibilities. Users should
# leave this flag set to true.
V1_1: true
# TODO, re-enable once the new lifecycle work is complete
V1_1: false

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -70,7 +70,7 @@ if [ "${GEN_CRYPTO}" = "true" ]; then
fi
if [ "${GEN_ARTIFACTS}" = "true" ]; then
echo_b "Generate genesis block file for system channel using configtx.yaml"
echo_b "Generate genesis block for system channel using configtx.yaml"
con_exec configtxgen -profile TwoOrgsOrdererGenesis -outputBlock /tmp/${CHANNEL_ARTIFACTS}/${ORDERER_GENESIS}
echo_b "Create the new app channel tx using configtx.yaml"

View File

@ -282,6 +282,12 @@
"version": "0"
}
},
"values": {
"Capabilities": {
"mod_policy": "Admins",
"version": "0"
}
},
"version": "1"
},
"Orderer": {
@ -601,9 +607,6 @@
"values": {
"Consortium": {
"mod_policy": "",
"value": {
"name": "SampleConsortium"
},
"version": "0"
}
},
@ -659,6 +662,12 @@
"version": "0"
}
},
"values": {
"Capabilities": {
"mod_policy": "Admins",
"version": "0"
}
},
"version": "1"
}
},
@ -677,13 +686,13 @@
},
"signatures": [
{
"signature": "MEQCIClEL7sWQG0g0n6rASGs0Y4sH1BDUMQjOZ6stxoDJPorAiAm8NKtrDDTEIgqaJRqQpC2WI6E6SgDgDKNULqULSwtcw==",
"signature": "MEUCIQCXvUTqPd7WpoPLlI5D8qVqWH0h+L4quYdcmX+vN+LFoAIgaamKAqMfrZutqvD3xTh3u+wZUd7RzpGg35v/3q33CoU=",
"signature_header": {
"creator": {
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWNDZ0F3SUJBZ0lSQVBwU3BQRjFOYWN1YmR1UFlSaVFwSUl3Q2dZSUtvWkl6ajBFQXdJd2N6RUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhHVEFYQmdOVkJBb1RFRzl5WnpFdVpYaGhiWEJzWlM1amIyMHhIREFhQmdOVkJBTVRFMk5oCkxtOXlaekV1WlhoaGJYQnNaUzVqYjIwd0hoY05NVGN4TWpBMk1UUXlNVEEzV2hjTk1qY3hNakEwTVRReU1UQTMKV2pCYk1Rc3dDUVlEVlFRR0V3SlZVekVUTUJFR0ExVUVDQk1LUTJGc2FXWnZjbTVwWVRFV01CUUdBMVVFQnhNTgpVMkZ1SUVaeVlXNWphWE5qYnpFZk1CMEdBMVVFQXd3V1FXUnRhVzVBYjNKbk1TNWxlR0Z0Y0d4bExtTnZiVEJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQk5WWTZST2tEdEdsa1VvU3Q3K01qNnY5Z0NWWVNRVzMKdFRCdTlqbnNVOGZrMkhhS2VJV1BpNFR3YXhjVE5VR3lqRlNSQSsrMFp0T3ZIMFpYUHFPRU8rS2pUVEJMTUE0RwpBMVVkRHdFQi93UUVBd0lIZ0RBTUJnTlZIUk1CQWY4RUFqQUFNQ3NHQTFVZEl3UWtNQ0tBSU9lWjkvcXNLZ09CCng2R3ZkK29WKzAxNGJ2ZXFFSlhvNHVPTXdwcWowcFdsTUFvR0NDcUdTTTQ5QkFNQ0EwY0FNRVFDSUVaY0htTUsKaFpmSjg0TGNrQVFhQy9RSHUwdTcvSzA1SG96V2FtQS85WVlVQWlCMGhiWXl5U1duckVQd1ZKdWlKaDlQdWx6RgpWaFB2cFZDemdVMThtQTVxWFE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
"mspid": "Org1MSP"
},
"nonce": "q5GldPa7IKhpxVEQsOHgvxiIIPSXQq9I"
"nonce": "PSSluEC1hhFAOkO+FF4LTFxBUE5G41d6"
}
}
]
@ -692,7 +701,7 @@
"channel_header": {
"channel_id": "businesschannel",
"epoch": "0",
"timestamp": "2017-12-06T14:26:52.000Z",
"timestamp": "2017-12-07T06:11:36.000Z",
"tx_id": "",
"type": 2,
"version": 0
@ -702,18 +711,18 @@
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWNDZ0F3SUJBZ0lSQVBwU3BQRjFOYWN1YmR1UFlSaVFwSUl3Q2dZSUtvWkl6ajBFQXdJd2N6RUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhHVEFYQmdOVkJBb1RFRzl5WnpFdVpYaGhiWEJzWlM1amIyMHhIREFhQmdOVkJBTVRFMk5oCkxtOXlaekV1WlhoaGJYQnNaUzVqYjIwd0hoY05NVGN4TWpBMk1UUXlNVEEzV2hjTk1qY3hNakEwTVRReU1UQTMKV2pCYk1Rc3dDUVlEVlFRR0V3SlZVekVUTUJFR0ExVUVDQk1LUTJGc2FXWnZjbTVwWVRFV01CUUdBMVVFQnhNTgpVMkZ1SUVaeVlXNWphWE5qYnpFZk1CMEdBMVVFQXd3V1FXUnRhVzVBYjNKbk1TNWxlR0Z0Y0d4bExtTnZiVEJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQk5WWTZST2tEdEdsa1VvU3Q3K01qNnY5Z0NWWVNRVzMKdFRCdTlqbnNVOGZrMkhhS2VJV1BpNFR3YXhjVE5VR3lqRlNSQSsrMFp0T3ZIMFpYUHFPRU8rS2pUVEJMTUE0RwpBMVVkRHdFQi93UUVBd0lIZ0RBTUJnTlZIUk1CQWY4RUFqQUFNQ3NHQTFVZEl3UWtNQ0tBSU9lWjkvcXNLZ09CCng2R3ZkK29WKzAxNGJ2ZXFFSlhvNHVPTXdwcWowcFdsTUFvR0NDcUdTTTQ5QkFNQ0EwY0FNRVFDSUVaY0htTUsKaFpmSjg0TGNrQVFhQy9RSHUwdTcvSzA1SG96V2FtQS85WVlVQWlCMGhiWXl5U1duckVQd1ZKdWlKaDlQdWx6RgpWaFB2cFZDemdVMThtQTVxWFE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
"mspid": "Org1MSP"
},
"nonce": "IJizUoKhMcO65aWYSnuKc/qw6NeItwZZ"
"nonce": "90rTtVmMpuEMhW5cyNxQO3m4GGXPOBAa"
}
}
},
"signature": "MEQCIHInMmiMASaRFS31WbSdz67HRT6YKm5gmj1fQcu1pwZYAiBIyQ6t8lBGWZAdUwgIf08FRjVIJ4RO9jeBbaIaV3QsIw=="
"signature": "MEQCIDXjjsRCheF6RYC0CV5JgNjYTfHDRkvcIlSX6cVr34M8AiBXnUQYzHX2vT+9Jv7MU06nHlUBuQBkjglhSLhWRjcDiA=="
}
},
"header": {
"channel_header": {
"channel_id": "businesschannel",
"epoch": "0",
"timestamp": "2017-12-06T14:26:52.000Z",
"timestamp": "2017-12-07T06:11:36.000Z",
"tx_id": "",
"type": 1,
"version": 0
@ -723,16 +732,16 @@
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNEVENDQWJPZ0F3SUJBZ0lSQUxtQllETzl0elkzeWpKMVdISkJPVkV3Q2dZSUtvWkl6ajBFQXdJd2FURUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhGREFTQmdOVkJBb1RDMlY0WVcxd2JHVXVZMjl0TVJjd0ZRWURWUVFERXc1allTNWxlR0Z0CmNHeGxMbU52YlRBZUZ3MHhOekV5TURZeE5ESXhNRGhhRncweU56RXlNRFF4TkRJeE1EaGFNRmd4Q3pBSkJnTlYKQkFZVEFsVlRNUk13RVFZRFZRUUlFd3BEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIRXcxVFlXNGdSbkpoYm1OcApjMk52TVJ3d0dnWURWUVFERXhOdmNtUmxjbVZ5TG1WNFlXMXdiR1V1WTI5dE1Ga3dFd1lIS29aSXpqMENBUVlJCktvWkl6ajBEQVFjRFFnQUVoOU9CWHRBR2xDUDBoRi9DaElsTmUvTUlNNWV0c1I3WXY3NjBNRGJKdTZXbm9paUsKcnJpNDFDQURiRWNRUit4NDdjR0xCSWsvNzhuSjllWjUyL1IwdktOTk1Fc3dEZ1lEVlIwUEFRSC9CQVFEQWdlQQpNQXdHQTFVZEV3RUIvd1FDTUFBd0t3WURWUjBqQkNRd0lvQWdDV0tTWmNJTyszQW1FM0JLaGxrUXFJVmRCMmFVCjE5YU9tQW8yQUdtQ1dtTXdDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWhBTk0rbm1tdGRsVFRvMm9TbTEydEtPeG0KYUtQOERBVElGOXc5Snh5S051MmRBaUJSWFVCcUNDdmk1Y2cxMGZ4Q3BuYU1icjhoTk5BQUdJYjRqSTdYUSt2ZwpPUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
"mspid": "OrdererMSP"
},
"nonce": "1iPiqDLxOJzY18x0gxg2pobchvMFDHEb"
"nonce": "ewbkdT4Lz6fdDDUdf5SPrpJ1b3r51XaS"
}
}
},
"signature": "MEUCIQDs00k62qnNk5I53lVcG5+rq0GtYLiZfJqBGRHOf7Ph1gIgNrzz2iaNN8n9KmURoeJMPvIoCgle93CrIk6nne5Ft9k="
"signature": "MEQCIAHCrezt4Wo0c/IrxiFJFHfy24LXE+iue9YaW3qwSR3ZAiAZhQN7qPuYRFkLUcZBLvK2YB4kB3VF8xhMIBNQDSTdkg=="
}
]
},
"header": {
"data_hash": "cc++o1bGmPcMwLpTkw4vrAL/CORR96q6Ggy4DcXlzfc=",
"data_hash": "KZW1xtTkkT602ecFINzvk9JxWopy6DgdLQYBTlAAvaU=",
"number": "0"
},
"metadata": {

View File

@ -278,6 +278,12 @@
"version": "0"
}
},
"values": {
"Capabilities": {
"mod_policy": "Admins",
"version": "0"
}
},
"version": "1"
},
"Orderer": {
@ -597,9 +603,6 @@
"values": {
"Consortium": {
"mod_policy": "",
"value": {
"name": "SampleConsortium"
},
"version": "0"
}
},
@ -655,6 +658,12 @@
"version": "0"
}
},
"values": {
"Capabilities": {
"mod_policy": "Admins",
"version": "0"
}
},
"version": "1"
}
},
@ -673,13 +682,13 @@
},
"signatures": [
{
"signature": "MEQCIClEL7sWQG0g0n6rASGs0Y4sH1BDUMQjOZ6stxoDJPorAiAm8NKtrDDTEIgqaJRqQpC2WI6E6SgDgDKNULqULSwtcw==",
"signature": "MEUCIQCXvUTqPd7WpoPLlI5D8qVqWH0h+L4quYdcmX+vN+LFoAIgaamKAqMfrZutqvD3xTh3u+wZUd7RzpGg35v/3q33CoU=",
"signature_header": {
"creator": {
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWNDZ0F3SUJBZ0lSQVBwU3BQRjFOYWN1YmR1UFlSaVFwSUl3Q2dZSUtvWkl6ajBFQXdJd2N6RUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhHVEFYQmdOVkJBb1RFRzl5WnpFdVpYaGhiWEJzWlM1amIyMHhIREFhQmdOVkJBTVRFMk5oCkxtOXlaekV1WlhoaGJYQnNaUzVqYjIwd0hoY05NVGN4TWpBMk1UUXlNVEEzV2hjTk1qY3hNakEwTVRReU1UQTMKV2pCYk1Rc3dDUVlEVlFRR0V3SlZVekVUTUJFR0ExVUVDQk1LUTJGc2FXWnZjbTVwWVRFV01CUUdBMVVFQnhNTgpVMkZ1SUVaeVlXNWphWE5qYnpFZk1CMEdBMVVFQXd3V1FXUnRhVzVBYjNKbk1TNWxlR0Z0Y0d4bExtTnZiVEJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQk5WWTZST2tEdEdsa1VvU3Q3K01qNnY5Z0NWWVNRVzMKdFRCdTlqbnNVOGZrMkhhS2VJV1BpNFR3YXhjVE5VR3lqRlNSQSsrMFp0T3ZIMFpYUHFPRU8rS2pUVEJMTUE0RwpBMVVkRHdFQi93UUVBd0lIZ0RBTUJnTlZIUk1CQWY4RUFqQUFNQ3NHQTFVZEl3UWtNQ0tBSU9lWjkvcXNLZ09CCng2R3ZkK29WKzAxNGJ2ZXFFSlhvNHVPTXdwcWowcFdsTUFvR0NDcUdTTTQ5QkFNQ0EwY0FNRVFDSUVaY0htTUsKaFpmSjg0TGNrQVFhQy9RSHUwdTcvSzA1SG96V2FtQS85WVlVQWlCMGhiWXl5U1duckVQd1ZKdWlKaDlQdWx6RgpWaFB2cFZDemdVMThtQTVxWFE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
"mspid": "Org1MSP"
},
"nonce": "q5GldPa7IKhpxVEQsOHgvxiIIPSXQq9I"
"nonce": "PSSluEC1hhFAOkO+FF4LTFxBUE5G41d6"
}
}
]
@ -688,7 +697,7 @@
"channel_header": {
"channel_id": "businesschannel",
"epoch": "0",
"timestamp": "2017-12-06T14:26:52.000Z",
"timestamp": "2017-12-07T06:11:36.000Z",
"tx_id": "",
"type": 2,
"version": 0
@ -698,18 +707,18 @@
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNHVENDQWNDZ0F3SUJBZ0lSQVBwU3BQRjFOYWN1YmR1UFlSaVFwSUl3Q2dZSUtvWkl6ajBFQXdJd2N6RUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhHVEFYQmdOVkJBb1RFRzl5WnpFdVpYaGhiWEJzWlM1amIyMHhIREFhQmdOVkJBTVRFMk5oCkxtOXlaekV1WlhoaGJYQnNaUzVqYjIwd0hoY05NVGN4TWpBMk1UUXlNVEEzV2hjTk1qY3hNakEwTVRReU1UQTMKV2pCYk1Rc3dDUVlEVlFRR0V3SlZVekVUTUJFR0ExVUVDQk1LUTJGc2FXWnZjbTVwWVRFV01CUUdBMVVFQnhNTgpVMkZ1SUVaeVlXNWphWE5qYnpFZk1CMEdBMVVFQXd3V1FXUnRhVzVBYjNKbk1TNWxlR0Z0Y0d4bExtTnZiVEJaCk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQk5WWTZST2tEdEdsa1VvU3Q3K01qNnY5Z0NWWVNRVzMKdFRCdTlqbnNVOGZrMkhhS2VJV1BpNFR3YXhjVE5VR3lqRlNSQSsrMFp0T3ZIMFpYUHFPRU8rS2pUVEJMTUE0RwpBMVVkRHdFQi93UUVBd0lIZ0RBTUJnTlZIUk1CQWY4RUFqQUFNQ3NHQTFVZEl3UWtNQ0tBSU9lWjkvcXNLZ09CCng2R3ZkK29WKzAxNGJ2ZXFFSlhvNHVPTXdwcWowcFdsTUFvR0NDcUdTTTQ5QkFNQ0EwY0FNRVFDSUVaY0htTUsKaFpmSjg0TGNrQVFhQy9RSHUwdTcvSzA1SG96V2FtQS85WVlVQWlCMGhiWXl5U1duckVQd1ZKdWlKaDlQdWx6RgpWaFB2cFZDemdVMThtQTVxWFE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==",
"mspid": "Org1MSP"
},
"nonce": "IJizUoKhMcO65aWYSnuKc/qw6NeItwZZ"
"nonce": "90rTtVmMpuEMhW5cyNxQO3m4GGXPOBAa"
}
}
},
"signature": "MEQCIHInMmiMASaRFS31WbSdz67HRT6YKm5gmj1fQcu1pwZYAiBIyQ6t8lBGWZAdUwgIf08FRjVIJ4RO9jeBbaIaV3QsIw=="
"signature": "MEQCIDXjjsRCheF6RYC0CV5JgNjYTfHDRkvcIlSX6cVr34M8AiBXnUQYzHX2vT+9Jv7MU06nHlUBuQBkjglhSLhWRjcDiA=="
}
},
"header": {
"channel_header": {
"channel_id": "businesschannel",
"epoch": "0",
"timestamp": "2017-12-06T14:26:52.000Z",
"timestamp": "2017-12-07T06:11:36.000Z",
"tx_id": "",
"type": 1,
"version": 0
@ -719,7 +728,7 @@
"id_bytes": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNEVENDQWJPZ0F3SUJBZ0lSQUxtQllETzl0elkzeWpKMVdISkJPVkV3Q2dZSUtvWkl6ajBFQXdJd2FURUwKTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnVENrTmhiR2xtYjNKdWFXRXhGakFVQmdOVkJBY1REVk5oYmlCRwpjbUZ1WTJselkyOHhGREFTQmdOVkJBb1RDMlY0WVcxd2JHVXVZMjl0TVJjd0ZRWURWUVFERXc1allTNWxlR0Z0CmNHeGxMbU52YlRBZUZ3MHhOekV5TURZeE5ESXhNRGhhRncweU56RXlNRFF4TkRJeE1EaGFNRmd4Q3pBSkJnTlYKQkFZVEFsVlRNUk13RVFZRFZRUUlFd3BEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIRXcxVFlXNGdSbkpoYm1OcApjMk52TVJ3d0dnWURWUVFERXhOdmNtUmxjbVZ5TG1WNFlXMXdiR1V1WTI5dE1Ga3dFd1lIS29aSXpqMENBUVlJCktvWkl6ajBEQVFjRFFnQUVoOU9CWHRBR2xDUDBoRi9DaElsTmUvTUlNNWV0c1I3WXY3NjBNRGJKdTZXbm9paUsKcnJpNDFDQURiRWNRUit4NDdjR0xCSWsvNzhuSjllWjUyL1IwdktOTk1Fc3dEZ1lEVlIwUEFRSC9CQVFEQWdlQQpNQXdHQTFVZEV3RUIvd1FDTUFBd0t3WURWUjBqQkNRd0lvQWdDV0tTWmNJTyszQW1FM0JLaGxrUXFJVmRCMmFVCjE5YU9tQW8yQUdtQ1dtTXdDZ1lJS29aSXpqMEVBd0lEU0FBd1JRSWhBTk0rbm1tdGRsVFRvMm9TbTEydEtPeG0KYUtQOERBVElGOXc5Snh5S051MmRBaUJSWFVCcUNDdmk1Y2cxMGZ4Q3BuYU1icjhoTk5BQUdJYjRqSTdYUSt2ZwpPUT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K",
"mspid": "OrdererMSP"
},
"nonce": "1iPiqDLxOJzY18x0gxg2pobchvMFDHEb"
"nonce": "ewbkdT4Lz6fdDDUdf5SPrpJ1b3r51XaS"
}
}
}

View File

@ -574,13 +574,13 @@
"channel_header": {
"channel_id": "testchainid",
"epoch": "0",
"timestamp": "2017-12-06T14:26:08.000Z",
"tx_id": "24a9ade9536716e99007a17d0465933b6f693ad6dd88f90aa9d1fef103b0c5d2",
"timestamp": "2017-12-07T06:11:27.000Z",
"tx_id": "e54a8fb4d1dd62c8471c8f4c921da240a7ffb2b2967de8e88dae19f3f261bf94",
"type": 1,
"version": 1
},
"signature_header": {
"nonce": "L8yPSj9Y11VqQR3Z7cxBc1BEuDb4Z6N1"
"nonce": "NBch/fA5Ct9I4k5vF1K9ZlzCGdfU/Wmn"
}
}
}
@ -588,7 +588,7 @@
]
},
"header": {
"data_hash": "9qQG1DKj9bA2Rt79fAKfXFqfcGPOJGn+i6ZZUSe4Fvw=",
"data_hash": "dl28FSEkiDDeSxD3cVnbXuFlXDQWuIzKIedGR3vjIuE=",
"number": "0"
},
"metadata": {

View File

@ -570,13 +570,13 @@
"channel_header": {
"channel_id": "testchainid",
"epoch": "0",
"timestamp": "2017-12-06T14:26:08.000Z",
"tx_id": "24a9ade9536716e99007a17d0465933b6f693ad6dd88f90aa9d1fef103b0c5d2",
"timestamp": "2017-12-07T06:11:27.000Z",
"tx_id": "e54a8fb4d1dd62c8471c8f4c921da240a7ffb2b2967de8e88dae19f3f261bf94",
"type": 1,
"version": 1
},
"signature_header": {
"nonce": "L8yPSj9Y11VqQR3Z7cxBc1BEuDb4Z6N1"
"nonce": "NBch/fA5Ct9I4k5vF1K9ZlzCGdfU/Wmn"
}
}
}

View File

@ -574,13 +574,13 @@
"channel_header": {
"channel_id": "testchainid",
"epoch": "0",
"timestamp": "2017-12-06T14:26:08.000Z",
"tx_id": "24a9ade9536716e99007a17d0465933b6f693ad6dd88f90aa9d1fef103b0c5d2",
"timestamp": "2017-12-07T06:11:27.000Z",
"tx_id": "e54a8fb4d1dd62c8471c8f4c921da240a7ffb2b2967de8e88dae19f3f261bf94",
"type": 1,
"version": 1
},
"signature_header": {
"nonce": "L8yPSj9Y11VqQR3Z7cxBc1BEuDb4Z6N1"
"nonce": "NBch/fA5Ct9I4k5vF1K9ZlzCGdfU/Wmn"
}
}
}
@ -588,7 +588,7 @@
]
},
"header": {
"data_hash": "9qQG1DKj9bA2Rt79fAKfXFqfcGPOJGn+i6ZZUSe4Fvw=",
"data_hash": "dl28FSEkiDDeSxD3cVnbXuFlXDQWuIzKIedGR3vjIuE=",
"number": "0"
},
"metadata": {

View File

@ -574,13 +574,13 @@
"channel_header": {
"channel_id": "testchainid",
"epoch": "0",
"timestamp": "2017-12-06T14:26:08.000Z",
"tx_id": "24a9ade9536716e99007a17d0465933b6f693ad6dd88f90aa9d1fef103b0c5d2",
"timestamp": "2017-12-07T06:11:27.000Z",
"tx_id": "e54a8fb4d1dd62c8471c8f4c921da240a7ffb2b2967de8e88dae19f3f261bf94",
"type": 1,
"version": 1
},
"signature_header": {
"nonce": "L8yPSj9Y11VqQR3Z7cxBc1BEuDb4Z6N1"
"nonce": "NBch/fA5Ct9I4k5vF1K9ZlzCGdfU/Wmn"
}
}
}
@ -588,7 +588,7 @@
]
},
"header": {
"data_hash": "9qQG1DKj9bA2Rt79fAKfXFqfcGPOJGn+i6ZZUSe4Fvw=",
"data_hash": "dl28FSEkiDDeSxD3cVnbXuFlXDQWuIzKIedGR3vjIuE=",
"number": "0"
},
"metadata": {

View File

@ -570,13 +570,13 @@
"channel_header": {
"channel_id": "testchainid",
"epoch": "0",
"timestamp": "2017-12-06T14:26:08.000Z",
"tx_id": "24a9ade9536716e99007a17d0465933b6f693ad6dd88f90aa9d1fef103b0c5d2",
"timestamp": "2017-12-07T06:11:27.000Z",
"tx_id": "e54a8fb4d1dd62c8471c8f4c921da240a7ffb2b2967de8e88dae19f3f261bf94",
"type": 1,
"version": 1
},
"signature_header": {
"nonce": "L8yPSj9Y11VqQR3Z7cxBc1BEuDb4Z6N1"
"nonce": "NBch/fA5Ct9I4k5vF1K9ZlzCGdfU/Wmn"
}
}
}

View File

@ -37,6 +37,8 @@ Profiles:
- *Org2
Capabilities:
<<: *ApplicationCapabilities
Resources:
DefaultModPolicy: /Channel/Application/Writers
################################################################################
#
@ -204,4 +206,5 @@ Capabilities:
# determined to be desired for all peers running v1.0.x, but the
# modification of which would cause imcompatibilities. Users should
# leave this flag set to true.
V1_1: true
# TODO, re-enable once the new lifecycle work is complete
V1_1: false

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,27 +0,0 @@
#! /bin/bash
echo "replace configtx.yaml and crypto-config.yaml"
cp ./peer/example2/configtx.yaml ./peer
cp ./peer/example2/crypto-config.yaml ./peer
echo "replace auto-test script "
cp ./peer/example2/new-channel-auto-test-5-peers.sh ./peer/scripts
echo "replace configtx.yaml"
cp ./peer/configtx.yaml /etc/hyperledger/fabric
echo "Generate new certificates"
cryptogen generate --config=./peer/crypto-config.yaml --output ./peer/crypto
echo "Generate new certificates"
configtxgen -profile TwoOrgsOrdererGenesis -outputBlock ./peer/channel-artifacts/orderer_genesis.block
echo "Create the configuration tx"
CHANNEL_NAME=newchannel
configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ./peer/channel-artifacts/channel.tx -channelID ${CHANNEL_NAME}
echo "Define the anchor peer for Org1 on the channel"
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org1MSPanchors.tx -channelID ${CHANNEL_NAME} -asOrg Org1MSP
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org2MSPanchors.tx -channelID ${CHANNEL_NAME} -asOrg Org2MSP
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org3MSPanchors.tx -channelID ${CHANNEL_NAME} -asOrg Org3MSP

View File

@ -1,13 +0,0 @@
#!/bin/bash
echo "Start configtxlator service and listen on port 7059"
docker run \
--rm -it \
--name configtxlator \
-p 7059:7059 \
yeasy/hyperledger-fabric \
configtxlator start
docker rm -f configtxlator

View File

@ -1,27 +0,0 @@
#! /bin/bash
echo "replace configtx.yaml and crypto-config.yaml"
cp ./peer/example2/configtx.yaml ./peer
cp ./peer/example2/crypto-config.yaml ./peer
echo "replace auto-test script "
cp ./peer/example2/new-channel-auto-test-5-peers.sh ./peer/scripts
echo "replace configtx.yaml"
cp ./peer/configtx.yaml /etc/hyperledger/fabric
echo "Generate new certificates"
cryptogen generate --config=./peer/crypto-config.yaml --output ./peer/crypto
echo "Generate new certificates"
configtxgen -profile TwoOrgsOrdererGenesis -outputBlock ./peer/channel-artifacts/orderer_genesis.block
echo "Create the configuration tx"
APP_CHANNEL=newchannel
configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ./peer/channel-artifacts/channel.tx -channelID ${APP_CHANNEL}
echo "Define the anchor peer for Org1 on the channel"
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org1MSPanchors.tx -channelID ${APP_CHANNEL} -asOrg Org1MSP
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org2MSPanchors.tx -channelID ${APP_CHANNEL} -asOrg Org2MSP
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org3MSPanchors.tx -channelID ${APP_CHANNEL} -asOrg Org3MSP

View File

@ -1,27 +0,0 @@
#! /bin/bash
echo "replace configtx.yaml and crypto-config.yaml"
cp ./peer/example2/configtx.yaml ./peer
cp ./peer/example2/crypto-config.yaml ./peer
echo "replace auto-test script "
cp ./peer/example2/new-channel-auto-test-5-peers.sh ./peer/scripts
echo "replace configtx.yaml"
cp ./peer/configtx.yaml /etc/hyperledger/fabric
echo "Generate new certificates"
cryptogen generate --config=./peer/crypto-config.yaml --output ./peer/crypto
echo "Generate new certificates"
configtxgen -profile TwoOrgsOrdererGenesis -outputBlock ./peer/channel-artifacts/orderer_genesis.block
echo "Create the configuration tx"
APP_CHANNEL=newchannel
configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ./peer/channel-artifacts/channel.tx -channelID ${APP_CHANNEL}
echo "Define the anchor peer for Org1 on the channel"
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org1MSPanchors.tx -channelID ${APP_CHANNEL} -asOrg Org1MSP
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org2MSPanchors.tx -channelID ${APP_CHANNEL} -asOrg Org2MSP
configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./peer/channel-artifacts/Org3MSPanchors.tx -channelID ${APP_CHANNEL} -asOrg Org3MSP