mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-17 23:45:10 +00:00
14dc7e1316
* Fix creating channel when ${PWD} contains space.
If the path of the project contains spaces, the "test-network/scripts/envVar.sh" script sets the value of "$ORDERER_CA" to a value containg "${PWD}" which, in turn, contains space(s).
When the variable used in "test-network/scripts/createChannel.sh", The first part of the value (before the first space) is handled as the whole value for "--cafile". Other parts are considered to be part of the command!
I tried putting (escaped) quotes in the "test-network/scripts/envVar.sh" definition for the variable "$ORDERER_CA" to make the fix more general, but the quotation marks were sometime interpreted to be part of the path that consisted of concatenated parts somewhere and it did not work.
While this edit will fix this issue, I belive this is just a work around. I expect that there is a better way to solve the root cause of the problem instead of just fixing it in one place. Moreover, All variables/paths that may include spaces should be properly handled as well.
Thanks
Signed-off-by: Waleed Mortaja <waleedmortaja@protonmail.com>
* Double quote variables evaluations that depends on $PWD
I tried to handle most (if not all) of the variables evaluations in the project that depends on $PWD by wrapping them in double-quotations to avoid values that contains white spaces.
Some lines I was not sure if they are Okay or not but I left them as they are. Samples (not all lines) as follows:
- commercial-paper/network-clean.sh:15:DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
- commercial-paper/network-starter.sh:15:DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
- asset-transfer-basic/chaincode-javascript/node_modules/fabric-shim/coverage/fabric-shim/lib/chaincode.js.html:997: optsCpy.pem = fs.readFileSync(process.env.CORE_PEER_TLS_ROOTCERT_FILE).toString();
- commercial-paper/organization/digibank/digibank.sh:29:export PEER_PARMS="${PEER_CONN_PARMS##*( )}"
The next sample I was not really sure, but still edited it:
- test-network/addOrg3/fabric-ca/registerEnroll.sh:68: cp ${PWD}/../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/tlscacerts/* ${PWD}/../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt
I deliberately ignored some lines because I think they are not problem. These lines include:
- `export` sentences
- assignment sentences like: test-network/scripts/createChannel.sh:48: FABRIC_CFG_PATH=$PWD/../config/
- gradlew files: the line SAVED="`pwd`"
- gradlew files: the line APP_HOME="`pwd -P`"
- gradlew files: the line CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
Signed-off-by: Waleed Mortaja <waleedmortaja@protonmail.com>
* remove unnecessary leading space trimming
Signed-off-by: Waleed Mortaja <waleedmortaja@protonmail.com>
* resolved conflict with master
Co-authored-by: Arnaud J Le Hors <lehors@us.ibm.com>
61 lines
2.2 KiB
Bash
Executable file
61 lines
2.2 KiB
Bash
Executable file
#!/bin/bash
|
|
#
|
|
# Copyright IBM Corp. All Rights Reserved.
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
|
|
# import utils
|
|
. scripts/envVar.sh
|
|
|
|
# fetchChannelConfig <org> <channel_id> <output_json>
|
|
# Writes the current channel config for a given channel to a JSON file
|
|
# NOTE: this must be run in a CLI container since it requires configtxlator
|
|
fetchChannelConfig() {
|
|
ORG=$1
|
|
CHANNEL=$2
|
|
OUTPUT=$3
|
|
|
|
setGlobals $ORG
|
|
|
|
infoln "Fetching the most recent configuration block for the channel"
|
|
set -x
|
|
peer channel fetch config config_block.pb -o orderer.example.com:7050 --ordererTLSHostnameOverride orderer.example.com -c $CHANNEL --tls --cafile "$ORDERER_CA"
|
|
{ set +x; } 2>/dev/null
|
|
|
|
infoln "Decoding config block to JSON and isolating config to ${OUTPUT}"
|
|
set -x
|
|
configtxlator proto_decode --input config_block.pb --type common.Block | jq .data.data[0].payload.data.config >"${OUTPUT}"
|
|
{ set +x; } 2>/dev/null
|
|
}
|
|
|
|
# createConfigUpdate <channel_id> <original_config.json> <modified_config.json> <output.pb>
|
|
# Takes an original and modified config, and produces the config update tx
|
|
# which transitions between the two
|
|
# NOTE: this must be run in a CLI container since it requires configtxlator
|
|
createConfigUpdate() {
|
|
CHANNEL=$1
|
|
ORIGINAL=$2
|
|
MODIFIED=$3
|
|
OUTPUT=$4
|
|
|
|
set -x
|
|
configtxlator proto_encode --input "${ORIGINAL}" --type common.Config >original_config.pb
|
|
configtxlator proto_encode --input "${MODIFIED}" --type common.Config >modified_config.pb
|
|
configtxlator compute_update --channel_id "${CHANNEL}" --original original_config.pb --updated modified_config.pb >config_update.pb
|
|
configtxlator proto_decode --input config_update.pb --type common.ConfigUpdate >config_update.json
|
|
echo '{"payload":{"header":{"channel_header":{"channel_id":"'$CHANNEL'", "type":2}},"data":{"config_update":'$(cat config_update.json)'}}}' | jq . >config_update_in_envelope.json
|
|
configtxlator proto_encode --input config_update_in_envelope.json --type common.Envelope >"${OUTPUT}"
|
|
{ set +x; } 2>/dev/null
|
|
}
|
|
|
|
# signConfigtxAsPeerOrg <org> <configtx.pb>
|
|
# Set the peerOrg admin of an org and sign the config update
|
|
signConfigtxAsPeerOrg() {
|
|
ORG=$1
|
|
CONFIGTXFILE=$2
|
|
setGlobals $ORG
|
|
set -x
|
|
peer channel signconfigtx -f "${CONFIGTXFILE}"
|
|
{ set +x; } 2>/dev/null
|
|
}
|