Merge branch 'main' into feat/channel-invitation-workflow-part-2

Signed-off-by: Pranav dhiran <dhiranpranav72@gmail.com>

Author: Pranav-d33

.github/workflows/docker-image.yml .github/workflows/integration-tests.yml.github/workflows/docker-image.yml renamed to .github/workflows/integration-tests.yml

@@ -1,4 +1,4 @@
-name: Cello CI
+name: Integration Tests
 
 on:
   push:
@@ -24,7 +24,17 @@ jobs:
 
       - name: Build Hyperledger Fabric Node
         working-directory: src/nodes/hyperledger-fabric
-        run: docker build -t hyperledger/fabric:2.5.14 .
+        run: docker build -t hyperledger/fabric:2.5.15 .
+
+      - name: Run newman tests
+        working-directory: tests/postman
+        run: docker compose up --abort-on-container-exit
+
+      - name: Stop Hyperledger Fabric Chaincode
+        run: docker ps -q --filter "name=dev-peer0.org1.foo.com-basic_1.0" | xargs -r docker stop
+
+      - name: Stop Hyperledger Fabric Nodes
+        run: docker stop orderer0.foo.com peer0.org1.foo.com
 
       - name: Stop Hyperledger Fabric Agent
         run: docker stop cello-hyperledger-fabric-agent

.github/workflows/check-code.yml .github/workflows/lint-check.yml.github/workflows/check-code.yml renamed to .github/workflows/lint-check.yml

@@ -1,4 +1,4 @@
-name: Code Check CI
+name: Lint Check
 
 on:
   push:
@@ -12,21 +12,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
           python-version: "3.8"
+
       - name: Set up Nodejs
         uses: actions/setup-node@v3
         with:
           node-version: "20"
+
       - name: Install Python dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install tox tox-gh-actions
+
       - name: Install Nodejs dependencies
         working-directory: src/dashboard
         run: |
           yarn install --frozen-lockfile
+  
       - name: Check code
         run: make check

src/agents/hyperledger-fabric/Dockerfile

@@ -1,5 +1,7 @@
 FROM python:3.13
 
+ENV FABRIC_VERSION=2.5.15
+
 # Install software
 RUN apt-get update\
 	&& apt-get autoclean\
@@ -18,7 +20,7 @@ RUN ARCH=$(dpkg --print-architecture) && \
         amd64|arm64) FABRIC_ARCH="$ARCH" ;; \
         *) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;; \
     esac && \
-    curl -fsSL --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v2.5.14/hyperledger-fabric-linux-${FABRIC_ARCH}-2.5.14.tar.gz" | tar xz -C ./cello/
+    curl -fsSL --retry 5 --retry-delay 3 "https://github.com/hyperledger/fabric/releases/download/v${FABRIC_VERSION}/hyperledger-fabric-linux-${FABRIC_ARCH}-${FABRIC_VERSION}.tar.gz" | tar xz -C ./cello/
 
 # Install python dependencies
 RUN pip3 install -r requirements.txt

src/agents/hyperledger-fabric/chaincode/serializers.py

@@ -117,7 +117,7 @@ def create(self, validated_data):
 
         threading.Thread(
             target=install_chaincode,
-            args=(fs.path(filename)),
+            args=(fs.path(filename),),
             daemon=True).start()
         return self
 

src/agents/hyperledger-fabric/chaincode/service.py

@@ -3,14 +3,15 @@
 import os
 import subprocess
 import tarfile
+import docker
 import yaml
 from typing import List, Optional, Dict, Any
 
 from chaincode.enums import ChaincodeStatus
-from hyperledger_fabric.settings import CELLO_HOME, CRYPTO_CONFIG, FABRIC_TOOL
+from hyperledger_fabric.settings import CELLO_HOME, CRYPTO_CONFIG, FABRIC_TOOL, FABRIC_VERSION
 
 LOG = logging.getLogger(__name__)
-
+docker_client = docker.DockerClient("unix:///var/run/docker.sock")
 
 def get_chaincode_status(
         package_id: str,
@@ -280,6 +281,8 @@ def install_chaincode(file_path: str):
     ) as f:
         crypto_config = yaml.safe_load(f)
 
+    docker_client.images.pull("hyperledger/fabric-ccenv", tag=FABRIC_VERSION.rsplit(".", 1)[0])
+
     peer_organization_directory = os.path.join(
         CELLO_HOME,
         "peerOrganizations",

src/agents/hyperledger-fabric/hyperledger_fabric/settings.py

@@ -131,7 +131,7 @@
 CELLO_HOME = os.path.join(BASE_DIR, "cello")
 CRYPTO_CONFIG = os.path.join(CELLO_HOME, "crypto-config.yaml")
 FABRIC_TOOL = os.path.join(CELLO_HOME, "bin")
-FABRIC_VERSION = "2.5.14"
+FABRIC_VERSION = "2.5.15"
 
 LOGGING = {
     "version": 1,

src/agents/hyperledger-fabric/node/service.py

@@ -12,8 +12,6 @@
 from node.enums import NodeType
 
 LOG = logging.getLogger(__name__)
-
-
 docker_client = docker.DockerClient("unix:///var/run/docker.sock")
 
 def get_node_status(node_type: str, name: str) -> str:

src/nodes/hyperledger-fabric/Dockerfile

@@ -21,7 +21,7 @@
 # Workdir is set to $GOPATH/src/github.com/hyperledger/fabric
 # Data is stored under /var/hyperledger/production
 
-FROM golang:1.25.5
+FROM golang:1.26.2
 LABEL maintainer="Baohua Yang <yeasy.github.com>"
 
 # Orderer, peer, ca, operation api
@@ -34,10 +34,10 @@ ENV FABRIC_ROOT=$GOPATH/src/github.com/hyperledger/fabric \
     FABRIC_CA_ROOT=$GOPATH/src/github.com/hyperledger/fabric-ca
 
 # BASE_VERSION is used in metadata.Version as major version
-ENV BASE_VERSION=2.5.14
+ENV BASE_VERSION=2.5.15
 
 # PROJECT_VERSION is required in core.yaml for fabric-baseos and fabric-ccenv
-ENV PROJECT_VERSION=2.5.14
+ENV PROJECT_VERSION=2.5.15
 ENV HLF_CA_VERSION=1.5.16
 
 # generic environment (core.yaml) for builder and runtime: e.g., builder: $(DOCKER_NS)/fabric-ccenv:$(TWO_DIGIT_VERSION), golang, java, node