Add New Org #66
Add New Org #66
Conversation
| @@ -0,0 +1,28 @@ | |||
| ## Adding Org3 to the test network | |||
There was a problem hiding this comment.
The readme refers to org3 still
| fi | ||
|
|
||
| # Create crypto material using Fabric CA | ||
| if [ "$CRYPTO" == "Certificate Authorities" ]; then |
There was a problem hiding this comment.
We don't generate crypto material using the CA so this section could be commented out
|
|
||
| fi | ||
|
|
||
| infoln "Generating CCP files for Org4" |
There was a problem hiding this comment.
We don't generate CCPs so this should be commented out
| elif [ "$MODE" == "generate" ]; then | ||
| EXPMODE="Generating certs and organization definition for Org4" | ||
| elif [ "$MODE" == "deployCC" ]; then | ||
| EXPMODE="dePLOYING CC" |
There was a problem hiding this comment.
looks like the message has swapped caps letters
| @@ -0,0 +1,36 @@ | |||
| #!/bin/bash | |||
There was a problem hiding this comment.
we don't need this file as we don't use CCPs
| @@ -0,0 +1,49 @@ | |||
| { | |||
| @@ -0,0 +1,34 @@ | |||
| --- | |||
| @@ -0,0 +1,406 @@ | |||
| ############################################################################# | |||
There was a problem hiding this comment.
We shouldn't need this file as we don't use CAs
| @@ -0,0 +1,87 @@ | |||
| #!/bin/bash | |||
There was a problem hiding this comment.
We shouldn't need this file as we don't use CAs
| @@ -432,6 +432,7 @@ services: | |||
| - /var/run/:/host/var/run/ | |||
| - ../organizations:/opt/gopath/src/github.com/hyperledger/fabric/peer/organizations | |||
| - ../scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ | |||
| - ../../../chaincode:/opt/gopath/src/github.com/hyperledger/fabric/peer/chaincode/ | |||
There was a problem hiding this comment.
Not sure why this line was added, can you give some detail as to why you added it ?
There was a problem hiding this comment.
I am getting path not found otherwise for chaincode path ../../../chaincode/node
| packageChaincode | ||
|
|
||
| ## Install chaincode on peer0.org1 and peer0.org2 | ||
| infoln "Installing chaincode on peer0.org1..." |
| signConfigtxAsPeerOrg 2 org4_update_in_envelope.pb | ||
|
|
||
|
|
||
| infoln "Submitting transaction from a different peer (peer0.org2) which also signs it" |
| @@ -0,0 +1,27 @@ | |||
| # Copyright IBM Corp. All Rights Reserved. | |||
There was a problem hiding this comment.
We don't use CAs so shouldn't need this file
| @@ -0,0 +1,42 @@ | |||
| # Copyright IBM Corp. All Rights Reserved. | |||
There was a problem hiding this comment.
We don't use couch so this file isn't required
|
|
||
| echo "Fetching channel config block from orderer..." | ||
| set -x | ||
| peer channel fetch 0 $BLOCKFILE -o orderer1.example.com:7050 --ordererTLSHostnameOverride orderer1.example.com -c $CHANNEL_NAME --tls --cafile "$ORDERER_CA" >&log.txt |
There was a problem hiding this comment.
why are we fetching the genesis block ? I would have thought we would want the latest config block ?
There was a problem hiding this comment.
You are right,it should be the latest block, I followed addOrg3 scripts, looks like it need to be fixed in fabric-samples as well.
|
|
||
| For more information, use `./addOrg4.sh -h` to see the `addOrg4.sh` help text. | ||
|
|
||
|
|
There was a problem hiding this comment.
Should add the deployCC support here as well
| } | ||
| function deployCC(){ | ||
| infoln "CC Deploy" | ||
| docker exec cli ./scripts/org4-scripts/deployCC.sh $CHANNEL_NAME $CC_NAME $CC_SRC_PATH $CC_SRC_LANGUAGE $CC_VERSION $CC_SEQUENCE $CC_INIT_FCN $CC_END_POLICY $CC_COLL_CONFIG $CLI_DELAY $MAX_RETRY $VERBOSE |
There was a problem hiding this comment.
This is the reason why chaincode needs to be mounted into the cli container, but wondered why deployCC has to be run in the CLI container as we run the main deployCC locally.
| @@ -0,0 +1,229 @@ | |||
| #!/bin/bash | |||
There was a problem hiding this comment.
Would be good if the current deployCC could be enhanced to do it all rather than another script which replicates a lot of the code
| CC_SEQUENCE=${6:-"1"} | ||
| CC_INIT_FCN=${7:-"NA"} | ||
| #CC_END_POLICY=${8:-"NA"} | ||
| CC_END_POLICY="OR(AND('Org1MSP.member','Org2MSP.member'),AND('Org1MSP.member','Org3MSP.member'),AND('Org3MSP.member','Org2MSP.member'))" |
There was a problem hiding this comment.
we don't want to hardcode the endorsement policy anymore
Signed-off-by: sapthasurendran <[email protected]>
Signed-off-by: sapthasurendran <[email protected]>
Signed-off-by: sapthasurendran <[email protected]>
Signed-off-by: sapthasurendran <[email protected]>
Signed-off-by: sapthasurendran <[email protected]>
Signed-off-by: sapthasurendran <[email protected]>
Signed-off-by: sapthasurendran <[email protected]>
Signed-off-by: sapthasurendran <[email protected]>
sapthasurendran
force-pushed
the
newOrg
branch
from
132331e
to
7ebf057
Compare
|
Closing as I have taken the code here as the basis to create the ability to add org4 thanks @sapthasurendran |
closes #69