From bb1d407a9bc581d94004548aff9a34cdd78a23dc Mon Sep 17 00:00:00 2001
From: Sanket Teli <telisanket2002@gmail.com>
Date: Fri, 25 Oct 2024 21:45:28 +0530
Subject: [PATCH] updated some conditions

Signed-off-by: Sanket Teli <telisanket2002@gmail.com>
---
 e2e-network/docker/test-05.sh                               | 0
 .../templates/fabric-docker/commands-generated.sh           | 6 +-----
 .../templates/fabric-docker/docker-compose.yaml             | 1 +
 .../templates/fabric-docker/scripts/cli/channel_fns.sh      | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 e2e-network/docker/test-05.sh

diff --git a/e2e-network/docker/test-05.sh b/e2e-network/docker/test-05.sh
old mode 100644
new mode 100755
diff --git a/src/setup-docker/templates/fabric-docker/commands-generated.sh b/src/setup-docker/templates/fabric-docker/commands-generated.sh
index f311f10e..322445e6 100644
--- a/src/setup-docker/templates/fabric-docker/commands-generated.sh
+++ b/src/setup-docker/templates/fabric-docker/commands-generated.sh
@@ -155,11 +155,7 @@ upgradeChaincode() {
   <% chaincodes.forEach((chaincode) => { -%>
     if [ "$chaincodeName" = "<%= chaincode.name %>" ]; then
       if [ -n "$(ls "$CHAINCODES_BASE_DIR/<%= chaincode.directory %>")" ]; then
-        <% if (global.capabilities.isV2) { -%>
-          <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); %>
-        <% } else { -%>
-          <%- include('commands-generated/chaincode-upgrade-v2.sh', { chaincode, global }); %>
-        <% } -%>
+        <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); %>
       else
         echo "Warning! Skipping chaincode '<%= chaincode.name %>' upgrade. Chaincode directory is empty."
         echo "Looked in dir: '$CHAINCODES_BASE_DIR/<%= chaincode.directory %>'"
diff --git a/src/setup-docker/templates/fabric-docker/docker-compose.yaml b/src/setup-docker/templates/fabric-docker/docker-compose.yaml
index 2ec40b3d..d5fbb033 100755
--- a/src/setup-docker/templates/fabric-docker/docker-compose.yaml
+++ b/src/setup-docker/templates/fabric-docker/docker-compose.yaml
@@ -209,6 +209,7 @@ services:
       - ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE=/var/hyperledger/orderer/tls/server.crt
       - ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY=/var/hyperledger/orderer/tls/server.key
       - ORDERER_GENERAL_CLUSTER_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]
+      - ORDERER_ADMIN_LISTENADDRESS=<%= orderer.address %>:7053
       <%_ } _%>
     working_dir: /var/hyperledger/orderer
     command: orderer
diff --git a/src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns.sh b/src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns.sh
index a9ddfa31..374f3125 100755
--- a/src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns.sh
+++ b/src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns.sh
@@ -22,8 +22,7 @@ createChannelAndJoin() {
   mkdir "$DIR_NAME" && cd "$DIR_NAME"
 
   <% if(global.capabilities.isV3) { %>
-  cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx .
-  }
+  cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb .
   <% } else { %>
   cp /var/hyperledger/cli/config/"$CHANNEL_NAME".tx .
   <% } %>