hyperledger-labs · umegbewe · Mar 21, 2025 · Feb 26, 2025 · Feb 28, 2025 · Feb 28, 2025
diff --git a/e2e/__snapshots__/extendConfig.test.ts.snap b/e2e/__snapshots__/extendConfig.test.ts.snap
@@ -9806,14 +9806,14 @@ exports[`extend config samples/fablo-config-hlf3-1orgs-1chaincode.json 1`] = `
       "orderer": "V2_0",
     },
     "engine": "docker",
-    "fabricBaseosVersion": "3.0.0-beta",
+    "fabricBaseosVersion": "3.0.0",
     "fabricCaVersion": "1.5.5",
-    "fabricCcenvVersion": "3.0.0-beta",
+    "fabricCcenvVersion": "3.0.0",
     "fabricJavaenvVersion": "2.5",
     "fabricNodeenvVersion": "2.5",
     "fabricRecommendedNodeVersion": "16",
-    "fabricToolsVersion": "3.0.0-beta",
-    "fabricVersion": "3.0.0-beta",
+    "fabricToolsVersion": "3.0.0",
+    "fabricVersion": "3.0.0",
     "monitoring": {
       "loglevel": "debug",
     },
@@ -10770,7 +10770,7 @@ exports[`extend config samples/fablo-config-hlf3-bft-1orgs-1chaincode.json 1`] =
     "fabricJavaenvVersion": "2.5",
     "fabricNodeenvVersion": "2.5",
     "fabricRecommendedNodeVersion": "16",
-    "fabricToolsVersion": "3.0.0-beta",
+    "fabricToolsVersion": "3.0.0",
     "fabricVersion": "3.0.0-beta",
     "monitoring": {
       "loglevel": "debug",

diff --git a/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap
@@ -43,7 +43,11 @@ Organizations:
       Name: OrdererMSP
       ID: OrdererMSP
       MSPDir: crypto-config/peerOrganizations/orderer.example.com/msp
-
+      OrdererEndpoints:
+          - orderer0.group1.orderer.example.com:7030
+          - orderer1.group1.orderer.example.com:7031
+          - orderer2.group1.orderer.example.com:7032
+          - orderer3.group1.orderer.example.com:7033
       Policies:
           Readers:
               Type: Signature
@@ -64,7 +68,11 @@ Organizations:
       Name: Org1MSP
       ID: Org1MSP
       MSPDir: crypto-config/peerOrganizations/org1.example.com/msp
-
+      OrdererEndpoints:
+          - orderer0.group1.orderer.example.com:7030
+          - orderer1.group1.orderer.example.com:7031
+          - orderer2.group1.orderer.example.com:7032
+          - orderer3.group1.orderer.example.com:7033
       Policies:
           Readers:
               Type: Signature
@@ -115,11 +123,7 @@ Application: &ApplicationDefaults
 ################################################################################
 Orderer: &Group1Defaults
     OrdererType: etcdraft
-    Addresses:
-        - orderer0.group1.orderer.example.com:7030
-        - orderer1.group1.orderer.example.com:7031
-        - orderer2.group1.orderer.example.com:7032
-        - orderer3.group1.orderer.example.com:7033
+
     EtcdRaft:
         Consenters:
             - Host: orderer0.group1.orderer.example.com
@@ -1521,12 +1525,12 @@ CHAINCODES_BASE_DIR=<absolute path>
 COMPOSE_PROJECT_NAME=<name with timestamp>
 LOGGING_LEVEL=debug
 
-FABRIC_VERSION=3.0.0-beta
-FABRIC_TOOLS_VERSION=3.0.0-beta
+FABRIC_VERSION=3.0.0
+FABRIC_TOOLS_VERSION=3.0.0
 FABRIC_CA_VERSION=1.5.5
 FABRIC_CA_POSTGRES_VERSION=14
-FABRIC_CCENV_VERSION=3.0.0-beta
-FABRIC_BASEOS_VERSION=3.0.0-beta
+FABRIC_CCENV_VERSION=3.0.0
+FABRIC_BASEOS_VERSION=3.0.0
 FABRIC_JAVAENV_VERSION=2.5
 FABRIC_NODEENV_VERSION=2.5
 RECOMMENDED_NODE_VERSION=16
@@ -1920,7 +1924,7 @@ services:
 
   cli.orderer.example.com:
     container_name: cli.orderer.example.com
-    image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
+    image: ghcr.io/fablo-io/fabric-tools:\${FABRIC_TOOLS_VERSION}
     tty: true
     environment:
       - GOPATH=/opt/gopath
@@ -2146,7 +2150,7 @@ services:
 
   cli.org1.example.com:
     container_name: cli.org1.example.com
-    image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
+    image: ghcr.io/fablo-io/fabric-tools:\${FABRIC_TOOLS_VERSION}
     tty: true
     environment:
       - GOPATH=/opt/gopath
@@ -2305,7 +2309,7 @@ certsGenerate() {
     exit 1
   fi
 
-  docker run -i -d -w="/" --name $CONTAINER_NAME hyperledger/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
+  docker run -i -d -w="/" --name $CONTAINER_NAME ghcr.io/fablo-io/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
   docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
 
   docker exec -i $CONTAINER_NAME cryptogen generate --config=./fabric-config/"$CRYPTO_CONFIG_FILE_NAME" || removeContainer $CONTAINER_NAME
@@ -2341,7 +2345,7 @@ genesisBlockCreate() {
     exit 1
   fi
 
-  docker run -i -d -w="/" --name $CONTAINER_NAME hyperledger/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
+  docker run -i -d -w="/" --name $CONTAINER_NAME ghcr.io/fablo-io/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
   docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
 
   docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME
@@ -2378,7 +2382,7 @@ createChannelTx() {
     --name $CONTAINER_NAME \\
     -v "$CONFIG_PATH":/fabric-config \\
     -v "$OUTPUT_PATH":/output \\
-    hyperledger/fabric-tools:"\${FABRIC_TOOLS_VERSION}" \\
+    ghcr.io/fablo-io/fabric-tools:"\${FABRIC_TOOLS_VERSION}" \\
     bash -c "mkdir -p /output && configtxgen --configPath /fabric-config -profile \${CONFIG_PROFILE} -outputBlock /output/$CHANNEL_NAME.pb -channelID \${CHANNEL_NAME}"
 
   # shellcheck disable=SC2181
@@ -2417,7 +2421,7 @@ createNewChannelUpdateTx() {
     exit 1
   fi
 
-  docker run -i -d -w="/" --name $CONTAINER_NAME hyperledger/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
+  docker run -i -d -w="/" --name $CONTAINER_NAME ghcr.io/fablo-io/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
   docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
 
   docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME

diff --git a/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap
@@ -43,7 +43,11 @@ Organizations:
       Name: OrdererMSP
       ID: OrdererMSP
       MSPDir: crypto-config/peerOrganizations/orderer.example.com/msp
-
+      OrdererEndpoints:
+          - orderer0.group1.orderer.example.com:7030
+          - orderer1.group1.orderer.example.com:7031
+          - orderer2.group1.orderer.example.com:7032
+          - orderer3.group1.orderer.example.com:7033
       Policies:
           Readers:
               Type: Signature
@@ -64,7 +68,11 @@ Organizations:
       Name: Org1MSP
       ID: Org1MSP
       MSPDir: crypto-config/peerOrganizations/org1.example.com/msp
-
+      OrdererEndpoints:
+          - orderer0.group1.orderer.example.com:7030
+          - orderer1.group1.orderer.example.com:7031
+          - orderer2.group1.orderer.example.com:7032
+          - orderer3.group1.orderer.example.com:7033
       Policies:
           Readers:
               Type: Signature
@@ -115,11 +123,6 @@ Application: &ApplicationDefaults
 ################################################################################
 Orderer: &Group1Defaults
     OrdererType: BFT
-    Addresses:
-        - orderer0.group1.orderer.example.com:7030
-        - orderer1.group1.orderer.example.com:7031
-        - orderer2.group1.orderer.example.com:7032
-        - orderer3.group1.orderer.example.com:7033
 
     SmartBFT:
         RequestBatchMaxCount: 100
@@ -1548,7 +1551,7 @@ COMPOSE_PROJECT_NAME=<name with timestamp>
 LOGGING_LEVEL=debug
 
 FABRIC_VERSION=3.0.0-beta
-FABRIC_TOOLS_VERSION=3.0.0-beta
+FABRIC_TOOLS_VERSION=3.0.0
 FABRIC_CA_VERSION=1.5.5
 FABRIC_CA_POSTGRES_VERSION=14
 FABRIC_CCENV_VERSION=3.0.0-beta
@@ -1945,7 +1948,7 @@ services:
 
   cli.orderer.example.com:
     container_name: cli.orderer.example.com
-    image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
+    image: ghcr.io/fablo-io/fabric-tools:\${FABRIC_TOOLS_VERSION}
     tty: true
     environment:
       - GOPATH=/opt/gopath
@@ -2171,7 +2174,7 @@ services:
 
   cli.org1.example.com:
     container_name: cli.org1.example.com
-    image: hyperledger/fabric-tools:\${FABRIC_TOOLS_VERSION}
+    image: ghcr.io/fablo-io/fabric-tools:\${FABRIC_TOOLS_VERSION}
     tty: true
     environment:
       - GOPATH=/opt/gopath
@@ -2330,7 +2333,7 @@ certsGenerate() {
     exit 1
   fi
 
-  docker run -i -d -w="/" --name $CONTAINER_NAME hyperledger/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
+  docker run -i -d -w="/" --name $CONTAINER_NAME ghcr.io/fablo-io/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
   docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
 
   docker exec -i $CONTAINER_NAME cryptogen generate --config=./fabric-config/"$CRYPTO_CONFIG_FILE_NAME" || removeContainer $CONTAINER_NAME
@@ -2366,7 +2369,7 @@ genesisBlockCreate() {
     exit 1
   fi
 
-  docker run -i -d -w="/" --name $CONTAINER_NAME hyperledger/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
+  docker run -i -d -w="/" --name $CONTAINER_NAME ghcr.io/fablo-io/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
   docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
 
   docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME
@@ -2403,7 +2406,7 @@ createChannelTx() {
     --name $CONTAINER_NAME \\
     -v "$CONFIG_PATH":/fabric-config \\
     -v "$OUTPUT_PATH":/output \\
-    hyperledger/fabric-tools:"\${FABRIC_TOOLS_VERSION}" \\
+    ghcr.io/fablo-io/fabric-tools:"\${FABRIC_TOOLS_VERSION}" \\
     bash -c "mkdir -p /output && configtxgen --configPath /fabric-config -profile \${CONFIG_PROFILE} -outputBlock /output/$CHANNEL_NAME.pb -channelID \${CHANNEL_NAME}"
 
   # shellcheck disable=SC2181
@@ -2442,7 +2445,7 @@ createNewChannelUpdateTx() {
     exit 1
   fi
 
-  docker run -i -d -w="/" --name $CONTAINER_NAME hyperledger/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
+  docker run -i -d -w="/" --name $CONTAINER_NAME ghcr.io/fablo-io/fabric-tools:"\${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
   docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
 
   docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME

diff --git a/fablo-build.sh b/fablo-build.sh
@@ -46,4 +46,4 @@ else
     --tag "$IMAGE_BASE_NAME" "$FABLO_HOME"
 
   docker tag "$IMAGE_BASE_NAME" "ghcr.io/fablo-io/fablo:$FABLO_VERSION"
-fi
+fi
diff --git a/samples/fablo-config-hlf3-1orgs-1chaincode.json b/samples/fablo-config-hlf3-1orgs-1chaincode.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://github.com/hyperledger-labs/fablo/releases/download/2.1.0/schema.json",
     "global": {
-      "fabricVersion": "3.0.0-beta",
+      "fabricVersion": "3.0.0",
       "tls": true,
       "monitoring": {
         "loglevel": "debug"

diff --git a/src/extend-config/extendGlobal.ts b/src/extend-config/extendGlobal.ts
@@ -24,11 +24,11 @@ const getVersions = (fabricVersion: string): FabricVersions => {
 
   const below3_0_0 = (v: string) => (v.startsWith("3.") ? "2.5" : v);
 
-  const beta3_0_0 = (v: string) => (v.startsWith("3.0.") ? "3.0.0-beta" : v);
+  const is_or_above3_0_0 = (v: string) => (v.startsWith("3.") ? "3.0.0" : v);
 
   return {
     fabricVersion,
-    fabricToolsVersion: beta3_0_0(fabricVersion),
+    fabricToolsVersion: is_or_above3_0_0(fabricVersion),
     fabricCaVersion: version(fabricVersion).isGreaterOrEqual("1.4.10") ? "1.5.5" : fabricVersion,
     fabricCcenvVersion: fabricVersion,
     fabricBaseosVersion: version(fabricVersion).isGreaterOrEqual("2.0") ? fabricVersion : "0.4.9",

diff --git a/src/setup-docker/templates/fabric-config/configtx.yaml b/src/setup-docker/templates/fabric-config/configtx.yaml
@@ -35,6 +35,10 @@ Organizations:
       Name: <%= org.mspName %>
       ID: <%= org.mspName %>
       MSPDir: crypto-config/peerOrganizations/<%= org.domain %>/msp
+      <%_ if (global.capabilities.isV3) { _%>
+      OrdererEndpoints:<% ordererGroups[0].orderers.forEach(function(orderer) { %>
+          - <%= orderer.fullAddress %><% }) -%>
+      <%_ } _%>
 
       Policies:
           Readers:
@@ -89,8 +93,10 @@ Application: &ApplicationDefaults
 <%_ ordererGroups.forEach(function(ordererGroup) { _%>
 Orderer: &<%= ordererGroup.configtxOrdererDefaults %>
     OrdererType: <%= ordererGroup.consensus %>
+    <%_ if (!global.capabilities.isV3) { _%>
     Addresses:<% ordererGroup.orderers.forEach(function(orderer) { %>
         - <%= orderer.fullAddress %><% })-%>
+    <%_ } _%>
 <%- include('configtx-raft-template.yaml.ejs', {ordererGroup: ordererGroup}); %>
     BatchTimeout: 2s
     BatchSize:

diff --git a/src/setup-docker/templates/fabric-docker/docker-compose.yaml b/src/setup-docker/templates/fabric-docker/docker-compose.yaml
@@ -56,7 +56,11 @@ services:
 
   <%= org.cli.address %>:
     container_name: <%= org.cli.address %>
+    <%_ if(global.capabilities.isV3) { _%>
+    image: ghcr.io/fablo-io/fabric-tools:${FABRIC_TOOLS_VERSION}
+    <%_ } else { _%>
     image: hyperledger/fabric-tools:${FABRIC_TOOLS_VERSION}
+    <%_ } _%>
     tty: true
     environment:
       - GOPATH=/opt/gopath

diff --git a/src/setup-docker/templates/fabric-docker/scripts/base-functions-v3.sh b/src/setup-docker/templates/fabric-docker/scripts/base-functions-v3.sh
@@ -22,7 +22,7 @@ certsGenerate() {
     exit 1
   fi
 
-  docker run -i -d -w="/" --name $CONTAINER_NAME hyperledger/fabric-tools:"${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
+  docker run -i -d -w="/" --name $CONTAINER_NAME ghcr.io/fablo-io/fabric-tools:"${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
   docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
 
   docker exec -i $CONTAINER_NAME cryptogen generate --config=./fabric-config/"$CRYPTO_CONFIG_FILE_NAME" || removeContainer $CONTAINER_NAME
@@ -58,7 +58,7 @@ genesisBlockCreate() {
     exit 1
   fi
 
-  docker run -i -d -w="/" --name $CONTAINER_NAME hyperledger/fabric-tools:"${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
+  docker run -i -d -w="/" --name $CONTAINER_NAME ghcr.io/fablo-io/fabric-tools:"${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
   docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
 
   docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME
@@ -95,7 +95,7 @@ createChannelTx() {
     --name $CONTAINER_NAME \
     -v "$CONFIG_PATH":/fabric-config \
     -v "$OUTPUT_PATH":/output \
-    hyperledger/fabric-tools:"${FABRIC_TOOLS_VERSION}" \
+    ghcr.io/fablo-io/fabric-tools:"${FABRIC_TOOLS_VERSION}" \
     bash -c "mkdir -p /output && configtxgen --configPath /fabric-config -profile ${CONFIG_PROFILE} -outputBlock /output/$CHANNEL_NAME.pb -channelID ${CHANNEL_NAME}"
 
   # shellcheck disable=SC2181
@@ -136,7 +136,7 @@ createNewChannelUpdateTx() {
     exit 1
   fi
 
-  docker run -i -d -w="/" --name $CONTAINER_NAME hyperledger/fabric-tools:"${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
+  docker run -i -d -w="/" --name $CONTAINER_NAME ghcr.io/fablo-io/fabric-tools:"${FABRIC_TOOLS_VERSION}" bash || removeContainer $CONTAINER_NAME
   docker cp "$CONFIG_PATH" $CONTAINER_NAME:/fabric-config || removeContainer $CONTAINER_NAME
 
   docker exec -i $CONTAINER_NAME mkdir /config || removeContainer $CONTAINER_NAME

diff --git a/src/validate/index.ts b/src/validate/index.ts
@@ -98,7 +98,7 @@ class ValidateGenerator extends Generator {
 
     // === Validate Orderers =============
     this._validateIfOrdererDefinitionExists(networkConfig.orgs);
-    networkConfig.orgs.forEach((org) => this._validateOrdererCountForSoloType(org.orderers));
+    networkConfig.orgs.forEach((org) => this._validateOrdererCountForSoloType(org.orderers, networkConfig.global));
     networkConfig.orgs.forEach((org) => this._validateOrdererForRaftType(org.orderers, networkConfig.global));
     networkConfig.orgs.forEach((org) => this._validateOrdererCountForOrg(org));
     networkConfig.orgs.forEach((org) => this._validateOrdererGroupNameUniqueForOrg(org));
@@ -124,16 +124,7 @@ class ValidateGenerator extends Generator {
   }
 
   private _validateFabricVersion(global: GlobalJson) {
-    // 1. we support fabric up to 3.0.0-beta
-    if (version(global.fabricVersion).isGreaterOrEqual("3.0.0") && global.fabricVersion !== "3.0.0-beta") {
-      const objectToEmit = {
-        category: validationCategories.CRITICAL,
-        message: `Fabric ${global.fabricVersion} is not supported. Fablo supports only Fabric up to 3.0.0-beta.`,
-      };
-      this.emit(validationErrorType.CRITICAL, objectToEmit);
-    }
-
-    // 2. we support Fabric starting from 2.0.0
+    // we support Fabric starting from 2.0.0
     if (!version(global.fabricVersion).isGreaterOrEqual("2.0.0")) {
       const objectToEmit = {
         category: validationCategories.CRITICAL,
@@ -246,15 +237,25 @@ class ValidateGenerator extends Generator {
     }
   }
 
-  _validateOrdererCountForSoloType(orderers: OrdererJson[] | undefined) {
+  _validateOrdererCountForSoloType(orderers: OrdererJson[] | undefined, global: GlobalJson) {
     if (orderers !== undefined) {
       orderers.forEach((orderer) => {
-        if (orderer.type === "solo" && orderer.instances > 1) {
-          const objectToEmit = {
-            category: validationCategories.ORDERER,
-            message: `Orderer consesus type is set to 'solo', but number of instances is ${orderer.instances}. Only 1 instance will be created.`,
-          };
-          this.emit(validationErrorType.WARN, objectToEmit);
+        if (orderer.type === "solo") {
+          if (version(global.fabricVersion).isGreaterOrEqual("3.0.0")) {
+            const objectToEmit = {
+              category: validationCategories.ORDERER,
+              message: `Solo consensus type is not supported in Fabric version ${global.fabricVersion}. Please use 'raft' or 'bft' instead.`,
+            };
+            this.emit(validationErrorType.ERROR, objectToEmit);
+          }
+
+          if (orderer.instances > 1) {
+            const objectToEmit = {
+              category: validationCategories.ORDERER,
+              message: `Orderer consesus type is set to 'solo', but number of instances is ${orderer.instances}. Only 1 instance will be created.`,
+            };
+            this.emit(validationErrorType.WARN, objectToEmit);
+          }
         }
       });
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,4 +46,4 @@ else @@
         --tag "$IMAGE_BASE_NAME" "$FABLO_HOME"
       docker tag "$IMAGE_BASE_NAME" "ghcr.io/fablo-io/fablo:$FABLO_VERSION"
-    fi
+    fi