dropped consortium according to the version

Signed-off-by: Sanket Teli <[email protected]>
Sanket-0510 · Aug 14, 2024 · adc995e · adc995e
1 parent f34e20e
commit adc995e
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 31 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-1org-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap
@@ -163,7 +163,7 @@ Profiles:
                 - *Orderer
             Capabilities:
                 <<: *OrdererCapabilities
-        Consortiums:
+                Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Orderer
@@ -178,12 +178,12 @@ Profiles:
                 - *Orderer
             Capabilities:
                 <<: *ApplicationCapabilities
-        Consortium: SampleConsortium
+                Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Org1
-        Application:
+                        Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1

diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap
@@ -159,7 +159,7 @@ Profiles:
                 - *Orderer
             Capabilities:
                 <<: *OrdererCapabilities
-        Consortiums:
+                Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Orderer
@@ -174,12 +174,12 @@ Profiles:
                 - *Orderer
             Capabilities:
                 <<: *ApplicationCapabilities
-        Consortium: SampleConsortium
+                Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Org1
-        Application:
+                        Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1

diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap
@@ -210,7 +210,7 @@ Profiles:
                 - *Orderer
             Capabilities:
                 <<: *OrdererCapabilities
-        Consortiums:
+                Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Orderer
@@ -226,13 +226,13 @@ Profiles:
                 - *Orderer
             Capabilities:
                 <<: *ApplicationCapabilities
-        Consortium: SampleConsortium
+                Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Org1
                     - *Org2
-        Application:
+                        Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1

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
@@ -256,7 +256,7 @@ Profiles:
                 - *Orderer1
             Capabilities:
                 <<: *OrdererCapabilities
-        Consortiums:
+                Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Orderer1
@@ -273,7 +273,7 @@ Profiles:
                 - *Orderer2
             Capabilities:
                 <<: *OrdererCapabilities
-        Consortiums:
+                Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Orderer1
@@ -290,13 +290,13 @@ Profiles:
                 - *Orderer1
             Capabilities:
                 <<: *ApplicationCapabilities
-        Consortium: SampleConsortium
+                Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Org1
                     - *Org2
-        Application:
+                        Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1
@@ -311,13 +311,13 @@ Profiles:
                 - *Orderer1
             Capabilities:
                 <<: *ApplicationCapabilities
-        Consortium: SampleConsortium
+                Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Org1
                     - *Org2
-        Application:
+                        Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1
@@ -332,13 +332,13 @@ Profiles:
                 - *Orderer2
             Capabilities:
                 <<: *ApplicationCapabilities
-        Consortium: SampleConsortium
+                Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Org1
                     - *Org2
-        Application:
+                        Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1

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
@@ -263,7 +263,7 @@ Profiles:
                 - *Org3
             Capabilities:
                 <<: *OrdererCapabilities
-        Consortiums:
+                Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Orderer
@@ -283,12 +283,12 @@ Profiles:
                 - *Org3
             Capabilities:
                 <<: *ApplicationCapabilities
-        Consortium: SampleConsortium
+                Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Org1
-        Application:
+                        Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1
@@ -305,12 +305,12 @@ Profiles:
                 - *Org3
             Capabilities:
                 <<: *ApplicationCapabilities
-        Consortium: SampleConsortium
+                Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Org2
-        Application:
+                        Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org2
@@ -327,13 +327,13 @@ Profiles:
                 - *Org3
             Capabilities:
                 <<: *ApplicationCapabilities
-        Consortium: SampleConsortium
+                Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:
                     - *Org1
                     - *Org2
-        Application:
+                        Application:
             <<: *ApplicationDefaults
             Organizations:
                 - *Org1

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
@@ -138,12 +138,14 @@ Profiles:
             <%_ }) _%>
             Capabilities:
                 <<: *OrdererCapabilities
+        <% if (!global.capabilities.isV3) { -%>
         Consortiums:
             SampleConsortium:
                 Organizations:
                 <%_ orgs.forEach(function(org){ _%>
                     - *<%= org.name %>
                 <%_ }) _%>
+        <% } -%>
 
 <%_ }) _%>
 <%_ channels.forEach(function(channel) { _%>
@@ -158,11 +160,16 @@ Profiles:
             <%_ }) _%>
             Capabilities:
                 <<: *ApplicationCapabilities
+        <% if (!global.capabilities.isV3) { -%>
         Consortium: SampleConsortium
         Consortiums:
             SampleConsortium:
                 Organizations:<% channel.orgs.forEach(function(org){ %>
                     - *<%= org.name %><% }) %>
+        <% } -%>
+        <% if (global.capabilities.isV3) { -%>
+        Consortium: SampleConsortium
+        <% } -%>
         Application:
             <<: *ApplicationDefaults
             Organizations:<% channel.orgs.forEach(function(org){ %>

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;