Revert "merging main branch"

This reverts commit bd8b82b.

Author: Sahilgill24

.github/workflows/tox.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.10", "3.11", "3.12", "3.13"]
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
         toxenv: [core, interop, lint, wheel, demos]
         include:
-          - python: "3.10"
+          - python: '3.10'
             toxenv: docs
       fail-fast: false
     steps:
@@ -46,7 +46,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ["3.11", "3.12", "3.13"]
+        python-version: ['3.11', '3.12', '3.13']
         toxenv: [core, wheel]
       fail-fast: false
     steps:

.gitignore

@@ -146,9 +146,6 @@ instance/
 # PyBuilder
 target/
 
-# PyRight Config
-pyrightconfig.json
-
 # Jupyter Notebook
 .ipynb_checkpoints
 
@@ -174,7 +171,3 @@ env.bak/
 
 # mkdocs documentation
 /site
-
-#lockfiles
-uv.lock
-poetry.lock

.pre-commit-config.yaml

@@ -1,49 +1,59 @@
 exclude: '.project-template|docs/conf.py|.*pb2\..*'
 repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
+-   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
-      - id: check-yaml
-      - id: check-toml
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
-    hooks:
-      - id: pyupgrade
-        args: [--py310-plus]
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.10
-    hooks:
-      - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
-      - id: ruff-format
-  - repo: https://github.com/executablebooks/mdformat
+    -   id: check-yaml
+    -   id: check-toml
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+    -   id: pyupgrade
+        args: [--py39-plus]
+-   repo: https://github.com/psf/black
+    rev: 23.9.1
+    hooks:
+    -   id: black
+-   repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+    -   id: flake8
+        additional_dependencies:
+        -   flake8-bugbear==23.9.16
+        exclude: setup.py
+-   repo: https://github.com/PyCQA/autoflake
+    rev: v2.2.1
+    hooks:
+    -   id: autoflake
+-   repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+    -   id: isort
+-   repo: https://github.com/pycqa/pydocstyle
+    rev: 6.3.0
+    hooks:
+    -   id: pydocstyle
+        additional_dependencies:
+        -   tomli  # required until >= python311
+-   repo: https://github.com/executablebooks/mdformat
     rev: 0.7.22
     hooks:
-      - id: mdformat
+    -   id: mdformat
         additional_dependencies:
-          - mdformat-gfm
-  - repo: local
+        -   mdformat-gfm
+-   repo: local
     hooks:
-      - id: mypy-local
+    -   id: mypy-local
         name: run mypy with all dev dependencies present
-        entry: mypy -p libp2p
-        language: system
-        always_run: true
-        pass_filenames: false
-  - repo: local
-    hooks:
-      - id: pyrefly-local
-        name: run pyrefly typecheck locally
-        entry: pyrefly check
+        entry: python -m mypy -p libp2p
         language: system
         always_run: true
         pass_filenames: false
-
-  - repo: local
+-   repo: local
     hooks:
-      - id: check-rst-files
+    -   id: check-rst-files
         name: Check for .rst files in the top-level directory
         entry: python -c "import glob, sys; rst_files = glob.glob('*.rst'); sys.exit(1) if rst_files else sys.exit(0)"
         language: system

.project-template/fill_template_vars.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+import re
+from pathlib import Path
+
+
+def _find_files(project_root):
+    path_exclude_pattern = r"\.git($|\/)|venv|_build"
+    file_exclude_pattern = r"fill_template_vars\.py|\.swp$"
+    filepaths = []
+    for dir_path, _dir_names, file_names in os.walk(project_root):
+        if not re.search(path_exclude_pattern, dir_path):
+            for file in file_names:
+                if not re.search(file_exclude_pattern, file):
+                    filepaths.append(str(Path(dir_path, file)))
+
+    return filepaths
+
+
+def _replace(pattern, replacement, project_root):
+    print(f"Replacing values: {pattern}")
+    for file in _find_files(project_root):
+        try:
+            with open(file) as f:
+                content = f.read()
+            content = re.sub(pattern, replacement, content)
+            with open(file, "w") as f:
+                f.write(content)
+        except UnicodeDecodeError:
+            pass
+
+
+def main():
+    project_root = Path(os.path.realpath(sys.argv[0])).parent.parent
+
+    module_name = input("What is your python module name? ")
+
+    pypi_input = input(f"What is your pypi package name? (default: {module_name}) ")
+    pypi_name = pypi_input or module_name
+
+    repo_input = input(f"What is your github project name? (default: {pypi_name}) ")
+    repo_name = repo_input or pypi_name
+
+    rtd_input = input(
+        f"What is your readthedocs.org project name? (default: {pypi_name}) "
+    )
+    rtd_name = rtd_input or pypi_name
+
+    project_input = input(
+        f"What is your project name (ex: at the top of the README)? (default: {repo_name}) "
+    )
+    project_name = project_input or repo_name
+
+    short_description = input("What is a one-liner describing the project? ")
+
+    _replace("<MODULE_NAME>", module_name, project_root)
+    _replace("<PYPI_NAME>", pypi_name, project_root)
+    _replace("<REPO_NAME>", repo_name, project_root)
+    _replace("<RTD_NAME>", rtd_name, project_root)
+    _replace("<PROJECT_NAME>", project_name, project_root)
+    _replace("<SHORT_DESCRIPTION>", short_description, project_root)
+
+    os.makedirs(project_root / module_name, exist_ok=True)
+    Path(project_root / module_name / "__init__.py").touch()
+    Path(project_root / module_name / "py.typed").touch()
+
+
+if __name__ == "__main__":
+    main()

.project-template/refill_template_vars.py

@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+from pathlib import Path
+import subprocess
+
+
+def main():
+    template_dir = Path(os.path.dirname(sys.argv[0]))
+    template_vars_file = template_dir / "template_vars.txt"
+    fill_template_vars_script = template_dir / "fill_template_vars.py"
+
+    with open(template_vars_file, "r") as input_file:
+        content_lines = input_file.readlines()
+
+    process = subprocess.Popen(
+        [sys.executable, str(fill_template_vars_script)],
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+    )
+
+    for line in content_lines:
+        process.stdin.write(line)
+        process.stdin.flush()
+
+    stdout, stderr = process.communicate()
+
+    if process.returncode != 0:
+        print(f"Error occurred: {stderr}")
+        sys.exit(1)
+
+    print(stdout)
+
+
+if __name__ == "__main__":
+    main()

.project-template/template_vars.txt

@@ -0,0 +1,6 @@
+libp2p
+libp2p
+py-libp2p
+py-libp2p
+py-libp2p
+The Python implementation of the libp2p networking stack

Makefile

@@ -7,7 +7,6 @@ help:
 	@echo "clean-pyc - remove Python file artifacts"
 	@echo "clean - run clean-build and clean-pyc"
 	@echo "dist - build package and cat contents of the dist directory"
-	@echo "fix - fix formatting & linting issues with ruff"
 	@echo "lint - fix linting issues with pre-commit"
 	@echo "test - run tests quickly with the default Python"
 	@echo "docs - generate docs and open in browser (linux-docs for version on linux)"
@@ -38,14 +37,8 @@ lint:
 		&& pre-commit run --all-files --show-diff-on-failure \
 	)
 
-fix:
-	python -m ruff check --fix
-
-typecheck:
-	pre-commit run mypy-local --all-files && pre-commit run pyrefly-local --all-files
-
 test:
-	python -m pytest tests -n auto
+	python -m pytest tests
 
 # protobufs management
 

docs/conf.py

@@ -15,24 +15,14 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 # sys.path.insert(0, os.path.abspath('.'))
 
-import doctest
 import os
-import sys
-from unittest.mock import MagicMock
-
-try:
-    import tomllib
-except ModuleNotFoundError:
-    # For Python < 3.11
-    import tomli as tomllib  # type: ignore (In case of >3.11 Pyrefly doesnt find tomli , which is right but a false flag)
-
-# Path to pyproject.toml (assuming conf.py is in a 'docs' subdirectory)
-pyproject_path = os.path.join(os.path.dirname(__file__), "..", "pyproject.toml")
 
-with open(pyproject_path, "rb") as f:
-    pyproject_data = tomllib.load(f)
-
-setup_version = pyproject_data["project"]["version"]
+DIR = os.path.dirname(__file__)
+with open(os.path.join(DIR, "../setup.py"), "r") as f:
+    for line in f:
+        if "version=" in line:
+            setup_version = line.split('"')[1]
+            break
 
 # -- General configuration ------------------------------------------------
 
@@ -312,6 +302,7 @@
 
 # -- Doctest configuration ----------------------------------------
 
+import doctest
 
 doctest_default_flags = (
     0
@@ -326,9 +317,10 @@
 # Mock out dependencies that are unbuildable on readthedocs, as recommended here:
 # https://docs.readthedocs.io/en/rel/faq.html#i-get-import-errors-on-libraries-that-depend-on-c-modules
 
+import sys
+from unittest.mock import MagicMock
 
-# Add new modules to mock here (it should be the same list
-# as those excluded in pyproject.toml)
+# Add new modules to mock here (it should be the same list as those excluded in setup.py)
 MOCK_MODULES = [
     "fastecdsa",
     "fastecdsa.encoding",
@@ -346,4 +338,4 @@
 
 # Allow duplicate object descriptions
 nitpicky = False
-nitpick_ignore = [("py:class", "type")]
+nitpick_ignore = [("py:class", "type")]

examples/chat/chat.py

@@ -40,6 +40,7 @@ async def write_data(stream: INetStream) -> None:
 
 
 async def run(port: int, destination: str) -> None:
+    localhost_ip = "127.0.0.1"
     listen_addr = multiaddr.Multiaddr(f"/ip4/0.0.0.0/tcp/{port}")
     host = new_host()
     async with host.run(listen_addrs=[listen_addr]), trio.open_nursery() as nursery:
@@ -53,8 +54,8 @@ async def stream_handler(stream: INetStream) -> None:
 
             print(
                 "Run this from the same folder in another console:\n\n"
-                f"chat-demo "
-                f"-d {host.get_addrs()[0]}\n"
+                f"chat-demo -p {int(port) + 1} "
+                f"-d /ip4/{localhost_ip}/tcp/{port}/p2p/{host.get_id().pretty()}\n"
             )
             print("Waiting for incoming connection...")
 
@@ -86,7 +87,9 @@ def main() -> None:
         "/ip4/127.0.0.1/tcp/8000/p2p/QmQn4SwGkDZKkUEpBRBvTmheQycxAHJUNmVEnjA2v1qe8Q"
     )
     parser = argparse.ArgumentParser(description=description)
-    parser.add_argument("-p", "--port", default=0, type=int, help="source port number")
+    parser.add_argument(
+        "-p", "--port", default=8000, type=int, help="source port number"
+    )
     parser.add_argument(
         "-d",
         "--destination",
@@ -95,6 +98,9 @@ def main() -> None:
     )
     args = parser.parse_args()
 
+    if not args.port:
+        raise RuntimeError("was not able to determine a local port")
+
     try:
         trio.run(run, *(args.port, args.destination))
     except KeyboardInterrupt:

examples/doc-examples/example_encryption_insecure.py

@@ -24,6 +24,9 @@ async def main():
     insecure_transport = InsecureTransport(
         # local_key_pair: The key pair used for libp2p identity
         local_key_pair=key_pair,
+        # secure_bytes_provider: Optional function to generate secure random bytes
+        # (defaults to secrets.token_bytes)
+        secure_bytes_provider=None,  # Use default implementation
     )
 
     # Create a security options dictionary mapping protocol ID to transport