diff --git a/.github/actions/fsat-setup/action.yaml b/.github/actions/fsat-setup/action.yaml index 854615f9..97469e9c 100644 --- a/.github/actions/fsat-setup/action.yaml +++ b/.github/actions/fsat-setup/action.yaml @@ -12,10 +12,10 @@ inputs: default: v0.50.15 fabric-version: description: Version of Hyperledger Fabric - default: "2.5.15" + default: "2.5.16" ca-version: description: Version of Hyperledger Fabric CA - default: "1.5.15" + default: "1.5.21" runs: using: "composite" diff --git a/.github/actions/test-network-setup/action.yaml b/.github/actions/test-network-setup/action.yaml index 9cdca2aa..084d11b2 100644 --- a/.github/actions/test-network-setup/action.yaml +++ b/.github/actions/test-network-setup/action.yaml @@ -12,10 +12,10 @@ inputs: default: 25.x fabric-version: description: Version of Hyperledger Fabric - default: 2.5.15 + default: 2.5.16 ca-version: description: Version of Hyperledger Fabric CA - default: 1.5.15 + default: 1.5.21 runs: using: "composite" diff --git a/.github/workflows/test-network-bft-orderer.yaml b/.github/workflows/test-network-bft-orderer.yaml index e8b689dd..fa8879f9 100644 --- a/.github/workflows/test-network-bft-orderer.yaml +++ b/.github/workflows/test-network-bft-orderer.yaml @@ -38,7 +38,7 @@ jobs: # Note: The default Fabric version for CI is currently the latest LTS (v2.5.x). # To test BFT Orderers, Fabric v3.x is explicitly specified here. with: - fabric-version: 3.1.4 + fabric-version: 3.1.5 - name: Run Test Network with BFT Orderers working-directory: test-network diff --git a/full-stack-asset-transfer-guide/infrastructure/multipass-cloud-config.yaml b/full-stack-asset-transfer-guide/infrastructure/multipass-cloud-config.yaml index 40044790..1ce7775d 100644 --- a/full-stack-asset-transfer-guide/infrastructure/multipass-cloud-config.yaml +++ b/full-stack-asset-transfer-guide/infrastructure/multipass-cloud-config.yaml @@ -27,7 +27,7 @@ write_files: # set -o pipefail if [ -z $1 ]; then - HLF_VERSION=2.5.15 + HLF_VERSION=2.5.16 else HLF_VERSION=$1 fi diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/network b/full-stack-asset-transfer-guide/infrastructure/sample-network/network index 2fa66d98..f717c2ac 100755 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/network +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/network @@ -33,8 +33,8 @@ function context() { export ${name}="${!override_name:-${default_value}}" } -context FABRIC_VERSION 2.5.15 -context FABRIC_CA_VERSION 1.5.15 +context FABRIC_VERSION 2.5.16 +context FABRIC_CA_VERSION 1.5.21 context CLUSTER_RUNTIME kind # or k3s for Rancher context CONTAINER_CLI docker # or nerdctl for containerd diff --git a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/rest_sample.sh b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/rest_sample.sh index c18b6cc6..99b069d4 100644 --- a/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/rest_sample.sh +++ b/full-stack-asset-transfer-guide/infrastructure/sample-network/scripts/rest_sample.sh @@ -21,12 +21,12 @@ fabric-ca-client register \ --id.name $USERNAME \ --id.secret $PASSWORD \ --id.type client \ - --url https://$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN \ + --url https://$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN:443 \ --tls.certfiles $WORKSHOP_CRYPTO/cas/$ORG-ca/tls-cert.pem \ --mspdir $WORKSHOP_CRYPTO/enrollments/$ORG/users/rcaadmin/msp fabric-ca-client enroll \ - --url https://$USERNAME:$PASSWORD@$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN \ + --url https://$USERNAME:$PASSWORD@$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN:443 \ --tls.certfiles $WORKSHOP_CRYPTO/cas/$ORG-ca/tls-cert.pem \ --mspdir $WORKSHOP_CRYPTO/enrollments/$ORG/users/$USERNAME/msp diff --git a/full-stack-asset-transfer-guide/tests/20-cloud-e2e.sh b/full-stack-asset-transfer-guide/tests/20-cloud-e2e.sh index 896a1717..8b060d54 100755 --- a/full-stack-asset-transfer-guide/tests/20-cloud-e2e.sh +++ b/full-stack-asset-transfer-guide/tests/20-cloud-e2e.sh @@ -332,12 +332,12 @@ fabric-ca-client register \ --id.name $USERNAME \ --id.secret $PASSWORD \ --id.type client \ - --url https://$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN \ + --url https://$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN:443 \ --tls.certfiles $WORKSHOP_CRYPTO/cas/$ORG-ca/tls-cert.pem \ --mspdir $WORKSHOP_CRYPTO/enrollments/$ORG/users/rcaadmin/msp fabric-ca-client enroll \ - --url https://$USERNAME:$PASSWORD@$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN \ + --url https://$USERNAME:$PASSWORD@$WORKSHOP_NAMESPACE-$ORG-ca-ca.$WORKSHOP_INGRESS_DOMAIN:443 \ --tls.certfiles $WORKSHOP_CRYPTO/cas/$ORG-ca/tls-cert.pem \ --mspdir $WORKSHOP_CRYPTO/enrollments/$ORG/users/$USERNAME/msp diff --git a/test-network-k8s/docs/BFT_ORDERERS.md b/test-network-k8s/docs/BFT_ORDERERS.md index 1c5ccccc..3f5e5902 100644 --- a/test-network-k8s/docs/BFT_ORDERERS.md +++ b/test-network-k8s/docs/BFT_ORDERERS.md @@ -39,8 +39,8 @@ First, run the following command to verify that the environment variables are co ```shell $ ./network -Fabric image versions: Peer (3.1.4), CA (1.5.15) -Fabric binary versions: Peer (3.1.4), CA (1.5.15) +Fabric image versions: Peer (3.1.5), CA (1.5.21) +Fabric binary versions: Peer (3.1.5), CA (1.5.21) --- Fabric Information Fabric Version : 3.1 diff --git a/test-network/network.config b/test-network/network.config index b0867bf8..02b2b162 100644 --- a/test-network/network.config +++ b/test-network/network.config @@ -1,7 +1,7 @@ -# default image tag, example: "2.5.13". "default" will download the latest. (-i) +# default image tag, example: "2.5.16". "default" will download the latest. (-i) IMAGETAG="default" -# default ca image tag, example: "1.5.15". "default" will download the latest. (-cai) +# default ca image tag, example: "1.5.21". "default" will download the latest. (-cai) CA_IMAGETAG="default" # Using crpto vs CA. default is cryptogen diff --git a/test-network/scripts/utils.sh b/test-network/scripts/utils.sh index e9244f91..26ce78a7 100755 --- a/test-network/scripts/utils.sh +++ b/test-network/scripts/utils.sh @@ -17,8 +17,8 @@ function printHelp() { println println " Flags:" println " Used with \033[0;32mnetwork.sh prereq\033[0m:" - println " -i FabricVersion (default: '2.5.15')" - println " -cai Fabric CA Version (default: '1.5.15')" + println " -i FabricVersion (default: '2.5.16')" + println " -cai Fabric CA Version (default: '1.5.21')" println elif [ "$USAGE" == "up" ]; then println "Usage: " @@ -159,8 +159,8 @@ function printHelp() { println println " Flags:" println " Used with \033[0;32mnetwork.sh prereq\033[0m" - println " -i FabricVersion (default: '2.5.15')" - println " -cai Fabric CA Version (default: '1.5.15')" + println " -i FabricVersion (default: '2.5.16')" + println " -cai Fabric CA Version (default: '1.5.21')" println println " Used with \033[0;32mnetwork.sh up\033[0m, \033[0;32mnetwork.sh createChannel\033[0m:" println " -ca - Use Certificate Authorities to generate network crypto material"