redwit-dev · timo-kang · Dec 8, 2021
diff --git a/redwit-network/.gitignore b/redwit-network/.gitignore
@@ -0,0 +1,13 @@
+/channel-artifacts/*.tx
+/channel-artifacts/*.block
+/ledgers
+/ledgers-backup
+/channel-artifacts/*.json
+organizations/fabric-ca/ordererOrg/*
+organizations/fabric-ca/org1/*
+organizations/fabric-ca/org2/*
+organizations/ordererOrganizations/*
+organizations/peerOrganizations/*
+system-genesis-block/*
+*.tar.gz
+log.txt
diff --git a/redwit-network/README.md b/redwit-network/README.md
@@ -0,0 +1,24 @@
+## Running the test network
+
+You can use the `./network.sh` script to stand up a simple Fabric test network. The test network has two peer organizations with one peer each and a single node raft ordering service. You can also use the `./network.sh` script to create channels and deploy chaincode. For more information, see [Using the Fabric test network](https://hyperledger-fabric.readthedocs.io/en/latest/test_network.html). The test network is being introduced in Fabric v2.0 as the long term replacement for the `first-network` sample.
+
+Before you can deploy the test network, you need to follow the instructions to [Install the Samples, Binaries and Docker Images](https://hyperledger-fabric.readthedocs.io/en/latest/install.html) in the Hyperledger Fabric documentation.
+
+## Using the Peer commands
+The `setOrgEnv.sh` script can be used to setup the environment variables for the ogrganziations, this will will help to be able to use the `peer` commands directly.
+
+First, ensure that the peer binaries are on your path, and the Fabric Config path is set Assuming that you're in the `test-network` directory.
+
+```bash
+ export PATH=$PATH:$(realpath ./bin)
+ export FABRIC_CFG_PATH=$(realpath ./config)
+```
+
+You can then set up the environment variables for each organization. The `./setOrgEnv.sh` command is designed to be run as follows.
+
+```bash
+export $(./setOrgEnv.sh Org2 | xargs)
+```
+
+You will now be able to run the `peer` commands in the context of Org2. If a different command prompt you can run the same command with Org1 instead.
+The `setOrgEnv` script outputs a series of `<name>=<value>` strings. These can then be fed into the export command for your current shell
diff --git a/redwit-network/addOrg3/README.md b/redwit-network/addOrg3/README.md
@@ -0,0 +1,28 @@
+## Adding Org3 to the test network
+
+You can use the `addOrg3.sh` script to add another organization to the Fabric test network. The `addOrg3.sh` script generates the Org3 crypto material, creates an Org3 organization definition, and adds Org3 to a channel on the test network.
+
+You first need to run `./network.sh up createChannel` in the `test-network` directory before you can run the `addOrg3.sh` script.
+
+```
+./network.sh up createChannel
+cd addOrg3
+./addOrg3.sh up
+```
+
+If you used `network.sh` to create a channel other than the default `mychannel`, you need pass that name to the `addorg3.sh` script.
+```
+./network.sh up createChannel -c channel1
+cd addOrg3
+./addOrg3.sh up -c channel1
+```
+
+You can also re-run the `addOrg3.sh` script to add Org3 to additional channels.
+```
+cd ..
+./network.sh createChannel -c channel2
+cd addOrg3
+./addOrg3.sh up -c channel2
+```
+
+For more information, use `./addOrg3.sh -h` to see the `addOrg3.sh` help text.
diff --git a/redwit-network/addOrg3/addOrg3.sh b/redwit-network/addOrg3/addOrg3.sh
@@ -0,0 +1,267 @@
+#!/bin/bash
+#
+# Copyright IBM Corp All Rights Reserved
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# This script extends the Hyperledger Fabric test network by adding
+# adding a third organization to the network
+#
+
+# prepending $PWD/../bin to PATH to ensure we are picking up the correct binaries
+# this may be commented out to resolve installed version of tools if desired
+export PATH=${PWD}/../bin:${PWD}:$PATH
+export FABRIC_CFG_PATH=${PWD}
+export VERBOSE=false
+
+. ../scripts/utils.sh
+
+# Print the usage message
+function printHelp () {
+  echo "Usage: "
+  echo "  addOrg3.sh up|down|generate [-c <channel name>] [-t <timeout>] [-d <delay>] [-f <docker-compose-file>] [-s <dbtype>]"
+  echo "  addOrg3.sh -h|--help (print this message)"
+  echo "    <mode> - one of 'up', 'down', or 'generate'"
+  echo "      - 'up' - add org3 to the sample network. You need to bring up the test network and create a channel first."
+  echo "      - 'down' - bring down the test network and org3 nodes"
+  echo "      - 'generate' - generate required certificates and org definition"
+  echo "    -c <channel name> - test network channel name (defaults to \"mychannel\")"
+  echo "    -ca <use CA> -  Use a CA to generate the crypto material"
+  echo "    -t <timeout> - CLI timeout duration in seconds (defaults to 10)"
+  echo "    -d <delay> - delay duration in seconds (defaults to 3)"
+  echo "    -s <dbtype> - the database backend to use: goleveldb (default) or couchdb"
+  echo "    -verbose - verbose mode"
+  echo
+  echo "Typically, one would first generate the required certificates and "
+  echo "genesis block, then bring up the network. e.g.:"
+  echo
+  echo "	addOrg3.sh generate"
+  echo "	addOrg3.sh up"
+  echo "	addOrg3.sh up -c mychannel -s couchdb"
+  echo "	addOrg3.sh down"
+  echo
+  echo "Taking all defaults:"
+  echo "	addOrg3.sh up"
+  echo "	addOrg3.sh down"
+}
+
+# We use the cryptogen tool to generate the cryptographic material
+# (x509 certs) for the new org.  After we run the tool, the certs will
+# be put in the organizations folder with org1 and org2
+
+# Create Organziation crypto material using cryptogen or CAs
+function generateOrg3() {
+  # Create crypto material using cryptogen
+  if [ "$CRYPTO" == "cryptogen" ]; then
+    which cryptogen
+    if [ "$?" -ne 0 ]; then
+      fatalln "cryptogen tool not found. exiting"
+    fi
+    infoln "Generating certificates using cryptogen tool"
+
+    infoln "Creating Org3 Identities"
+
+    set -x
+    cryptogen generate --config=org3-crypto.yaml --output="../organizations"
+    res=$?
+    { set +x; } 2>/dev/null
+    if [ $res -ne 0 ]; then
+      fatalln "Failed to generate certificates..."
+    fi
+
+  fi
+
+  # Create crypto material using Fabric CA
+  if [ "$CRYPTO" == "Certificate Authorities" ]; then
+    fabric-ca-client version > /dev/null 2>&1
+    if [[ $? -ne 0 ]]; then
+      echo "ERROR! fabric-ca-client binary not found.."
+      echo
+      echo "Follow the instructions in the Fabric docs to install the Fabric Binaries:"
+      echo "https://hyperledger-fabric.readthedocs.io/en/latest/install.html"
+      exit 1
+    fi
+
+    infoln "Generating certificates using Fabric CA"
+    docker-compose -f $COMPOSE_FILE_CA_ORG3 up -d 2>&1
+
+    . fabric-ca/registerEnroll.sh
+
+    sleep 10
+
+    infoln "Creating Org3 Identities"
+    createOrg3
+
+  fi
+
+  infoln "Generating CCP files for Org3"
+  ./ccp-generate.sh
+}
+
+# Generate channel configuration transaction
+function generateOrg3Definition() {
+  which configtxgen
+  if [ "$?" -ne 0 ]; then
+    fatalln "configtxgen tool not found. exiting"
+  fi
+  infoln "Generating Org3 organization definition"
+  export FABRIC_CFG_PATH=$PWD
+  set -x
+  configtxgen -printOrg Org3MSP > ../organizations/peerOrganizations/org3.example.com/org3.json
+  res=$?
+  { set +x; } 2>/dev/null
+  if [ $res -ne 0 ]; then
+    fatalln "Failed to generate Org3 organization definition..."
+  fi
+}
+
+function Org3Up () {
+  # start org3 nodes
+  if [ "${DATABASE}" == "couchdb" ]; then
+    DOCKER_SOCK=${DOCKER_SOCK} docker-compose -f $COMPOSE_FILE_ORG3 -f $COMPOSE_FILE_COUCH_ORG3 up -d 2>&1
+  else
+    DOCKER_SOCK=${DOCKER_SOCK} docker-compose -f $COMPOSE_FILE_ORG3 up -d 2>&1
+  fi
+  if [ $? -ne 0 ]; then
+    fatalln "ERROR !!!! Unable to start Org3 network"
+  fi
+}
+
+# Generate the needed certificates, the genesis block and start the network.
+function addOrg3 () {
+  # If the test network is not up, abort
+  if [ ! -d ../organizations/ordererOrganizations ]; then
+    fatalln "ERROR: Please, run ./network.sh up createChannel first."
+  fi
+
+  # generate artifacts if they don't exist
+  if [ ! -d "../organizations/peerOrganizations/org3.example.com" ]; then
+    generateOrg3
+    generateOrg3Definition
+  fi
+
+  infoln "Bringing up Org3 peer"
+  Org3Up
+
+  # Use the CLI container to create the configuration transaction needed to add
+  # Org3 to the network
+  infoln "Generating and submitting config tx to add Org3"
+  docker exec cli ./scripts/org3-scripts/updateChannelConfig.sh $CHANNEL_NAME $CLI_DELAY $CLI_TIMEOUT $VERBOSE
+  if [ $? -ne 0 ]; then
+    fatalln "ERROR !!!! Unable to create config tx"
+  fi
+
+  infoln "Joining Org3 peers to network"
+  docker exec cli ./scripts/org3-scripts/joinChannel.sh $CHANNEL_NAME $CLI_DELAY $CLI_TIMEOUT $VERBOSE
+  if [ $? -ne 0 ]; then
+    fatalln "ERROR !!!! Unable to join Org3 peers to network"
+  fi
+}
+
+# Tear down running network
+function networkDown () {
+    cd ..
+    ./network.sh down
+}
+
+# Using crpto vs CA. default is cryptogen
+CRYPTO="cryptogen"
+# timeout duration - the duration the CLI should wait for a response from
+# another container before giving up
+CLI_TIMEOUT=10
+#default for delay
+CLI_DELAY=3
+# channel name defaults to "mychannel"
+CHANNEL_NAME="mychannel"
+# use this as the docker compose couch file
+COMPOSE_FILE_COUCH_ORG3=docker/docker-compose-couch-org3.yaml
+# use this as the default docker-compose yaml definition
+COMPOSE_FILE_ORG3=docker/docker-compose-org3.yaml
+# certificate authorities compose file
+COMPOSE_FILE_CA_ORG3=docker/docker-compose-ca-org3.yaml
+# database
+DATABASE="leveldb"
+
+# Get docker sock path from environment variable
+SOCK="${DOCKER_HOST:-/var/run/docker.sock}"
+DOCKER_SOCK="${SOCK##unix://}"
+
+# Parse commandline args
+
+## Parse mode
+if [[ $# -lt 1 ]] ; then
+  printHelp
+  exit 0
+else
+  MODE=$1
+  shift
+fi
+
+# parse flags
+
+while [[ $# -ge 1 ]] ; do
+  key="$1"
+  case $key in
+  -h )
+    printHelp
+    exit 0
+    ;;
+  -c )
+    CHANNEL_NAME="$2"
+    shift
+    ;;
+  -ca )
+    CRYPTO="Certificate Authorities"
+    ;;
+  -t )
+    CLI_TIMEOUT="$2"
+    shift
+    ;;
+  -d )
+    CLI_DELAY="$2"
+    shift
+    ;;
+  -s )
+    DATABASE="$2"
+    shift
+    ;;
+  -verbose )
+    VERBOSE=true
+    shift
+    ;;
+  * )
+    errorln "Unknown flag: $key"
+    printHelp
+    exit 1
+    ;;
+  esac
+  shift
+done
+
+
+# Determine whether starting, stopping, restarting or generating for announce
+if [ "$MODE" == "up" ]; then
+  infoln "Adding org3 to channel '${CHANNEL_NAME}' with '${CLI_TIMEOUT}' seconds and CLI delay of '${CLI_DELAY}' seconds and using database '${DATABASE}'"
+  echo
+elif [ "$MODE" == "down" ]; then
+  EXPMODE="Stopping network"
+elif [ "$MODE" == "generate" ]; then
+  EXPMODE="Generating certs and organization definition for Org3"
+else
+  printHelp
+  exit 1
+fi
+
+#Create the network using docker compose
+if [ "${MODE}" == "up" ]; then
+  addOrg3
+elif [ "${MODE}" == "down" ]; then ## Clear the network
+  networkDown
+elif [ "${MODE}" == "generate" ]; then ## Generate Artifacts
+  generateOrg3
+  generateOrg3Definition
+else
+  printHelp
+  exit 1
+fi
diff --git a/redwit-network/addOrg3/ccp-generate.sh b/redwit-network/addOrg3/ccp-generate.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+function one_line_pem {
+    echo "`awk 'NF {sub(/\\n/, ""); printf "%s\\\\\\\n",$0;}' $1`"
+}
+
+function json_ccp {
+    local PP=$(one_line_pem $4)
+    local CP=$(one_line_pem $5)
+    sed -e "s/\${ORG}/$1/" \
+        -e "s/\${P0PORT}/$2/" \
+        -e "s/\${CAPORT}/$3/" \
+        -e "s#\${PEERPEM}#$PP#" \
+        -e "s#\${CAPEM}#$CP#" \
+        ccp-template.json
+}
+
+function yaml_ccp {
+    local PP=$(one_line_pem $4)
+    local CP=$(one_line_pem $5)
+    sed -e "s/\${ORG}/$1/" \
+        -e "s/\${P0PORT}/$2/" \
+        -e "s/\${CAPORT}/$3/" \
+        -e "s#\${PEERPEM}#$PP#" \
+        -e "s#\${CAPEM}#$CP#" \
+        ccp-template.yaml | sed -e $'s/\\\\n/\\\n        /g'
+}
+
+ORG=3
+P0PORT=11051
+CAPORT=11054
+PEERPEM=../organizations/peerOrganizations/org3.example.com/tlsca/tlsca.org3.example.com-cert.pem
+CAPEM=../organizations/peerOrganizations/org3.example.com/ca/ca.org3.example.com-cert.pem
+
+echo "$(json_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > ../organizations/peerOrganizations/org3.example.com/connection-org3.json
+echo "$(yaml_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM)" > ../organizations/peerOrganizations/org3.example.com/connection-org3.yaml