Merge branch 'main' into feat/619-store-pubkey-peerid-peerstore

Author: Winter-Soren

.github/workflows/tox.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python: ["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,6 +146,9 @@ instance/
 # PyBuilder
 target/
 
+# PyRight Config
+pyrightconfig.json
+
 # Jupyter Notebook
 .ipynb_checkpoints
 
@@ -171,3 +174,7 @@ env.bak/
 
 # mkdocs documentation
 /site
+
+#lockfiles
+uv.lock
+poetry.lock

.pre-commit-config.yaml

@@ -1,59 +1,49 @@
 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.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
+      - 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
     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: python -m mypy -p libp2p
+        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
         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

@@ -7,12 +7,14 @@ 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)"
 	@echo "package-test - build package and install it in a venv for manual testing"
 	@echo "notes - consume towncrier newsfragments and update release notes in docs - requires bump to be set"
 	@echo "release - package and upload a release (does not run notes target) - requires bump to be set"
+	@echo "pr - run clean, fix, lint, typecheck, and test i.e basically everything you need to do before creating a PR"
 
 clean-build:
 	rm -fr build/
@@ -37,8 +39,16 @@ 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
+	python -m pytest tests -n auto
+
+pr: clean fix lint typecheck test
 
 # protobufs management
 

.project-template/refill_template_vars.py

@@ -15,14 +15,24 @@
 # 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")
 
-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
+with open(pyproject_path, "rb") as f:
+    pyproject_data = tomllib.load(f)
+
+setup_version = pyproject_data["project"]["version"]
 
 # -- General configuration ------------------------------------------------
 
@@ -302,7 +312,6 @@
 
 # -- Doctest configuration ----------------------------------------
 
-import doctest
 
 doctest_default_flags = (
     0
@@ -317,10 +326,9 @@
 # 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 setup.py)
+# Add new modules to mock here (it should be the same list
+# as those excluded in pyproject.toml)
 MOCK_MODULES = [
     "fastecdsa",
     "fastecdsa.encoding",
@@ -338,4 +346,4 @@
 
 # Allow duplicate object descriptions
 nitpicky = False
-nitpick_ignore = [("py:class", "type")]
+nitpick_ignore = [("py:class", "type")]

.project-template/template_vars.txt

@@ -40,7 +40,6 @@ 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:
@@ -54,8 +53,8 @@ async def stream_handler(stream: INetStream) -> None:
 
             print(
                 "Run this from the same folder in another console:\n\n"
-                f"chat-demo -p {int(port) + 1} "
-                f"-d /ip4/{localhost_ip}/tcp/{port}/p2p/{host.get_id().pretty()}\n"
+                f"chat-demo "
+                f"-d {host.get_addrs()[0]}\n"
             )
             print("Waiting for incoming connection...")
 
@@ -87,9 +86,7 @@ def main() -> None:
         "/ip4/127.0.0.1/tcp/8000/p2p/QmQn4SwGkDZKkUEpBRBvTmheQycxAHJUNmVEnjA2v1qe8Q"
     )
     parser = argparse.ArgumentParser(description=description)
-    parser.add_argument(
-        "-p", "--port", default=8000, type=int, help="source port number"
-    )
+    parser.add_argument("-p", "--port", default=0, type=int, help="source port number")
     parser.add_argument(
         "-d",
         "--destination",
@@ -98,9 +95,6 @@ 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:

Makefile

@@ -9,8 +9,10 @@
 from libp2p.crypto.secp256k1 import (
     create_new_key_pair,
 )
-from libp2p.security.noise.transport import PROTOCOL_ID as NOISE_PROTOCOL_ID
-from libp2p.security.noise.transport import Transport as NoiseTransport
+from libp2p.security.noise.transport import (
+    PROTOCOL_ID as NOISE_PROTOCOL_ID,
+    Transport as NoiseTransport,
+)
 
 
 async def main():