Merge pull request #470 from Sanket-0510/fab-v2-5

Update Fabric version in the initial configuration
hyperledger-labs · Aug 12, 2024 · f34e20e · f34e20e
2 parents d22fa6e + 81a453e
commit f34e20e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/e2e/__snapshots__/extendConfig.test.ts.snap b/e2e/__snapshots__/extendConfig.test.ts.snap
@@ -573,19 +573,19 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
   ],
   "global": {
     "capabilities": {
-      "application": "V2_0",
+      "application": "V2_5",
       "channel": "V2_0",
       "isV2": true,
       "orderer": "V2_0",
     },
     "engine": "docker",
-    "fabricBaseosVersion": "2.4.7",
+    "fabricBaseosVersion": "2.5.9",
     "fabricCaVersion": "1.5.5",
-    "fabricCcenvVersion": "2.4.7",
-    "fabricJavaenvVersion": "2.4",
-    "fabricNodeenvVersion": "2.4",
+    "fabricCcenvVersion": "2.5.9",
+    "fabricJavaenvVersion": "2.5",
+    "fabricNodeenvVersion": "2.5",
     "fabricRecommendedNodeVersion": "16",
-    "fabricVersion": "2.4.7",
+    "fabricVersion": "2.5.9",
     "monitoring": {
       "loglevel": "info",
     },

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
@@ -16,7 +16,7 @@ Capabilities:
     Orderer: &OrdererCapabilities
         V2_0: true
     Application: &ApplicationCapabilities
-        V2_0: true
+        V2_5: true
 
 ################################################################################
 #   CHANNEL Defaults
@@ -1448,13 +1448,13 @@ CHAINCODES_BASE_DIR=<absolute path>
 COMPOSE_PROJECT_NAME=<name with timestamp>
 LOGGING_LEVEL=info
 
-FABRIC_VERSION=2.4.7
+FABRIC_VERSION=2.5.9
 FABRIC_CA_VERSION=1.5.5
 FABRIC_CA_POSTGRES_VERSION=14
-FABRIC_CCENV_VERSION=2.4.7
-FABRIC_BASEOS_VERSION=2.4.7
-FABRIC_JAVAENV_VERSION=2.4
-FABRIC_NODEENV_VERSION=2.4
+FABRIC_CCENV_VERSION=2.5.9
+FABRIC_BASEOS_VERSION=2.5.9
+FABRIC_JAVAENV_VERSION=2.5
+FABRIC_NODEENV_VERSION=2.5
 RECOMMENDED_NODE_VERSION=16
 
 ROOT_CA_ADMIN_NAME=admin

diff --git a/e2e/__snapshots__/fabloCommands.test.ts.snap b/e2e/__snapshots__/fabloCommands.test.ts.snap
@@ -2427,15 +2427,15 @@ Validation warnings count: 0
 ===========================================================
 {
   "global": {
-    "fabricVersion": "2.4.7",
+    "fabricVersion": "2.5.9",
     "tls": false,
     "engine": "docker",
     "peerDevMode": false,
     "fabricCaVersion": "1.5.5",
-    "fabricCcenvVersion": "2.4.7",
-    "fabricBaseosVersion": "2.4.7",
-    "fabricJavaenvVersion": "2.4",
-    "fabricNodeenvVersion": "2.4",
+    "fabricCcenvVersion": "2.5.9",
+    "fabricBaseosVersion": "2.5.9",
+    "fabricJavaenvVersion": "2.5",
+    "fabricNodeenvVersion": "2.5",
     "fabricRecommendedNodeVersion": "16",
     "paths": {
       "fabloConfig": "<absolute path>",
@@ -2447,7 +2447,7 @@ Validation warnings count: 0
     "capabilities": {
       "channel": "V2_0",
       "orderer": "V2_0",
-      "application": "V2_0",
+      "application": "V2_5",
       "isV2": true
     },
     "tools": {}
@@ -2909,7 +2909,7 @@ exports[`init should init simple fablo config 1`] = `
 "{
   "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
   "global": {
-    "fabricVersion": "2.4.7",
+    "fabricVersion": "2.5.9",
     "tls": false,
     "engine": "docker",
     "peerDevMode": false
@@ -2963,7 +2963,7 @@ exports[`init should init simple fablo config with node chaincode 1`] = `
 "{
   "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
   "global": {
-    "fabricVersion": "2.4.7",
+    "fabricVersion": "2.5.9",
     "tls": false,
     "engine": "docker",
     "peerDevMode": false
@@ -3025,7 +3025,7 @@ exports[`init should init simple fablo config with node chaincode and rest api 1
 "{
   "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
   "global": {
-    "fabricVersion": "2.4.7",
+    "fabricVersion": "2.5.9",
     "tls": false,
     "engine": "docker",
     "peerDevMode": false

diff --git a/samples/fablo-config-hlf2-1org-1chaincode.json b/samples/fablo-config-hlf2-1org-1chaincode.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.2.1-unstable.0/schema.json",
   "global": {
-    "fabricVersion": "2.4.7",
+    "fabricVersion": "2.5.9",
     "tls": false
   },
   "orgs": [

diff --git a/src/extend-config/extendGlobal.ts b/src/extend-config/extendGlobal.ts
@@ -7,7 +7,7 @@ import defaults from "./defaults";
 const getNetworkCapabilities = (fabricVersion: string): Capabilities => {
 
   if (version(fabricVersion).isGreaterOrEqual("2.5.0"))
-    return { channel: "V2_5", orderer: "V2_5", application: "V2_5", isV2: true };
+    return { channel: "V2_0", orderer: "V2_0", application: "V2_5", isV2: true };
 
   return { channel: "V2_0", orderer: "V2_0", application: "V2_0", isV2: true };
 };

diff --git a/src/types/FabloConfigExtended.ts b/src/types/FabloConfigExtended.ts
@@ -18,8 +18,8 @@ interface CapabilitiesV2 {
 
 interface CapabilitiesV_2_5 {
   application: "V2_5";
-  channel: "V2_5";
-  orderer: "V2_5";
+  channel: "V2_0";
+  orderer: "V2_0";
   isV2: true;
 }