mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-17 07:25: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>
102 lines
2.5 KiB
Bash
Executable file
102 lines
2.5 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
# imports
|
|
. scripts/envVar.sh
|
|
. scripts/utils.sh
|
|
|
|
CHANNEL_NAME="$1"
|
|
DELAY="$2"
|
|
MAX_RETRY="$3"
|
|
VERBOSE="$4"
|
|
: ${CHANNEL_NAME:="mychannel"}
|
|
: ${DELAY:="3"}
|
|
: ${MAX_RETRY:="5"}
|
|
: ${VERBOSE:="false"}
|
|
|
|
if [ ! -d "channel-artifacts" ]; then
|
|
mkdir channel-artifacts
|
|
fi
|
|
|
|
createChannelGenesisBlock() {
|
|
which configtxgen
|
|
if [ "$?" -ne 0 ]; then
|
|
fatalln "configtxgen tool not found."
|
|
fi
|
|
set -x
|
|
configtxgen -profile TwoOrgsApplicationGenesis -outputBlock ./channel-artifacts/${CHANNEL_NAME}.block -channelID $CHANNEL_NAME
|
|
res=$?
|
|
{ set +x; } 2>/dev/null
|
|
verifyResult $res "Failed to generate channel configuration transaction..."
|
|
}
|
|
|
|
createChannel() {
|
|
setGlobals 1
|
|
# Poll in case the raft leader is not set yet
|
|
local rc=1
|
|
local COUNTER=1
|
|
while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ] ; do
|
|
sleep $DELAY
|
|
set -x
|
|
osnadmin channel join --channel-id $CHANNEL_NAME --config-block ./channel-artifacts/${CHANNEL_NAME}.block -o localhost:7053 --ca-file "$ORDERER_CA" --client-cert "$ORDERER_ADMIN_TLS_SIGN_CERT" --client-key "$ORDERER_ADMIN_TLS_PRIVATE_KEY" >&log.txt
|
|
res=$?
|
|
{ set +x; } 2>/dev/null
|
|
let rc=$res
|
|
COUNTER=$(expr $COUNTER + 1)
|
|
done
|
|
cat log.txt
|
|
verifyResult $res "Channel creation failed"
|
|
}
|
|
|
|
# joinChannel ORG
|
|
joinChannel() {
|
|
FABRIC_CFG_PATH=$PWD/../config/
|
|
ORG=$1
|
|
setGlobals $ORG
|
|
local rc=1
|
|
local COUNTER=1
|
|
## Sometimes Join takes time, hence retry
|
|
while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ] ; do
|
|
sleep $DELAY
|
|
set -x
|
|
peer channel join -b $BLOCKFILE >&log.txt
|
|
res=$?
|
|
{ set +x; } 2>/dev/null
|
|
let rc=$res
|
|
COUNTER=$(expr $COUNTER + 1)
|
|
done
|
|
cat log.txt
|
|
verifyResult $res "After $MAX_RETRY attempts, peer0.org${ORG} has failed to join channel '$CHANNEL_NAME' "
|
|
}
|
|
|
|
setAnchorPeer() {
|
|
ORG=$1
|
|
docker exec cli ./scripts/setAnchorPeer.sh $ORG $CHANNEL_NAME
|
|
}
|
|
|
|
FABRIC_CFG_PATH=${PWD}/configtx
|
|
|
|
## Create channel genesis block
|
|
infoln "Generating channel genesis block '${CHANNEL_NAME}.block'"
|
|
createChannelGenesisBlock
|
|
|
|
FABRIC_CFG_PATH=$PWD/../config/
|
|
BLOCKFILE="./channel-artifacts/${CHANNEL_NAME}.block"
|
|
|
|
## Create channel
|
|
infoln "Creating channel ${CHANNEL_NAME}"
|
|
createChannel
|
|
successln "Channel '$CHANNEL_NAME' created"
|
|
|
|
## Join all the peers to the channel
|
|
infoln "Joining org1 peer to the channel..."
|
|
joinChannel 1
|
|
infoln "Joining org2 peer to the channel..."
|
|
joinChannel 2
|
|
|
|
## Set the anchor peers for each org in the channel
|
|
infoln "Setting anchor peer for org1..."
|
|
setAnchorPeer 1
|
|
infoln "Setting anchor peer for org2..."
|
|
setAnchorPeer 2
|
|
|
|
successln "Channel '$CHANNEL_NAME' joined"
|