Merge 0dec81adbe into 119d3bc53f

Update Fabric to v2.5.16 and v3.1.5 (#1425 )
This patch updates Fabric versions: - Fabric v2.5.16 and v3.1.5 - Fabric CA v1.5.21 fabric-ca-client v1.5.21 appends the default port 7054 when omitted, breaking register/enroll against the ingress (443). Make the CA URL port explicit (:443). Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2026-06-21 00:55:10 +00:00 · 2026-06-19 13:58:50 +00:00 · 2026-06-18 10:15:24 +01:00 · 2026-03-21 10:30:36 +00:00
19 changed files with 49 additions and 48 deletions
--- 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"
--- 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"
--- 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
--- a/asset-transfer-basic/application-gateway-typescript/package-lock.json
+++ b/asset-transfer-basic/application-gateway-typescript/package-lock.json
@ -1057,9 +1057,9 @@
            }
        },
        "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
            "dev": true,
            "license": "ISC"
        },
--- a/asset-transfer-basic/rest-api-typescript/package-lock.json
+++ b/asset-transfer-basic/rest-api-typescript/package-lock.json
@ -3777,10 +3777,11 @@
      "integrity": "sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw=="
    },
    "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
-      "dev": true
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+      "dev": true,
+      "license": "ISC"
    },
    "node_modules/follow-redirects": {
      "version": "1.15.11",
--- a/asset-transfer-events/application-gateway-typescript/package-lock.json
+++ b/asset-transfer-events/application-gateway-typescript/package-lock.json
@ -1057,9 +1057,9 @@
            }
        },
        "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
            "dev": true,
            "license": "ISC"
        },
--- a/asset-transfer-private-data/application-gateway-typescript/package-lock.json
+++ b/asset-transfer-private-data/application-gateway-typescript/package-lock.json
@ -1057,9 +1057,9 @@
            }
        },
        "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
            "dev": true,
            "license": "ISC"
        },
--- a/asset-transfer-secured-agreement/application-gateway-typescript/package-lock.json
+++ b/asset-transfer-secured-agreement/application-gateway-typescript/package-lock.json
@ -1057,9 +1057,9 @@
            }
        },
        "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
            "dev": true,
            "license": "ISC"
        },
--- a/full-stack-asset-transfer-guide/applications/conga-cards/package-lock.json
+++ b/full-stack-asset-transfer-guide/applications/conga-cards/package-lock.json
@ -1186,9 +1186,9 @@
            }
        },
        "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
            "dev": true,
            "license": "ISC"
        },
--- a/full-stack-asset-transfer-guide/applications/trader-typescript/package-lock.json
+++ b/full-stack-asset-transfer-guide/applications/trader-typescript/package-lock.json
@ -1057,9 +1057,9 @@
            }
        },
        "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
            "dev": true,
            "license": "ISC"
        },
--- 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
--- 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
--- 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

--- 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

--- a/hardware-security-module/application-typescript/package-lock.json
+++ b/hardware-security-module/application-typescript/package-lock.json
@ -1313,9 +1313,9 @@
            }
        },
        "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
            "dev": true,
            "license": "ISC"
        },
--- a/off_chain_data/application-typescript/package-lock.json
+++ b/off_chain_data/application-typescript/package-lock.json
@ -1058,9 +1058,9 @@
            }
        },
        "node_modules/flatted": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-            "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+            "version": "3.4.2",
+            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+            "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
            "dev": true,
            "license": "ISC"
        },
--- 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
--- 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
--- 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"