From 8966eaf24a0f03647027dbb9d6539753bb9ec846 Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Wed, 18 Sep 2024 11:51:48 -0400 Subject: [PATCH] Bump fabric to v3.0.0-rc1 Bump fabric to v3.0.0-rc1. Signed-off-by: David Enyeart --- .github/actions/fsat-setup/action.yaml | 4 ++-- .github/actions/test-network-setup/action.yaml | 2 +- .../infrastructure/sample-network/network | 2 +- test-network/compose/docker/peercfg/core.yaml | 8 ++++---- test-network/compose/podman/peercfg/core.yaml | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/actions/fsat-setup/action.yaml b/.github/actions/fsat-setup/action.yaml index aca108e0..f30f1a26 100644 --- a/.github/actions/fsat-setup/action.yaml +++ b/.github/actions/fsat-setup/action.yaml @@ -12,10 +12,10 @@ inputs: default: v0.25.3 fabric-version: description: Version of Hyperledger Fabric - default: '2.5.7' + default: '3.0.0-rc1' ca-version: description: Version of Hyperledger Fabric CA - default: '1.5.10' + default: '1.5.12' runs: using: "composite" diff --git a/.github/actions/test-network-setup/action.yaml b/.github/actions/test-network-setup/action.yaml index f0f17e23..a888a214 100644 --- a/.github/actions/test-network-setup/action.yaml +++ b/.github/actions/test-network-setup/action.yaml @@ -12,7 +12,7 @@ inputs: default: 11.x fabric-version: description: Version of Hyperledger Fabric - default: 2.5.9 + default: 3.0.0-rc1 ca-version: description: Version of Hyperledger Fabric CA default: 1.5.12 diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/network b/full-stack-asset-transfer-guide/infrastructure/sample-network/network index dbeeca88..29dee564 100755 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/network +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/network @@ -33,7 +33,7 @@ function context() { export ${name}="${!override_name:-${default_value}}" } -context FABRIC_VERSION 2.5.9 +context FABRIC_VERSION 3.0.0-rc1 context FABRIC_CA_VERSION 1.5.12 context CLUSTER_RUNTIME kind # or k3s for Rancher diff --git a/test-network/compose/docker/peercfg/core.yaml b/test-network/compose/docker/peercfg/core.yaml index b20e421c..8f0703ed 100644 --- a/test-network/compose/docker/peercfg/core.yaml +++ b/test-network/compose/docker/peercfg/core.yaml @@ -200,7 +200,7 @@ peer: # and the private data residing inside the transient store that is guaranteed not to be purged. # Private data is purged from the transient store when blocks with sequences that are multiples # of transientstoreMaxBlockRetention are committed. - transientstoreMaxBlockRetention: 1000 + transientstoreMaxBlockRetention: 20000 # pushAckTimeout is the maximum time to wait for an acknowledgement from each peer # at private data push at endorsement time. pushAckTimeout: 3s @@ -363,7 +363,7 @@ peer: # via gossip. # Note that 'gossip.state.enabled' controls point to point block replication # of blocks committed in the past. - blockGossipEnabled: true + blockGossipEnabled: false # It sets the total time the delivery service may spend in reconnection # attempts until its retry logic gives up and returns an error reconnectTotalTimeThreshold: 3600s @@ -573,11 +573,11 @@ chaincode: # tools added for java shim layer packaging. # This image is packed with shim layer libraries that are necessary # for Java chaincode runtime. - runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) + runtime: $(DOCKER_NS)/fabric-javaenv:2.5 node: # This is an image based on node:$(NODE_VER)-alpine - runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) + runtime: $(DOCKER_NS)/fabric-nodeenv:2.5 # List of directories to treat as external builders and launchers for # chaincode. The external builder detection processing will iterate over the diff --git a/test-network/compose/podman/peercfg/core.yaml b/test-network/compose/podman/peercfg/core.yaml index b5000333..1365a35d 100644 --- a/test-network/compose/podman/peercfg/core.yaml +++ b/test-network/compose/podman/peercfg/core.yaml @@ -200,7 +200,7 @@ peer: # and the private data residing inside the transient store that is guaranteed not to be purged. # Private data is purged from the transient store when blocks with sequences that are multiples # of transientstoreMaxBlockRetention are committed. - transientstoreMaxBlockRetention: 1000 + transientstoreMaxBlockRetention: 20000 # pushAckTimeout is the maximum time to wait for an acknowledgement from each peer # at private data push at endorsement time. pushAckTimeout: 3s @@ -363,7 +363,7 @@ peer: # via gossip. # Note that 'gossip.state.enabled' controls point to point block replication # of blocks committed in the past. - blockGossipEnabled: true + blockGossipEnabled: false # It sets the total time the delivery service may spend in reconnection # attempts until its retry logic gives up and returns an error reconnectTotalTimeThreshold: 3600s @@ -573,11 +573,11 @@ chaincode: # tools added for java shim layer packaging. # This image is packed with shim layer libraries that are necessary # for Java chaincode runtime. - runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) + runtime: $(DOCKER_NS)/fabric-javaenv:2.5 node: # This is an image based on node:$(NODE_VER)-alpine - runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) + runtime: $(DOCKER_NS)/fabric-nodeenv:2.5 # List of directories to treat as external builders and launchers for # chaincode. The external builder detection processing will iterate over the