From 455d434189f7e4c19d1bba459a4d37f2471762f2 Mon Sep 17 00:00:00 2001 From: Marcus Brandenburger Date: Fri, 6 Oct 2023 12:07:57 +0200 Subject: [PATCH] Upgrade to Fabric 2.5.4 and Fabric-ca 1.5.7 Signed-off-by: Marcus Brandenburger --- README.md | 8 ++++---- config.mk | 2 +- fabric/README.md | 4 ++-- samples/chaincode/simple-asset-go/README.md | 2 +- samples/deployment/k8s/README.md | 2 +- .../k8s/orderer-service/orderer0-deployment.yaml | 2 +- .../k8s/orderer-service/orderer1-deployment.yaml | 2 +- .../k8s/orderer-service/orderer2-deployment.yaml | 2 +- samples/deployment/k8s/org1/org1-cli-deployment.yaml | 2 +- samples/deployment/k8s/org1/org1-peer0-deployment.yaml | 2 +- samples/deployment/k8s/org2/org2-cli-deployment.yaml | 2 +- samples/deployment/k8s/org2/org2-peer0-deployment.yaml | 2 +- samples/deployment/k8s/org3/org3-cli-deployment.yaml | 2 +- samples/deployment/k8s/org3/org3-peer0-deployment.yaml | 2 +- samples/deployment/test-network/README.md | 2 +- utils/docker/dev/Dockerfile | 2 +- utils/docker/dev_peer_cc-builder/Dockerfile | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 5db49fb94..7d049a6c1 100644 --- a/README.md +++ b/README.md @@ -288,7 +288,7 @@ Make sure that you have the following required dependencies installed: * [Intel Software Guard Extensions SSL](https://github.com/intel/intel-sgx-ssl) (we recommend using branch `lin_2.10_1.1.1g` OpenSSL `1.1.1g`) -* Hyperledger [Fabric](https://github.com/hyperledger/fabric/tree/v2.3.3) v2.3.3 +* Hyperledger [Fabric](https://github.com/hyperledger/fabric/tree/v2.5.4) v2.5.4 * Clang-format 6.x or higher @@ -345,15 +345,15 @@ export PROTOC_CMD=/usr/local/proto3/bin/protoc #### Hyperledger Fabric Our project fetches the latest supported Fabric binaries during the build process automatically. -However, if you want to use your own Fabric binaries, please checkout Fabric 2.3.3 release using the following commands: +However, if you want to use your own Fabric binaries, please checkout Fabric 2.5.4 release using the following commands: ```bash export FABRIC_PATH=$GOPATH/src/github.com/hyperledger/fabric git clone https://github.com/hyperledger/fabric.git $FABRIC_PATH -cd $FABRIC_PATH; git checkout tags/v2.3.3 +cd $FABRIC_PATH; git checkout tags/v2.5.4 ``` Note that Fabric Private Chaincode may not work with the Fabric `main` branch. -Therefore, make sure you use the Fabric `v2.3.3` tag. +Therefore, make sure you use the Fabric `v2.5.4` tag. Make sure the source of Fabric is in your `$GOPATH`. ## Build Fabric Private Chaincode diff --git a/config.mk b/config.mk index 09277aee0..75ab3edc1 100644 --- a/config.mk +++ b/config.mk @@ -59,7 +59,7 @@ PLANTUML_IMG_FORMAT ?= png # pdf / png / svg #-------------------------------------------------- PROJECT_NAME=fabric-private-chaincode -export FABRIC_VERSION ?= 2.5.3 +export FABRIC_VERSION ?= 2.5.4 export FPC_VERSION := main export FPC_CCENV_IMAGE ?= hyperledger/fabric-private-chaincode-ccenv:$(FPC_VERSION) diff --git a/fabric/README.md b/fabric/README.md index 1287f6a2a..84c4798f0 100644 --- a/fabric/README.md +++ b/fabric/README.md @@ -27,9 +27,9 @@ To clean the native build, type `cd $FPC_PATH/fabric; make clean-native`. ### Wrong Fabric version ``` Patching Fabric ... -Aborting! Tag on current HEAD () does not match expected tag/v2.3.3! +Aborting! Tag on current HEAD () does not match expected tag/v2.5.4! ... ``` Seems that your Fabric is on the wrong branch. -Try to run `pushd $FABRIC_PATH; git checkout tags/v2.3.3; popd;` followed by `make` again. +Try to run `pushd $FABRIC_PATH; git checkout tags/v2.5.3; popd;` followed by `make` again. diff --git a/samples/chaincode/simple-asset-go/README.md b/samples/chaincode/simple-asset-go/README.md index c9dee7e8f..b2aa7585f 100644 --- a/samples/chaincode/simple-asset-go/README.md +++ b/samples/chaincode/simple-asset-go/README.md @@ -199,7 +199,7 @@ git clone https://github.com/hyperledger/fabric-samples cd $FPC_PATH/samples/deployment/test-network/fabric-samples # no we pick a specific version here to have stable experience :) git checkout -b "works" 98028c7 -curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.3.3 1.4.9 -s +curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.5.4 1.5.7 -s cd $FPC_PATH/samples/deployment/test-network ./setup.sh ``` diff --git a/samples/deployment/k8s/README.md b/samples/deployment/k8s/README.md index 1592ade77..40e14e39e 100644 --- a/samples/deployment/k8s/README.md +++ b/samples/deployment/k8s/README.md @@ -124,7 +124,7 @@ If you have installed them somewhere else on your system, please set `FABIC_BIN_ For instance, you can download the binaries and use them by following the commands: ```bash cd $FPC_PATH/samples/deployment/k8s -curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.3.3 1.4.9 -d -s +curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.5.4 1.5.7 -d -s export FABRIC_BIN_DIR=$(pwd)/bin ``` diff --git a/samples/deployment/k8s/orderer-service/orderer0-deployment.yaml b/samples/deployment/k8s/orderer-service/orderer0-deployment.yaml index 6c5c2e6d4..bad137d17 100644 --- a/samples/deployment/k8s/orderer-service/orderer0-deployment.yaml +++ b/samples/deployment/k8s/orderer-service/orderer0-deployment.yaml @@ -68,7 +68,7 @@ spec: value: /var/hyperledger/orderer/tls/server.key - name: ORDERER_GENERAL_CLUSTER_ROOTCAS value: "[/var/hyperledger/orderer/tls/ca.crt]" - image: hyperledger/fabric-orderer:2.3.3 + image: hyperledger/fabric-orderer:2.5.4 name: orderer ports: - containerPort: 7050 diff --git a/samples/deployment/k8s/orderer-service/orderer1-deployment.yaml b/samples/deployment/k8s/orderer-service/orderer1-deployment.yaml index a5f98a276..f5aa6dce8 100644 --- a/samples/deployment/k8s/orderer-service/orderer1-deployment.yaml +++ b/samples/deployment/k8s/orderer-service/orderer1-deployment.yaml @@ -68,7 +68,7 @@ spec: value: /var/hyperledger/orderer/tls/server.key - name: ORDERER_GENERAL_CLUSTER_ROOTCAS value: "[/var/hyperledger/orderer/tls/ca.crt]" - image: hyperledger/fabric-orderer:2.3.3 + image: hyperledger/fabric-orderer:2.5.4 name: orderer ports: - containerPort: 7050 diff --git a/samples/deployment/k8s/orderer-service/orderer2-deployment.yaml b/samples/deployment/k8s/orderer-service/orderer2-deployment.yaml index 82bc7f303..ac88cee6c 100644 --- a/samples/deployment/k8s/orderer-service/orderer2-deployment.yaml +++ b/samples/deployment/k8s/orderer-service/orderer2-deployment.yaml @@ -68,7 +68,7 @@ spec: value: /var/hyperledger/orderer/tls/server.key - name: ORDERER_GENERAL_CLUSTER_ROOTCAS value: "[/var/hyperledger/orderer/tls/ca.crt]" - image: hyperledger/fabric-orderer:2.3.3 + image: hyperledger/fabric-orderer:2.5.4 name: orderer ports: - containerPort: 7050 diff --git a/samples/deployment/k8s/org1/org1-cli-deployment.yaml b/samples/deployment/k8s/org1/org1-cli-deployment.yaml index bc975eb64..48e0d7a5e 100644 --- a/samples/deployment/k8s/org1/org1-cli-deployment.yaml +++ b/samples/deployment/k8s/org1/org1-cli-deployment.yaml @@ -52,7 +52,7 @@ spec: configMapKeyRef: name: chaincode-config key: FPC_MRENCLAVE - image: hyperledger/fabric-tools:2.3.3 + image: hyperledger/fabric-tools:2.5.4 name: cli tty: true volumeMounts: diff --git a/samples/deployment/k8s/org1/org1-peer0-deployment.yaml b/samples/deployment/k8s/org1/org1-peer0-deployment.yaml index b6a6d6989..4917d0b84 100644 --- a/samples/deployment/k8s/org1/org1-peer0-deployment.yaml +++ b/samples/deployment/k8s/org1/org1-peer0-deployment.yaml @@ -57,7 +57,7 @@ spec: value: 0.0.0.0:9443 - name: CORE_METRICS_PROVIDER value: prometheus - image: hyperledger/fabric-peer:2.3.3 + image: hyperledger/fabric-peer:2.5.4 name: peer0 ports: - containerPort: 7051 diff --git a/samples/deployment/k8s/org2/org2-cli-deployment.yaml b/samples/deployment/k8s/org2/org2-cli-deployment.yaml index 315bcc406..54009bf99 100644 --- a/samples/deployment/k8s/org2/org2-cli-deployment.yaml +++ b/samples/deployment/k8s/org2/org2-cli-deployment.yaml @@ -52,7 +52,7 @@ spec: configMapKeyRef: name: chaincode-config key: FPC_MRENCLAVE - image: hyperledger/fabric-tools:2.3.3 + image: hyperledger/fabric-tools:2.5.4 name: cli tty: true volumeMounts: diff --git a/samples/deployment/k8s/org2/org2-peer0-deployment.yaml b/samples/deployment/k8s/org2/org2-peer0-deployment.yaml index 2f38c2623..48350a361 100644 --- a/samples/deployment/k8s/org2/org2-peer0-deployment.yaml +++ b/samples/deployment/k8s/org2/org2-peer0-deployment.yaml @@ -57,7 +57,7 @@ spec: value: 0.0.0.0:9443 - name: CORE_METRICS_PROVIDER value: prometheus - image: hyperledger/fabric-peer:2.3.3 + image: hyperledger/fabric-peer:2.5.4 name: peer0 ports: - containerPort: 7051 diff --git a/samples/deployment/k8s/org3/org3-cli-deployment.yaml b/samples/deployment/k8s/org3/org3-cli-deployment.yaml index 15b3f3817..0bd0c9b33 100644 --- a/samples/deployment/k8s/org3/org3-cli-deployment.yaml +++ b/samples/deployment/k8s/org3/org3-cli-deployment.yaml @@ -52,7 +52,7 @@ spec: configMapKeyRef: name: chaincode-config key: FPC_MRENCLAVE - image: hyperledger/fabric-tools:2.3.3 + image: hyperledger/fabric-tools:2.5.4 name: cli tty: true volumeMounts: diff --git a/samples/deployment/k8s/org3/org3-peer0-deployment.yaml b/samples/deployment/k8s/org3/org3-peer0-deployment.yaml index 382016f3a..c023ec91c 100644 --- a/samples/deployment/k8s/org3/org3-peer0-deployment.yaml +++ b/samples/deployment/k8s/org3/org3-peer0-deployment.yaml @@ -57,7 +57,7 @@ spec: value: 0.0.0.0:9443 - name: CORE_METRICS_PROVIDER value: prometheus - image: hyperledger/fabric-peer:2.3.3 + image: hyperledger/fabric-peer:2.5.4 name: peer0 ports: - containerPort: 7051 diff --git a/samples/deployment/test-network/README.md b/samples/deployment/test-network/README.md index 3ac154429..bdbf76109 100644 --- a/samples/deployment/test-network/README.md +++ b/samples/deployment/test-network/README.md @@ -39,7 +39,7 @@ cd $FPC_PATH/samples/deployment/test-network git clone https://github.com/hyperledger/fabric-samples cd $FPC_PATH/samples/deployment/test-network/fabric-samples git checkout -b "works" 98028c7 -curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.3.3 1.4.9 -s +curl -sSL https://bit.ly/2ysbOFE | bash -s -- 2.5.4 1.5.7 -s ``` Before we can start the network, we need to update the Fabric peer configuration to enable FPC support. diff --git a/utils/docker/dev/Dockerfile b/utils/docker/dev/Dockerfile index 12dbee821..ca07c1dd8 100644 --- a/utils/docker/dev/Dockerfile +++ b/utils/docker/dev/Dockerfile @@ -23,7 +23,7 @@ FROM hyperledger/fabric-private-chaincode-base-dev:${FPC_VERSION} # config/build params ARG FABRIC_REPO=https://github.com/hyperledger/fabric.git -ARG FABRIC_VERSION=2.5.3 +ARG FABRIC_VERSION=2.5.4 ARG FABRIC_REL_PATH=src/github.com/hyperledger/fabric ARG FPC_REL_PATH=src/github.com/hyperledger/fabric-private-chaincode diff --git a/utils/docker/dev_peer_cc-builder/Dockerfile b/utils/docker/dev_peer_cc-builder/Dockerfile index cc6550d53..be63fa8f4 100644 --- a/utils/docker/dev_peer_cc-builder/Dockerfile +++ b/utils/docker/dev_peer_cc-builder/Dockerfile @@ -53,7 +53,7 @@ ARG SGX_MODE # config/build params ARG FABRIC_REPO=https://github.com/hyperledger/fabric.git -ARG FABRIC_VERSION=2.3.3 +ARG FABRIC_VERSION=2.5.4 ARG FPC_REPO_URL=https://github.com/hyperledger/fabric-private-chaincode.git ARG FPC_REPO_BRANCH_TAG_OR_COMMIT=main ARG GIT_USER_NAME=tester