Update config tool version

pull/117/head
Baohua Yang 2018-01-28 20:41:49 +08:00
parent 276dd7cbcb
commit 3dbc7b7826
17 changed files with 23472 additions and 24808 deletions

View File

@ -4,7 +4,7 @@
HLF_MODE ?= solo
HLF_VERSION ?= 1.0.2
CODE_BUILD_WAIT=30 # time to wait to build peer/orderer from local code
CODE_BUILD_WAIT=40 # time to wait to build peer/orderer from local code
NETWORK_INIT_WAIT=2 # time to wait the fabric network finish initialization
COMPOSE_FILE ?= "docker-compose-2orgs-4peers-solo.yaml"
@ -156,7 +156,7 @@ test_fetch_blocks: # test fetching channel blocks fetch
setup: # setup the environment
bash scripts/env_setup.sh # Installing Docker and Docker-Compose
#bash scripts/download_images.sh # Pull required Docker images
bash scripts/download_images.sh # Pull required Docker images
check: # Check shell scripts grammar
@echo "Check shell scripts grammar"

View File

@ -52,7 +52,6 @@ services:
- ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]
expose:
- "7050" #
#command: bash -c 'bash /tmp/orderer_build.sh; orderer start' # use this if to debug orderer
command: orderer start
peer-base:

View File

@ -70,7 +70,7 @@ CC_QUERY_ARGS=${CC_02_QUERY_ARGS}
CORE_PEER_TLS_ENABLED="true"
# Generate configs
GEN_IMG=yeasy/hyperledger-fabric:latest # working dir is `/go/src/github.com/hyperledger/fabric`
GEN_IMG=yeasy/hyperledger-fabric:1.0.2 # working dir is `/go/src/github.com/hyperledger/fabric`
GEN_CONTAINER=generator
FABRIC_CFG_PATH=/etc/hyperledger/fabric
CHANNEL_ARTIFACTS=channel-artifacts
@ -82,7 +82,7 @@ UPDATE_ANCHOR_ORG1_TX=Org1MSPanchors.tx
UPDATE_ANCHOR_ORG2_TX=Org2MSPanchors.tx
# CONFIGTXLATOR
CTL_IMG=yeasy/hyperledger-fabric:latest
CTL_IMG=yeasy/hyperledger-fabric:1.0.2
CTL_CONTAINER=configtxlator
CTL_BASE_URL=http://127.0.0.1:7059
CTL_ENCODE_URL=${CTL_BASE_URL}/protolator/encode

View File

@ -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": "2018-01-03T13:09:56.000Z",
"tx_id": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
"type": 2,
"version": 0
}
}
}
}

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