minor fixes after the review

Signed-off-by: Sanket Teli <[email protected]>
Sanket-0510 · Dec 3, 2024 · cbf301f · cbf301f
1 parent da49380
commit cbf301f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 36 deletions.
diff --git a/src/setup-docker/templates/fabric-docker/.env b/src/setup-docker/templates/fabric-docker/.env
@@ -18,11 +18,9 @@ FABRIC_CA_POSTGRES_VERSION=<%= fabricCaPostgresVersion %>
 FABRIC_CCENV_VERSION=<%= global.fabricCcenvVersion %>
 FABRIC_BASEOS_VERSION=<%= global.fabricBaseosVersion %>
 
-
-FABRIC_JAVAENV_VERSION=3.0-beta
-FABRIC_NODEENV_VERSION=2.5
-RECOMMENDED_NODE_VERSION=18
-
+FABRIC_JAVAENV_VERSION=<%= global.fabricJavaenvVersion %>
+FABRIC_NODEENV_VERSION=<%= global.fabricNodeenvVersion %>
+RECOMMENDED_NODE_VERSION=<%= global.fabricRecommendedNodeVersion %>
 
 ROOT_CA_ADMIN_NAME=admin
 ROOT_CA_ADMIN_PASSWORD=adminpw

diff --git a/src/setup-docker/templates/fabric-docker/commands-generated.sh b/src/setup-docker/templates/fabric-docker/commands-generated.sh
@@ -42,16 +42,14 @@ generateChannelsArtifacts() {
 }
 
 installChannels() {
-  set -x
   <% if (!channels || !channels.length) { -%>
-   
     echo "No channels"
   <% } else if (global.capabilities.isV3) { -%>
     <% channels.forEach((channel) => { -%>
       <% channel.ordererGroup.orderers.forEach((orderer) => { -%>
         <% const org = orgs.find((org) => org.name === orderer.orgName); -%>
-        docker exec -i <%= org.cli.address %> bash -c <% -%>
-          "source scripts/channel_fns.sh; createChannelAndJoinTls '<%= channel.name %>' '<%= orderer.orgMspName %>' '<%= orderer.address %>:<%= orderer.adminPort %>' 'crypto/users/Admin@<%= orderer.domain %>/tls/client.crt' 'crypto/users/Admin@<%= orderer.domain %>/tls/client.key' 'crypto-orderer/tlsca.<%= orderer.domain %>-cert.pem';"
+          docker exec -i <%= org.cli.address %> bash -c <% -%>
+            "source scripts/channel_fns.sh; createChannelAndJoinTls '<%= channel.name %>' '<%= orderer.orgMspName %>' '<%= orderer.address %>:<%= orderer.adminPort %>' 'crypto/users/Admin@<%= orderer.domain %>/tls/client.crt' 'crypto/users/Admin@<%= orderer.domain %>/tls/client.key' 'crypto-orderer/tlsca.<%= orderer.domain %>-cert.pem';"
       <% }) -%>
       <% if (channel.ordererGroup.consensus !== "BFT") { -%>
         sleep 4  # Wait for Raft cluster to establish consensus
@@ -115,12 +113,12 @@ installChaincodes() {
   <% } else { -%>
     <% chaincodes.forEach((chaincode) => { -%>
       if [ -n "$(ls "$CHAINCODES_BASE_DIR/<%= chaincode.directory %>")" ]; then
-          <% if (global.peerDevMode) { -%>
-            <%- include('commands-generated/chaincode-dev-v2.sh', { chaincode }); -%>
-          <% } else { -%>
-            local version="<%= chaincode.version %>"
-            <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); -%>
-          <% } -%>
+        <% if (global.peerDevMode) { -%>
+          <%- include('commands-generated/chaincode-dev-v2.sh', { chaincode }); -%>
+        <% } else { -%>
+          local version="<%= chaincode.version %>"
+          <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); -%>
+        <% } -%>
       else
         echo "Warning! Skipping chaincode '<%= chaincode.name %>' installation. Chaincode directory is empty."
         echo "Looked in dir: '$CHAINCODES_BASE_DIR/<%= chaincode.directory %>'"
@@ -201,22 +199,22 @@ notifyOrgsAboutChannels() {
   printHeadline "Notyfing orgs about channels" "U1F4E2"
   <% channels.forEach((channel) => { -%>
     <% channel.orgs.forEach((org) => { -%>
-     <% if(!global.tls) { -%>
-       notifyOrgAboutNewChannel <% -%>
+      <% if(!global.tls) { -%>
+        notifyOrgAboutNewChannel <% -%>
          "<%= channel.name %>" <% -%>
          "<%= org.mspName %>" <% -%>
          "<%= org.cli.address %>" <% -%>
          "peer0.<%= org.domain %>" <% -%>
          "<%= channel.ordererHead.fullAddress %>"
-     <% } else { -%>
-       notifyOrgAboutNewChannelTls <% -%>
+      <% } else { -%>
+        notifyOrgAboutNewChannelTls <% -%>
          "<%= channel.name %>" <% -%>
          "<%= org.mspName %>" <% -%>
          "<%= org.cli.address %>" <% -%>
          "peer0.<%= org.domain %>" <% -%>
          "<%= channel.ordererHead.fullAddress %>" <% -%>
          "crypto-orderer/tlsca.<%= channel.ordererHead.domain %>-cert.pem"
-     <% } -%>
+      <% } -%>
     <% }) -%>
   <% }) %>
 
@@ -228,7 +226,7 @@ notifyOrgsAboutChannels() {
   <% }) -%>
 
   <% } else { %> 
-  echo ""
+    echo ""
   <% } %>
 
 }

diff --git a/src/setup-docker/templates/fabric-docker/scripts/base-functions-v2.sh b/src/setup-docker/templates/fabric-docker/scripts/base-functions-v2.sh
@@ -96,30 +96,24 @@ createChannelTx() {
 
   docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME
 
-
   docker exec -i $CONTAINER_NAME configtxgen --configPath ./fabric-config -profile "${CONFIG_PROFILE}" -outputCreateChannelTx ./config/channel.tx -channelID "${CHANNEL_NAME}" || removeContainer $CONTAINER_NAME
   docker cp $CONTAINER_NAME:/config/channel.tx "$CHANNEL_TX_PATH" || removeContainer $CONTAINER_NAME
 
-
   removeContainer $CONTAINER_NAME
 }
 
 createNewChannelUpdateTx() {
   local CONTAINER_NAME=createAnchorPeerUpdateTx
-
   local CHANNEL_NAME=$1
   local MSP_NAME=$2
   local CONFIG_PROFILE=$3
   local CONFIG_PATH=$4
   local OUTPUT_PATH=$5
 
-
   ANCHOR_PEER_UPDATE_PATH="$OUTPUT_PATH/${MSP_NAME}anchors-$CHANNEL_NAME.tx"
   OUTPUT_ANCHOR_PEERS_UPDATE_PATH="./config/${MSP_NAME}anchors.tx"
   CONTAINER_COPY_PATH="${CONTAINER_NAME}:/config/${MSP_NAME}anchors.tx"
 
-
-
   echo "Creating new channel config block. Channel: $CHANNEL_NAME for organization $MSP_NAME..."
   inputLog "CHANNEL_NAME: $CHANNEL_NAME"
   inputLog "MSP_NAME: $MSP_NAME"

diff --git a/src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns-v2.sh b/src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns-v2.sh
@@ -4,11 +4,9 @@ set -eu
 
 createChannelAndJoin() {
   local CHANNEL_NAME=$1
-
   local CORE_PEER_LOCALMSPID=$2
   local CORE_PEER_ADDRESS=$3
   local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
-
   local ORDERER_URL=$5
 
   local DIR_NAME=step-createChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -21,7 +19,6 @@ createChannelAndJoin() {
 
   mkdir "$DIR_NAME" && cd "$DIR_NAME"
 
-
   cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx .
   peer channel create -o "${ORDERER_URL}" -c "${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx
   peer channel join -b "${CHANNEL_NAME}".block
@@ -31,7 +28,6 @@ createChannelAndJoin() {
 
 createChannelAndJoinTls() {
   local CHANNEL_NAME=$1
-
   local CORE_PEER_LOCALMSPID=$2
   local CORE_PEER_ADDRESS=$3
   local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
@@ -57,8 +53,6 @@ createChannelAndJoinTls() {
 
   mkdir "$DIR_NAME" && cd "$DIR_NAME"
 
-
-
   cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx .
 
   peer channel create -o "${ORDERER_URL}" -c "${CHANNEL_NAME}" -f ./"$CHANNEL_NAME".tx --tls --cafile "$TLS_CA_CERT_PATH"
@@ -70,11 +64,9 @@ createChannelAndJoinTls() {
 
 fetchChannelAndJoin() {
   local CHANNEL_NAME=$1
-
   local CORE_PEER_LOCALMSPID=$2
   local CORE_PEER_ADDRESS=$3
   local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
-
   local ORDERER_URL=$5
 
   local DIR_NAME=step-fetchChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -95,7 +87,6 @@ fetchChannelAndJoin() {
 
 fetchChannelAndJoinTls() {
   local CHANNEL_NAME=$1
-
   local CORE_PEER_LOCALMSPID=$2
   local CORE_PEER_ADDRESS=$3
   local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")