Merge branch 'release-2.5'

Signed-off-by: kmilo <kmilo.denis.glez@yandex.com>

Author: kmilodenisglez

.github/workflows/ci.yml

@@ -58,11 +58,6 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install -r requirements.txt pytest pytest-asyncio
 
-      - name: Install official Fabric protobuf bindings
-        run: |
-          chmod +x scripts/install_fabric_protos.sh
-          PYTHON_BIN=python ./scripts/install_fabric_protos.sh
-
       - name: Run tests
         run: |
           python -m pytest -q

CONTRIBUTING.md

@@ -28,6 +28,14 @@ git config --global user.name "Your Name"
 git config --global user.email "you@example.com"
 ```
 
+Protobuf bindings
+--------------------
+
+Bindings come from PyPI (`hyperledger-fabric-protos`) via `requirements.txt` - no extra steps needed.
+
+If you need to test against unreleased `fabric-protos` changes, see `PROTOS.md` (`scripts/install_fabric_protos.sh` and `scripts/gen_protos.sh`).
+
+
 Licensing
 ---------
 

PROTOS.md

@@ -4,39 +4,49 @@ Protobufs / How this project uses `fabric-protos`
 Current integration model
 -------------------------
 
-This project now consumes official Python protobuf bindings from
-`hyperledger/fabric-protos`.
+This project consumes the official Python protobuf bindings published to PyPI from `hyperledger/fabric-protos`.
 
 - Package name: `hyperledger-fabric-protos`
 - Import namespace used by this repository: `fabric_protos`
 
-Install with:
+The package is installed as a regular dependency:
 
 ```bash
-PYTHON_BIN=python ./scripts/install_fabric_protos.sh
+pip install -r requirements.txt
 ```
 
-Why this model
---------------
+For contributors: custom bindings
 
-- Avoids vendored generated protobuf drift inside this repository.
-- Keeps protocol bindings aligned with the upstream Fabric protobuf source.
-- Simplifies release and maintenance for `fabric-chaincode-python`.
+`scripts/install_fabric_protos.sh` remains available for contributors who need bindings not published to PyPI (an unreleased upstream commit, or a local checkout). Normal users do not need to run it; it is a no-op when a working fabric_protos is already importable.
 
-Version compatibility
----------------------
+Installation order of preference:
 
-Use dependency ranges compatible with upstream Python bindings:
+1. Do nothing if a working `fabric_protos` is already importable.
+2. Local checkout from `FABRIC_PROTOS_SRC` (runs `make pythonbindings`).
+3. Default sibling checkout ../fabric-protos, if present.
+4. PyPI package `hyperledger-fabric-protos`.
+5. Git checkout of `hyperledger/fabric-protos` at `FABRIC_PROTOS_REF`,then local build/install of bindings/python.
 
-- `protobuf>=5.27.0,<6.0.0`
-- `grpcio>=1.83.1,<2.0.0`
+Test against a local fabric-protos checkout
+-------------------------
+
+```bash
+FABRIC_PROTOS_SRC=/path/to/fabric-protos PYTHON_BIN=python ./scripts/install_fabric_protos.sh
+```
+
+Test against a specific upstream commit
+-------------------------
+
+```bash
+FABRIC_PROTOS_REF=<commit-sha> PYTHON_BIN=python ./scripts/install_fabric_protos.sh
+````
 
-The installer script uses the following order:
+The script validates after install that the required generated modules 
+- `fabric_protos.peer.chaincode_pb2`
+- `fabric_protos.peer.chaincode_shim_pb2`
+- `fabric_protos.common.common_pb2`
 
-1. Local `../fabric-protos` checkout (runs `make pythonbindings`)
-2. PyPI `hyperledger-fabric-protos` package (if complete)
-3. Official `hyperledger/fabric-protos` git checkout at pinned commit,
-   then local build/install of `bindings/python`
+are importable.
 
 Local regeneration (optional)
 -----------------------------
@@ -48,10 +58,10 @@ a local `fabric-protos` checkout:
 PROTO_SRC=/path/to/fabric-protos OUT_DIR=$PWD/fabric_protos bash scripts/gen_protos.sh
 ```
 
-This is optional and should not be required for normal runtime use.
+This is optional and should not be required for normal runtime use
 
 License
 -------
 
 `fabric-protos` is Apache-2.0. If distributing generated bindings yourself,
-keep original licensing notices intact.
+keep original licensing notices intact.

README.md

@@ -10,11 +10,7 @@ Status
 Requirements
 ------------
 - Python 3.10+ (3.11 recommended)
-- See `requirements.txt` for runtime dependencies. Key packages:
-	- `grpcio==1.83.1`
-	- `protobuf>=5.27.0,<6.0.0`
-	- `grpclib==0.4.3`
-	- `hyperledger-fabric-protos` (installed via `scripts/install_fabric_protos.sh`)
+- See `requirements.txt` for runtime dependencies
 
 Quick start (development)
 -------------------------
@@ -27,7 +23,6 @@ python3 -m venv .venv
 source .venv/bin/activate
 python -m pip install --upgrade pip
 pip install -r requirements.txt
-PYTHON_BIN=python ./scripts/install_fabric_protos.sh
 ```
 
 Run tests:
@@ -48,21 +43,13 @@ python -m build --wheel --no-isolation
 
 Protobuf bindings
 -----------------
-This repository consumes the official Python bindings published from
+This repository consumes the official Python bindings published to PYPI from
 `hyperledger/fabric-protos`:
 
 - Package name: `hyperledger-fabric-protos`
 - Import namespace: `fabric_protos`
 
-Bindings are installed from official `hyperledger/fabric-protos` sources by
-`scripts/install_fabric_protos.sh`, with validation that required generated
-modules are present.
-
-Install or refresh official bindings with:
-
-```bash
-PYTHON_BIN=python ./scripts/install_fabric_protos.sh
-```
+They are installed as a regular dependency via requirements.txt. For custom bindings (local checkout, specific upstream commit) see PROTOS.md.
 
 No vendored protobuf runtime package is required in this repository.
 If you need to regenerate bindings locally for debugging, use

examples/ccaas/asset-transfer-basic/README.md

@@ -28,7 +28,6 @@ cd /path/to/fabric-chaincode-python
 python3 -m venv .venv
 source .venv/bin/activate
 pip install -r requirements.txt
-PYTHON_BIN=python ./scripts/install_fabric_protos.sh
 ```
 
 ### 2. Package the Chaincode
@@ -187,7 +186,7 @@ Tells Fabric that this is a CCAAS package:
 ### Server won't start
 - Ensure `CHAINCODE_ID` matches the package-id from `peer lifecycle chaincode install`
 - Check that `connection.json` address is accessible from the peer
-- Verify dependencies are installed: `pip install -r requirements.txt && PYTHON_BIN=python ./scripts/install_fabric_protos.sh`
+- Verify dependencies are installed: `pip install -r requirements.txt`
 - Verify you're using the project venv: `./.venv/bin/python -c "import grpc; print(grpc.__version__)"`
 - Verify Fabric protobuf bindings are importable: `./.venv/bin/python -c "from fabric_protos.peer import chaincode_shim_pb2"`
 

examples/ccaas/asset-transfer-sbe/README.md

@@ -40,7 +40,6 @@ cd /path/to/fabric-chaincode-python
 python3 -m venv .venv
 source .venv/bin/activate
 pip install -r requirements.txt
-PYTHON_BIN=python ./scripts/install_fabric_protos.sh
 ```
 
 ### 2. Run the Chaincode Server

requirements.txt

@@ -1,3 +1,4 @@
 grpcio==1.83.1
 grpclib==0.4.3
 protobuf>=5.27.0,<6.0.0
+hyperledger-fabric-protos>=0.3.7.dev1,<0.4.0

setup.py

@@ -36,8 +36,8 @@ def _read_requirements(path: str):
     description="Hyperledger Fabric Contract and Chaincode implementation for Python.",
     long_description=io.open('README.md', encoding='utf-8').read(),
     author='Hyperledger Community',
-    url='https://github.com/ic-matcom/fabric-chaincode-python/',
-    download_url='https://github.com/ic-matcom/fabric-chaincode-python/',
+    url='https://github.com/kmilodenisglez/fabric-chaincode-python/',
+    download_url='https://github.com/kmilodenisglez/fabric-chaincode-python/',
     packages=find_packages(exclude=['docs', 'tests*']),
     platforms='any',
     install_requires=requirements,