Merge pull request #473 from Sanket-0510/consortium_update

dropped consortium according to the version
hyperledger-labs · Aug 14, 2024 · 740a894 · 740a894
2 parents f34e20e + 3d22207
commit 740a894
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 27 deletions.
diff --git a/e2e/__snapshots__/extendConfig.test.ts.snap b/e2e/__snapshots__/extendConfig.test.ts.snap
@@ -576,6 +576,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
       "application": "V2_5",
       "channel": "V2_0",
       "isV2": true,
+      "isV3": false,
       "orderer": "V2_0",
     },
     "engine": "docker",
@@ -1386,6 +1387,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] =
       "application": "V2_0",
       "channel": "V2_0",
       "isV2": true,
+      "isV3": false,
       "orderer": "V2_0",
     },
     "engine": "kubernetes",
@@ -2171,6 +2173,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-raft-explorer.j
       "application": "V2_0",
       "channel": "V2_0",
       "isV2": true,
+      "isV3": false,
       "orderer": "V2_0",
     },
     "engine": "docker",
@@ -3521,6 +3524,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.
       "application": "V2_0",
       "channel": "V2_0",
       "isV2": true,
+      "isV3": false,
       "orderer": "V2_0",
     },
     "engine": "docker",
@@ -5744,6 +5748,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml 1`]
       "application": "V2_0",
       "channel": "V2_0",
       "isV2": true,
+      "isV3": false,
       "orderer": "V2_0",
     },
     "engine": "docker",
@@ -8230,6 +8235,7 @@ exports[`extend config samples/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.
       "application": "V2_0",
       "channel": "V2_0",
       "isV2": true,
+      "isV3": false,
       "orderer": "V2_0",
     },
     "engine": "docker",

diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
@@ -263,7 +263,6 @@ Profiles:
                     - *Orderer2
                     - *Org1
                     - *Org2
-
     # Profile used to create Genesis block for group group2 #
     Group2Genesis:
         <<: *ChannelDefaults
@@ -301,7 +300,6 @@ Profiles:
             Organizations:
                 - *Org1
                 - *Org2
-
     # Profile used to create channeltx for my-channel2 #
     MyChannel2:
         <<: *ChannelDefaults
@@ -322,7 +320,6 @@ Profiles:
             Organizations:
                 - *Org1
                 - *Org2
-
     # Profile used to create channeltx for my-channel3 #
     MyChannel3:
         <<: *ChannelDefaults

diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap
@@ -292,7 +292,6 @@ Profiles:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1
-
     # Profile used to create channeltx for my-channel2 #
     MyChannel2:
         <<: *ChannelDefaults
@@ -314,7 +313,6 @@ Profiles:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org2
-
     # Profile used to create channeltx for my-channel3 #
     MyChannel3:
         <<: *ChannelDefaults

diff --git a/e2e/__snapshots__/fabloCommands.test.ts.snap b/e2e/__snapshots__/fabloCommands.test.ts.snap
@@ -26,7 +26,8 @@ Validation warnings count: 0
       "channel": "V2_0",
       "orderer": "V2_0",
       "application": "V2_0",
-      "isV2": true
+      "isV2": true,
+      "isV3": false
     },
     "tools": {}
   },
@@ -2448,7 +2449,8 @@ Validation warnings count: 0
       "channel": "V2_0",
       "orderer": "V2_0",
       "application": "V2_5",
-      "isV2": true
+      "isV2": true,
+      "isV3": false
     },
     "tools": {}
   },

diff --git a/src/extend-config/extendGlobal.ts b/src/extend-config/extendGlobal.ts
@@ -6,10 +6,13 @@ import defaults from "./defaults";
 
 const getNetworkCapabilities = (fabricVersion: string): Capabilities => {
 
-  if (version(fabricVersion).isGreaterOrEqual("2.5.0"))
-    return { channel: "V2_0", orderer: "V2_0", application: "V2_5", isV2: true };
+  if (version(fabricVersion).isGreaterOrEqual("2.5.0") && !version(fabricVersion).isGreaterOrEqual("3.0.0"))
+    return { channel: "V2_0", orderer: "V2_0", application: "V2_5", isV2: true, isV3: false };
 
-  return { channel: "V2_0", orderer: "V2_0", application: "V2_0", isV2: true };
+  if (version(fabricVersion).isGreaterOrEqual("3.0.0"))
+    return { channel: "V3_0", orderer: "V2_0", application: "V2_5", isV2: false, isV3: true};
+
+  return { channel: "V2_0", orderer: "V2_0", application: "V2_0", isV2: true , isV3: false};
 };
 
 const getVersions = (fabricVersion: string): FabricVersions => {

diff --git a/src/setup-docker/templates/fabric-config/configtx.yaml b/src/setup-docker/templates/fabric-config/configtx.yaml
@@ -126,46 +126,51 @@ Orderer: &<%= ordererGroup.configtxOrdererDefaults %>
 # https://github:com/hyperledger/fabric/blob/master/sampleconfig/configtx.yaml
 
 Profiles:
-<%_ ordererGroups.forEach(function(ordererGroup) { _%>
+  <%_ ordererGroups.forEach(function(ordererGroup) { _%>
     # Profile used to create Genesis block for group <%= ordererGroup.name %> #
     <%= ordererGroup.profileName %>:
         <<: *ChannelDefaults
         Orderer:
             <<: *<%= ordererGroup.configtxOrdererDefaults %>
             Organizations:
-            <%_ ordererGroup.hostingOrgs.forEach(function(hostingOrg) { _%>
+              <%_ ordererGroup.hostingOrgs.forEach(function(hostingOrg) { _%>
                 - *<%= hostingOrg %>
-            <%_ }) _%>
+              <%_ }) _%>
             Capabilities:
                 <<: *OrdererCapabilities
+        <%_ if (!global.capabilities.isV3) { _%>
         Consortiums:
             SampleConsortium:
                 Organizations:
-                <%_ orgs.forEach(function(org){ _%>
+                  <%_ orgs.forEach(function(org){ _%>
                     - *<%= org.name %>
-                <%_ }) _%>
+                  <%_ }) _%>
+        <%_ } _%>
+  <%_ }) _%>
 
-<%_ }) _%>
-<%_ channels.forEach(function(channel) { _%>
+  <%_ channels.forEach(function(channel) { _%>
     # Profile used to create channeltx for <%= channel.name %> #
     <%= channel.profileName %>:
         <<: *ChannelDefaults
         Orderer:
             <<: *<%= channel.ordererGroup.configtxOrdererDefaults %>
             Organizations:
-            <%_ channel.ordererGroup.hostingOrgs.forEach(function(hostingOrg) { _%>
+              <%_ channel.ordererGroup.hostingOrgs.forEach(function(hostingOrg) { _%>
                 - *<%= hostingOrg %>
-            <%_ }) _%>
+              <%_ }) _%>
             Capabilities:
                 <<: *ApplicationCapabilities
         Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
-                Organizations:<% channel.orgs.forEach(function(org){ %>
-                    - *<%= org.name %><% }) %>
+                Organizations:
+                  <%_ channel.orgs.forEach(function(org){ _%>
+                    - *<%= org.name %>
+                  <%_ }) _%>
         Application:
             <<: *ApplicationDefaults
-            Organizations:<% channel.orgs.forEach(function(org){ %>
-                - *<%= org.name %><% }) %>
-
-<%_ }) _%>
+            Organizations:
+              <%_ channel.orgs.forEach(function(org){ _%>
+                - *<%= org.name %>
+              <%_ }) _%>
+  <%_ }) _%>
diff --git a/src/setup-docker/templates/fabric-docker/commands-generated.sh b/src/setup-docker/templates/fabric-docker/commands-generated.sh
@@ -143,7 +143,7 @@ upgradeChaincode() {
         <% if (global.capabilities.isV2) { -%>
           <%- include('commands-generated/chaincode-install-v2.sh', { chaincode, global }); %>
         <% } else { -%>
-          <%- include('commands-generated/chaincode-upgrade-v1.4.sh', { chaincode, global }); %>
+          <%- include('commands-generated/chaincode-upgrade-v2.sh', { chaincode, global }); %>
         <% } -%>
       else
         echo "Warning! Skipping chaincode '<%= chaincode.name %>' upgrade. Chaincode directory is empty."

diff --git a/src/types/FabloConfigExtended.ts b/src/types/FabloConfigExtended.ts
@@ -13,6 +13,7 @@ interface CapabilitiesV2 {
   channel: "V2_0";
   orderer: "V2_0";
   isV2: true;
+  isV3: false;
 }
 
 
@@ -21,11 +22,19 @@ interface CapabilitiesV_2_5 {
   channel: "V2_0";
   orderer: "V2_0";
   isV2: true;
+  isV3: false;
 }
 
+interface CapabilitiesV3_0 {
+  application: "V2_5";
+  channel: "V3_0";
+  orderer: "V2_0";
+  isV2: false;
+  isV3: true;
+}
 
 
-export type Capabilities = CapabilitiesV2 | CapabilitiesV_2_5;
+export type Capabilities = CapabilitiesV2 | CapabilitiesV_2_5 | CapabilitiesV3_0;
 
 export interface Global extends FabricVersions {
   tls: boolean;