Merge branch 'release-2.5' into release-2.5-bft

Author: pfi79

Makefile

@@ -47,7 +47,7 @@
 #   - verify - runs unit tests for only the changed package tree
 
 UBUNTU_VER ?= 22.04
-FABRIC_VER ?= 2.5.12
+FABRIC_VER ?= 2.5.13
 
 # 3rd party image version
 # These versions are also set in the runners in ./integration/runners/

docs/source/install.md

@@ -43,7 +43,7 @@ Run the script with the `-h` option to see the options:
 ./install-fabric.sh -h
 Usage: ./install-fabric.sh [-f|--fabric-version <arg>] [-c|--ca-version <arg>] <comp-1> [<comp-2>] ... [<comp-n>] ...
         <comp>: Component to install one or more of  d[ocker]|b[inary]|s[amples]. If none specified, all will be installed
-        -f, --fabric-version: FabricVersion (default: '2.5.12')
+        -f, --fabric-version: FabricVersion (default: '2.5.13')
         -c, --ca-version: Fabric CA Version (default: '1.5.15')
 ```
 
@@ -70,10 +70,10 @@ If no arguments are supplied, then the arguments `docker binary samples` are ass
 
 By default the latest version of the components are used; these can be altered by using the options `--fabric-version` and `-ca-version`.  `-f` and `-c` are the respective short forms.
 
-For example, to download the v2.5.12 binaries, run this command
+For example, to download the v2.5.13 binaries, run this command
 
 ```bash
-./install-fabric.sh --fabric-version 2.5.12 binary
+./install-fabric.sh --fabric-version 2.5.13 binary
 ```
 
 You have completed installing Fabric samples, Docker images, and binaries to your system.

docs/source/whatsnew.rst

@@ -346,6 +346,7 @@ Specifically, take a look at the changes and deprecations.
 * `Fabric v2.5.10 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.5.10>`_.
 * `Fabric v2.5.11 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.5.11>`_.
 * `Fabric v2.5.12 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.5.12>`_.
+* `Fabric v2.5.13 release notes <https://github.com/hyperledger/fabric/releases/tag/v2.5.13>`_.
 
 .. Licensed under Creative Commons Attribution 4.0 International License
    https://creativecommons.org/licenses/by/4.0/

integration/raft/config_test.go

@@ -26,6 +26,7 @@ import (
 	protosorderer "github.com/hyperledger/fabric-protos-go/orderer"
 	"github.com/hyperledger/fabric-protos-go/orderer/etcdraft"
 	"github.com/hyperledger/fabric/common/crypto/tlsgen"
+	"github.com/hyperledger/fabric/integration/channelparticipation"
 	"github.com/hyperledger/fabric/integration/nwo"
 	"github.com/hyperledger/fabric/integration/nwo/commands"
 	"github.com/hyperledger/fabric/integration/ordererclient"
@@ -1237,6 +1238,128 @@ var _ = Describe("EndToEnd reconfiguration and onboarding", func() {
 		})
 	})
 
+	Describe("an all orderer nodes are evicted", func() {
+		BeforeEach(func() {
+			ordererRunners = nil
+			ordererProcesses = nil
+
+			network = nwo.New(nwo.MultiNodeEtcdRaftNoSysChan(), testDir, client, StartPort(), components)
+			network.GenerateConfigTree()
+			network.Bootstrap()
+
+			o1, o2, o3 := network.Orderer("orderer1"), network.Orderer("orderer2"), network.Orderer("orderer3")
+			orderers := []*nwo.Orderer{o1, o2, o3}
+			peer = network.Peer("Org1", "peer0")
+
+			By("Launching the orderers")
+			for _, o := range orderers {
+				runner := network.OrdererRunner(o, "FABRIC_LOGGING_SPEC=orderer.consensus.etcdraft=debug:info")
+				ordererRunners = append(ordererRunners, runner)
+				process := ifrit.Invoke(runner)
+				ordererProcesses = append(ordererProcesses, process)
+			}
+
+			for _, ordererProc := range ordererProcesses {
+				Eventually(ordererProc.Ready(), network.EventuallyTimeout).Should(BeClosed())
+			}
+			channelparticipation.JoinOrderersAppChannelCluster(network, "testchannel", o1, o2, o3)
+		})
+
+		AfterEach(func() {
+			for _, ordererInstance := range ordererProcesses {
+				ordererInstance.Signal(syscall.SIGTERM)
+				Eventually(ordererInstance.Wait(), network.EventuallyTimeout).Should(Receive())
+			}
+		})
+
+		It("remove channel from all orderers and add channel back", func() {
+			o1 := network.Orderer("orderer1")
+			o2 := network.Orderer("orderer2")
+			o3 := network.Orderer("orderer3")
+
+			By("Waiting for them to elect a leader")
+			findLeader(ordererRunners)
+
+			assertBlockReception(map[string]int{
+				"testchannel": 0,
+			}, network.Orderers, peer, network)
+
+			By("Removing channel from all orderers")
+			// TODO the channelparticipation.Remove does not clean up the etcdraft folder. This may prevent the
+			// correct re-creation of the channel on this orderer.
+			// See: https://github.com/hyperledger/fabric/issues/3992
+			for _, o := range network.Orderers {
+				ready := make(chan struct{})
+				go func() {
+					defer GinkgoRecover()
+					channelparticipation.Remove(network, o, "testchannel")
+					close(ready)
+				}()
+				Eventually(ready, network.EventuallyTimeout).Should(BeClosed())
+
+				Eventually(func() int { // Removal is async
+					channelList := channelparticipation.List(network, o)
+					return len(channelList.Channels)
+				}()).Should(BeZero())
+			}
+
+			// TODO It is recommended to remove the etcdraft folder for the WAL to be re-created correctly
+			// See: https://github.com/hyperledger/fabric/issues/3992
+			for _, o := range network.Orderers {
+				err := os.RemoveAll(path.Join(network.OrdererDir(o), "etcdraft", "wal", "testchannel"))
+				Expect(err).NotTo(HaveOccurred())
+				err = os.RemoveAll(path.Join(network.OrdererDir(o), "etcdraft", "snapshot", "testchannel"))
+				Expect(err).NotTo(HaveOccurred())
+			}
+
+			By("Re-create the genesis block")
+			for _, c := range network.Channels {
+				sess, err := network.ConfigTxGen(commands.OutputBlock{
+					ChannelID:   c.Name,
+					Profile:     c.Profile,
+					ConfigPath:  network.RootDir,
+					OutputBlock: network.OutputBlockPath(c.Name),
+				})
+				Expect(err).NotTo(HaveOccurred())
+				Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit(0))
+			}
+
+			By("Re-adding the channel to the orderers")
+			channelparticipation.JoinOrderersAppChannelCluster(network, "testchannel", o1, o2, o3)
+
+			findLeader(ordererRunners)
+
+			assertBlockReception(map[string]int{
+				"testchannel": 0,
+			}, network.Orderers, peer, network)
+
+			expectedInfo := channelparticipation.ListOne(network, o1, "testchannel")
+
+			By("Submitting tx")
+			env := CreateBroadcastEnvelope(network, o2, "testchannel", []byte("foo"))
+			resp, err := ordererclient.Broadcast(network, o2, env)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(resp.Status).To(Equal(common.Status_SUCCESS))
+
+			By("Waiting for the channel to stabilize")
+			expectedInfo.Height++
+			assertCatchup := func(expected channelparticipation.ChannelInfo) bool {
+				current := channelparticipation.ListOne(network, o1, "testchannel")
+				ok := current == expected
+				if !ok {
+					fmt.Fprintf(GinkgoWriter, "Current ChannelInfo: %+v", current)
+				}
+				return ok
+			}
+
+			Eventually(assertCatchup(expectedInfo), network.EventuallyTimeout, 100*time.Millisecond).Should(BeTrue())
+
+			assertBlockReception(map[string]int{
+				"testchannel": 1,
+			}, []*nwo.Orderer{o1, o2, o3}, peer, network)
+		})
+	})
+
 	When("an orderer node is joined", func() {
 		It("isn't influenced by outdated orderers", func() {
 			// This test checks that if a lagged is not aware of newly added nodes,

release_notes/v2.5.13.md

@@ -0,0 +1,97 @@
+v2.5.13 Release Notes - April 29, 2025
+======================================
+
+v2.5.13 updates code dependencies.
+
+Dependencies
+------------
+Fabric v2.5.13 has been tested with the following dependencies:
+* Go 1.24.2
+* CouchDB v3.4.2
+
+Go dependencies have also been updated.
+
+Fabric docker images on Docker Hub and GitHub Container Registry utilize Ubuntu 22.04.
+
+
+Deprecations (existing)
+-----------------------
+
+**Ordering service system channel is deprecated**
+
+v2.3 introduced the ability to manage an ordering service without a system channel.
+Managing an ordering service without a system channel has privacy, scalability,
+and operational benefits. The use of a system channel is deprecated and may be removed in a future release.
+For information about removal of the system channel, see the [Create a channel without system channel documentation](https://hyperledger-fabric.readthedocs.io/en/release-2.3/create_channel/create_channel_participation.html).
+
+**FAB-15754: The 'Solo' consensus type is deprecated.**
+
+The 'Solo' consensus type has always been marked non-production and should be in
+use only in test environments; however, for compatibility it is still available,
+but may be removed entirely in a future release.
+
+**FAB-16408: The 'Kafka' consensus type is deprecated.**
+
+The 'Raft' consensus type was introduced in v1.4.1 and has become the preferred
+production consensus type.  There is a documented and tested migration path from
+Kafka to Raft, and existing users should migrate to the newer Raft consensus type.
+For compatibility with existing deployments, Kafka is still supported,
+but may be removed entirely in a future release.
+Additionally, the fabric-kafka and fabric-zookeeper docker images are no longer updated, maintained, or published.
+
+**Fabric CouchDB image is deprecated**
+
+v2.2.0 added support for CouchDB 3.1.0 as the recommended and tested version of CouchDB.
+If prior versions are utilized, a Warning will appear in the peer log.
+Note that CouchDB 3.1.0 requires that an admin username and password be set,
+while this was optional in CouchDB v2.x. See the
+[Fabric CouchDB documentation](https://hyperledger-fabric.readthedocs.io/en/v2.2.0/couchdb_as_state_database.html#couchdb-configuration)
+for configuration details.
+Also note that CouchDB 3.1.0 default max_document_size is reduced to 8MB. Set a higher value if needed in your environment.
+Finally, the fabric-couchdb docker image will not be updated to v3.1.0 and will no longer be updated, maintained, or published.
+Users can utilize the official CouchDB docker image maintained by the Apache CouchDB project instead.
+
+**FAB-7559: Support for specifying orderer endpoints at the global level in channel configuration is deprecated.**
+
+Utilize the new 'OrdererEndpoints' stanza within the channel configuration of an organization instead.
+Configuring orderer endpoints at the organization level accommodates
+scenarios where orderers are run by different organizations. Using
+this configuration ensures that only the TLS CA certificates of that organization
+are used for orderer communications; in contrast to the global channel level endpoints which
+would cause an aggregation of all orderer TLS CA certificates across
+all orderer organizations to be used for orderer communications.
+
+**FAB-17428: Support for configtxgen flag `--outputAnchorPeersUpdate` is deprecated.**
+
+The `--outputAnchorPeersUpdate` mechanism for updating anchor peers has always had
+limitations (for instance, it only works the first time anchor peers are updated).
+Instead, anchor peer updates should be performed through channel configuration updates.
+
+**FAB-15406: The fabric-tools docker image is deprecated**
+
+The fabric-tools docker image will not be published in future Fabric releases.
+Instead of using the fabric-tools docker image, users should utilize the
+published Fabric binaries. The Fabric binaries can be used to make client calls
+to Fabric runtime components, regardless of where the Fabric components are running.
+
+**FAB-15317: Block dissemination via gossip is deprecated**
+
+Block dissemination via gossip is deprecated and may be removed in a future release.
+Fabric peers can be configured to receive blocks directly from an ordering service
+node, and not gossip blocks, by using the following configuration:
+```
+peer.gossip.orgLeader: true
+peer.gossip.useLeaderElection: false
+peer.gossip.state.enabled: false
+peer.deliveryclient.blockGossipEnabled: false
+```
+
+**FAB-15061: Legacy chaincode lifecycle is deprecated**
+
+The legacy chaincode lifecycle from v1.x is deprecated and will be removed
+in a future release. To prepare for the eventual removal, utilize the v2.x
+chaincode lifecycle instead, by enabling V2_0 application capability on all
+channels, and redeploying all chaincodes using the v2.x lifecycle. The new
+chaincode lifecycle provides a more flexible and robust governance model
+for chaincodes. For more details see the
+[documentation for enabling the new lifecycle](https://hyperledger-fabric.readthedocs.io/en/release-2.2/enable_cc_lifecycle.html).

scripts/bootstrap.sh

@@ -6,7 +6,7 @@
 #
 
 # if version not passed in, default to latest released version
-VERSION=2.5.12
+VERSION=2.5.13
 # if ca version not passed in, default to latest released version
 CA_VERSION=1.5.15
 ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m |sed 's/x86_64/amd64/g')" |sed 's/darwin-arm64/darwin-amd64/g')
@@ -21,8 +21,8 @@ printHelp() {
     echo "-s : bypass fabric-samples repo clone"
     echo "-b : bypass download of platform-specific binaries"
     echo
-    echo "e.g. bootstrap.sh 2.5.12 1.5.15 -s"
-    echo "will download docker images and binaries for Fabric v2.5.12 and Fabric CA v1.5.15"
+    echo "e.g. bootstrap.sh 2.5.13 1.5.15 -s"
+    echo "will download docker images and binaries for Fabric v2.5.13 and Fabric CA v1.5.15"
 }
 
 # dockerPull() pulls docker images from fabric and chaincode repositories

scripts/install-fabric.sh

@@ -21,7 +21,7 @@ _arg_comp=('' )
 
 # if version not passed in, default to latest released version
 # if ca version not passed in, default to latest released version
-_arg_fabric_version="2.5.12"
+_arg_fabric_version="2.5.13"
 _arg_ca_version="1.5.15"
 
 REGISTRY=${FABRIC_DOCKER_REGISTRY:-docker.io/hyperledger}
@@ -50,7 +50,7 @@ print_help()
 {
 	printf 'Usage: %s [-f|--fabric-version <arg>] [-c|--ca-version <arg>] <comp-1> [<comp-2>] ... [<comp-n>] ...\n' "$0"
 	printf '\t%s\n' "<comp> Component to install, one or more of  docker | binary | samples | podman  First letter of component also accepted; If none specified docker | binary | samples is assumed"
-	printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.5.12')"
+	printf '\t%s\n' "-f, --fabric-version: FabricVersion (default: '2.5.13')"
 	printf '\t%s\n' "-c, --ca-version: Fabric CA Version (default: '1.5.15')"
 }