libp2p 0.2.3__tar.gz → 0.2.5__tar.gz

{libp2p-0.2.3/libp2p.egg-info → libp2p-0.2.5}/PKG-INFO

@@ -1,19 +1,18 @@
 Metadata-Version: 2.4
 Name: libp2p
-Version: 0.2.3
+Version: 0.2.5
 Summary: libp2p: The Python implementation of the libp2p networking stack
 Home-page: https://github.com/libp2p/py-libp2p
 Author: The Ethereum Foundation
 Author-email: snakecharmers@ethereum.org
-License: MIT/APACHE2.0
+License: MIT AND Apache-2.0
 Keywords: libp2p p2p
 Platform: unix
 Platform: linux
 Platform: osx
+Platform: win32
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -23,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9, <4
 Description-Content-Type: text/markdown
-License-File: LICENSE-APACHE
 License-File: LICENSE-MIT
+License-File: LICENSE-APACHE
 Requires-Dist: base58>=1.0.3
 Requires-Dist: coincurve>=10.0.0
 Requires-Dist: exceptiongroup>=1.2.0; python_version < "3.11"
@@ -39,8 +38,7 @@ Requires-Dist: pynacl>=1.3.0
 Requires-Dist: rpcudp>=3.0.0
 Requires-Dist: trio-typing>=0.0.4
 Requires-Dist: trio>=0.26.0
-Requires-Dist: fastecdsa-any==1.7.5; sys_platform == "win32"
-Requires-Dist: fastecdsa==1.7.5; sys_platform != "win32"
+Requires-Dist: fastecdsa==1.7.5
 Provides-Extra: dev
 Requires-Dist: build>=0.9.0; extra == "dev"
 Requires-Dist: bump_my_version>=0.19.0; extra == "dev"
@@ -91,14 +89,11 @@ Dynamic: summary
 
 <h3 align="center">The Python implementation of the libp2p networking stack.</h3>
 
-[![Join the chat at https://gitter.im/py-libp2p/Lobby](https://badges.gitter.im/py-libp2p/Lobby.png)](https://gitter.im/py-libp2p/Lobby)
-[![Build Status](https://circleci.com/gh/libp2p/py-libp2p.svg?style=shield)](https://circleci.com/gh/libp2p/py-libp2p)
+[![Discord](https://img.shields.io/discord/1204447718093750272?color=blueviolet&label=discord)](https://discord.gg/hQJnbd85N6)
 [![PyPI version](https://badge.fury.io/py/libp2p.svg)](https://badge.fury.io/py/libp2p)
 [![Python versions](https://img.shields.io/pypi/pyversions/libp2p.svg)](https://pypi.python.org/pypi/libp2p)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/libp2p/py-libp2p/tox.yml?branch=main&label=build%20status)](https://github.com/libp2p/py-libp2p/actions/workflows/tox.yml)
 [![Docs build](https://readthedocs.org/projects/py-libp2p/badge/?version=latest)](http://py-libp2p.readthedocs.io/en/latest/?badge=latest)
-[![Freenode](https://img.shields.io/badge/freenode-%23libp2p-yellow.svg)](https://webchat.freenode.net/?channels=%23libp2p)
-[![Matrix](https://img.shields.io/badge/matrix-%23libp2p%3Apermaweb.io-blue.svg)](https://riot.permaweb.io/#/room/#libp2p:permaweb.io)
-[![Discord](https://img.shields.io/discord/475789330380488707?color=blueviolet&label=discord)](https://discord.gg/66KBrm2)
 
 > ⚠️ **Warning:** py-libp2p is an experimental and work-in-progress repo under development. We do not yet recommend using py-libp2p in production environments.
 
@@ -194,10 +189,11 @@ ______________________________________________________________________
 
 ### General Purpose Utilities & Datatypes
 
-| **Utility/Datatype** | **Status** |                                 **Source**                                  |
-| -------------------- | :--------: | :-------------------------------------------------------------------------: |
-| **`libp2p-ping`**    |     ✅     | [source](https://github.com/libp2p/py-libp2p/blob/main/libp2p/host/ping.py) |
-| **`libp2p-peer`**    |     ✅     |     [source](https://github.com/libp2p/py-libp2p/tree/main/libp2p/peer)     |
+| **Utility/Datatype**  | **Status** |                                          **Source**                                          |
+| --------------------- | :--------: | :------------------------------------------------------------------------------------------: |
+| **`libp2p-ping`**     |     ✅     |         [source](https://github.com/libp2p/py-libp2p/blob/main/libp2p/host/ping.py)          |
+| **`libp2p-peer`**     |     ✅     |             [source](https://github.com/libp2p/py-libp2p/tree/main/libp2p/peer)              |
+| **`libp2p-identify`** |     ✅     | [source](https://github.com/libp2p/py-libp2p/blob/main/libp2p/identity/identify/identify.py) |
 
 ______________________________________________________________________
 

{libp2p-0.2.3 → libp2p-0.2.5}/README.md

@@ -6,14 +6,11 @@
 
 <h3 align="center">The Python implementation of the libp2p networking stack.</h3>
 
-[![Join the chat at https://gitter.im/py-libp2p/Lobby](https://badges.gitter.im/py-libp2p/Lobby.png)](https://gitter.im/py-libp2p/Lobby)
-[![Build Status](https://circleci.com/gh/libp2p/py-libp2p.svg?style=shield)](https://circleci.com/gh/libp2p/py-libp2p)
+[![Discord](https://img.shields.io/discord/1204447718093750272?color=blueviolet&label=discord)](https://discord.gg/hQJnbd85N6)
 [![PyPI version](https://badge.fury.io/py/libp2p.svg)](https://badge.fury.io/py/libp2p)
 [![Python versions](https://img.shields.io/pypi/pyversions/libp2p.svg)](https://pypi.python.org/pypi/libp2p)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/libp2p/py-libp2p/tox.yml?branch=main&label=build%20status)](https://github.com/libp2p/py-libp2p/actions/workflows/tox.yml)
 [![Docs build](https://readthedocs.org/projects/py-libp2p/badge/?version=latest)](http://py-libp2p.readthedocs.io/en/latest/?badge=latest)
-[![Freenode](https://img.shields.io/badge/freenode-%23libp2p-yellow.svg)](https://webchat.freenode.net/?channels=%23libp2p)
-[![Matrix](https://img.shields.io/badge/matrix-%23libp2p%3Apermaweb.io-blue.svg)](https://riot.permaweb.io/#/room/#libp2p:permaweb.io)
-[![Discord](https://img.shields.io/discord/475789330380488707?color=blueviolet&label=discord)](https://discord.gg/66KBrm2)
 
 > ⚠️ **Warning:** py-libp2p is an experimental and work-in-progress repo under development. We do not yet recommend using py-libp2p in production environments.
 
@@ -109,10 +106,11 @@ ______________________________________________________________________
 
 ### General Purpose Utilities & Datatypes
 
-| **Utility/Datatype** | **Status** |                                 **Source**                                  |
-| -------------------- | :--------: | :-------------------------------------------------------------------------: |
-| **`libp2p-ping`**    |     ✅     | [source](https://github.com/libp2p/py-libp2p/blob/main/libp2p/host/ping.py) |
-| **`libp2p-peer`**    |     ✅     |     [source](https://github.com/libp2p/py-libp2p/tree/main/libp2p/peer)     |
+| **Utility/Datatype**  | **Status** |                                          **Source**                                          |
+| --------------------- | :--------: | :------------------------------------------------------------------------------------------: |
+| **`libp2p-ping`**     |     ✅     |         [source](https://github.com/libp2p/py-libp2p/blob/main/libp2p/host/ping.py)          |
+| **`libp2p-peer`**     |     ✅     |             [source](https://github.com/libp2p/py-libp2p/tree/main/libp2p/peer)              |
+| **`libp2p-identify`** |     ✅     | [source](https://github.com/libp2p/py-libp2p/blob/main/libp2p/identity/identify/identify.py) |
 
 ______________________________________________________________________
 

libp2p-0.2.5/libp2p/crypto/ecc.py

@@ -0,0 +1,134 @@
+import sys
+
+from libp2p.crypto.keys import (
+    KeyPair,
+    KeyType,
+    PrivateKey,
+    PublicKey,
+)
+
+if sys.platform != "win32":
+    from fastecdsa import (
+        keys,
+        point,
+    )
+    from fastecdsa import curve as curve_types
+    from fastecdsa.encoding.sec1 import (
+        SEC1Encoder,
+    )
+else:
+    from coincurve import PrivateKey as CPrivateKey
+    from coincurve import PublicKey as CPublicKey
+
+
+def infer_local_type(curve: str) -> object:
+    """
+    Convert a str representation of some elliptic curve to a
+    representation understood by the backend of this module.
+    """
+    if curve != "P-256":
+        raise NotImplementedError("Only P-256 curve is supported")
+
+    if sys.platform != "win32":
+        return curve_types.P256
+    return "P-256"  # coincurve only supports P-256
+
+
+if sys.platform != "win32":
+
+    class ECCPublicKey(PublicKey):
+        def __init__(self, impl: point.Point, curve: curve_types.Curve) -> None:
+            self.impl = impl
+            self.curve = curve
+
+        def to_bytes(self) -> bytes:
+            return SEC1Encoder.encode_public_key(self.impl, compressed=False)
+
+        @classmethod
+        def from_bytes(cls, data: bytes, curve: str) -> "ECCPublicKey":
+            curve_type = infer_local_type(curve)
+            public_key_impl = SEC1Encoder.decode_public_key(data, curve_type)
+            return cls(public_key_impl, curve_type)
+
+        def get_type(self) -> KeyType:
+            return KeyType.ECC_P256
+
+        def verify(self, data: bytes, signature: bytes) -> bool:
+            raise NotImplementedError()
+
+    class ECCPrivateKey(PrivateKey):
+        def __init__(self, impl: int, curve: curve_types.Curve) -> None:
+            self.impl = impl
+            self.curve = curve
+
+        @classmethod
+        def new(cls, curve: str) -> "ECCPrivateKey":
+            curve_type = infer_local_type(curve)
+            private_key_impl = keys.gen_private_key(curve_type)
+            return cls(private_key_impl, curve_type)
+
+        def to_bytes(self) -> bytes:
+            return keys.export_key(self.impl, self.curve)
+
+        def get_type(self) -> KeyType:
+            return KeyType.ECC_P256
+
+        def sign(self, data: bytes) -> bytes:
+            raise NotImplementedError()
+
+        def get_public_key(self) -> PublicKey:
+            public_key_impl = keys.get_public_key(self.impl, self.curve)
+            return ECCPublicKey(public_key_impl, self.curve)
+
+else:
+
+    class ECCPublicKey(PublicKey):
+        def __init__(self, impl: CPublicKey, curve: str) -> None:
+            self.impl = impl
+            self.curve = curve
+
+        def to_bytes(self) -> bytes:
+            return self.impl.format(compressed=False)
+
+        @classmethod
+        def from_bytes(cls, data: bytes, curve: str) -> "ECCPublicKey":
+            curve_type = infer_local_type(curve)
+            return cls(CPublicKey(data), curve_type)  # type: ignore[arg-type]
+
+        def get_type(self) -> KeyType:
+            return KeyType.ECC_P256
+
+        def verify(self, data: bytes, signature: bytes) -> bool:
+            raise NotImplementedError()
+
+    class ECCPrivateKey(PrivateKey):
+        def __init__(self, impl: CPrivateKey, curve: str) -> None:
+            self.impl = impl
+            self.curve = curve
+
+        @classmethod
+        def new(cls, curve: str) -> "ECCPrivateKey":
+            curve_type = infer_local_type(curve)
+            return cls(CPrivateKey(), curve_type)  # type: ignore[arg-type]
+
+        def to_bytes(self) -> bytes:
+            return self.impl.secret
+
+        def get_type(self) -> KeyType:
+            return KeyType.ECC_P256
+
+        def sign(self, data: bytes) -> bytes:
+            raise NotImplementedError()
+
+        def get_public_key(self) -> PublicKey:
+            return ECCPublicKey(self.impl.public_key, self.curve)
+
+
+def create_new_key_pair(curve: str) -> KeyPair:
+    """
+    Return a new ECC keypair with the requested curve type, e.g.
+    "P-256".
+    """
+    private_key = ECCPrivateKey.new(curve)
+    public_key = private_key.get_public_key()
+    return KeyPair(private_key, public_key)

libp2p-0.2.5/libp2p/crypto/key_exchange.py

@@ -0,0 +1,59 @@
+import sys
+from typing import (
+    Callable,
+    cast,
+)
+
+if sys.platform != "win32":
+    from fastecdsa.encoding import (
+        util,
+    )
+
+    int_bytelen = util.int_bytelen
+else:
+    from math import (
+        ceil,
+        log2,
+    )
+
+    def int_bytelen(n: int) -> int:
+        if n == 0:
+            return 1
+        return ceil(log2(abs(n) + 1) / 8)
+
+
+from libp2p.crypto.ecc import (
+    ECCPrivateKey,
+    ECCPublicKey,
+    create_new_key_pair,
+)
+from libp2p.crypto.keys import (
+    PublicKey,
+)
+
+SharedKeyGenerator = Callable[[bytes], bytes]
+
+
+def create_ephemeral_key_pair(curve_type: str) -> tuple[PublicKey, SharedKeyGenerator]:
+    """Facilitates ECDH key exchange."""
+    if curve_type != "P-256":
+        raise NotImplementedError()
+
+    key_pair = create_new_key_pair(curve_type)
+
+    def _key_exchange(serialized_remote_public_key: bytes) -> bytes:
+        private_key = cast(ECCPrivateKey, key_pair.private_key)
+
+        remote_point = ECCPublicKey.from_bytes(serialized_remote_public_key, curve_type)
+
+        if sys.platform != "win32":
+            secret_point = remote_point.impl * private_key.impl
+            secret_x_coordinate = secret_point.x
+            byte_size = int_bytelen(secret_x_coordinate)
+            return secret_x_coordinate.to_bytes(byte_size, byteorder="big")
+        else:
+            # Windows implementation using coincurve
+            shared_key = private_key.impl.ecdh(remote_point.impl.public_key)
+            return shared_key
+
+    return key_pair.public_key, _key_exchange

{libp2p-0.2.3 → libp2p-0.2.5/libp2p.egg-info}/PKG-INFO

@@ -1,19 +1,18 @@
 Metadata-Version: 2.4
 Name: libp2p
-Version: 0.2.3
+Version: 0.2.5
 Summary: libp2p: The Python implementation of the libp2p networking stack
 Home-page: https://github.com/libp2p/py-libp2p
 Author: The Ethereum Foundation
 Author-email: snakecharmers@ethereum.org
-License: MIT/APACHE2.0
+License: MIT AND Apache-2.0
 Keywords: libp2p p2p
 Platform: unix
 Platform: linux
 Platform: osx
+Platform: win32
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -23,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9, <4
 Description-Content-Type: text/markdown
-License-File: LICENSE-APACHE
 License-File: LICENSE-MIT
+License-File: LICENSE-APACHE
 Requires-Dist: base58>=1.0.3
 Requires-Dist: coincurve>=10.0.0
 Requires-Dist: exceptiongroup>=1.2.0; python_version < "3.11"
@@ -39,8 +38,7 @@ Requires-Dist: pynacl>=1.3.0
 Requires-Dist: rpcudp>=3.0.0
 Requires-Dist: trio-typing>=0.0.4
 Requires-Dist: trio>=0.26.0
-Requires-Dist: fastecdsa-any==1.7.5; sys_platform == "win32"
-Requires-Dist: fastecdsa==1.7.5; sys_platform != "win32"
+Requires-Dist: fastecdsa==1.7.5
 Provides-Extra: dev
 Requires-Dist: build>=0.9.0; extra == "dev"
 Requires-Dist: bump_my_version>=0.19.0; extra == "dev"
@@ -91,14 +89,11 @@ Dynamic: summary
 
 <h3 align="center">The Python implementation of the libp2p networking stack.</h3>
 
-[![Join the chat at https://gitter.im/py-libp2p/Lobby](https://badges.gitter.im/py-libp2p/Lobby.png)](https://gitter.im/py-libp2p/Lobby)
-[![Build Status](https://circleci.com/gh/libp2p/py-libp2p.svg?style=shield)](https://circleci.com/gh/libp2p/py-libp2p)
+[![Discord](https://img.shields.io/discord/1204447718093750272?color=blueviolet&label=discord)](https://discord.gg/hQJnbd85N6)
 [![PyPI version](https://badge.fury.io/py/libp2p.svg)](https://badge.fury.io/py/libp2p)
 [![Python versions](https://img.shields.io/pypi/pyversions/libp2p.svg)](https://pypi.python.org/pypi/libp2p)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/libp2p/py-libp2p/tox.yml?branch=main&label=build%20status)](https://github.com/libp2p/py-libp2p/actions/workflows/tox.yml)
 [![Docs build](https://readthedocs.org/projects/py-libp2p/badge/?version=latest)](http://py-libp2p.readthedocs.io/en/latest/?badge=latest)
-[![Freenode](https://img.shields.io/badge/freenode-%23libp2p-yellow.svg)](https://webchat.freenode.net/?channels=%23libp2p)
-[![Matrix](https://img.shields.io/badge/matrix-%23libp2p%3Apermaweb.io-blue.svg)](https://riot.permaweb.io/#/room/#libp2p:permaweb.io)
-[![Discord](https://img.shields.io/discord/475789330380488707?color=blueviolet&label=discord)](https://discord.gg/66KBrm2)
 
 > ⚠️ **Warning:** py-libp2p is an experimental and work-in-progress repo under development. We do not yet recommend using py-libp2p in production environments.
 
@@ -194,10 +189,11 @@ ______________________________________________________________________
 
 ### General Purpose Utilities & Datatypes
 
-| **Utility/Datatype** | **Status** |                                 **Source**                                  |
-| -------------------- | :--------: | :-------------------------------------------------------------------------: |
-| **`libp2p-ping`**    |     ✅     | [source](https://github.com/libp2p/py-libp2p/blob/main/libp2p/host/ping.py) |
-| **`libp2p-peer`**    |     ✅     |     [source](https://github.com/libp2p/py-libp2p/tree/main/libp2p/peer)     |
+| **Utility/Datatype**  | **Status** |                                          **Source**                                          |
+| --------------------- | :--------: | :------------------------------------------------------------------------------------------: |
+| **`libp2p-ping`**     |     ✅     |         [source](https://github.com/libp2p/py-libp2p/blob/main/libp2p/host/ping.py)          |
+| **`libp2p-peer`**     |     ✅     |             [source](https://github.com/libp2p/py-libp2p/tree/main/libp2p/peer)              |
+| **`libp2p-identify`** |     ✅     | [source](https://github.com/libp2p/py-libp2p/blob/main/libp2p/identity/identify/identify.py) |
 
 ______________________________________________________________________
 

{libp2p-0.2.3 → libp2p-0.2.5}/libp2p.egg-info/entry_points.txt

@@ -3,3 +3,4 @@ chat-demo = examples.chat.chat:main
 echo-demo = examples.echo.echo:main
 identify-demo = examples.identify.identify:main
 ping-demo = examples.ping.ping:main
+pubsub-demo = examples.pubsub.pubsub:main

{libp2p-0.2.3 → libp2p-0.2.5}/libp2p.egg-info/requires.txt

@@ -11,16 +11,11 @@ pynacl>=1.3.0
 rpcudp>=3.0.0
 trio-typing>=0.0.4
 trio>=0.26.0
+fastecdsa==1.7.5
 
 [:python_version < "3.11"]
 exceptiongroup>=1.2.0
 
-[:sys_platform != "win32"]
-fastecdsa==1.7.5
-
-[:sys_platform == "win32"]
-fastecdsa-any==1.7.5
-
 [dev]
 build>=0.9.0
 bump_my_version>=0.19.0

{libp2p-0.2.3 → libp2p-0.2.5}/pyproject.toml

@@ -127,7 +127,7 @@ name = "Removals"
 showcontent = true
 
 [tool.bumpversion]
-current_version = "0.2.3"
+current_version = "0.2.5"
 parse = """
     (?P<major>\\d+)
     \\.(?P<minor>\\d+)

{libp2p-0.2.3 → libp2p-0.2.5}/setup.py

@@ -1,11 +1,19 @@
 #!/usr/bin/env python
-import os
+import sys
 
 from setuptools import (
     find_packages,
     setup,
 )
 
+description = "libp2p: The Python implementation of the libp2p networking stack"
+
+# Platform-specific dependencies
+if sys.platform == "win32":
+    crypto_requires = []  # We'll use coincurve instead of fastecdsa on Windows
+else:
+    crypto_requires = ["fastecdsa==1.7.5"]
+
 extras_require = {
     "dev": [
         "build>=0.9.0",
@@ -35,23 +43,11 @@ extras_require["dev"] = (
     extras_require["dev"] + extras_require["docs"] + extras_require["test"]
 )
 
-fastecdsa = [
-    # No official fastecdsa==1.7.4,1.7.5 wheels for Windows, using a pypi package that includes
-    # the original library, but also windows-built wheels (32+64-bit) on those versions.
-    # Fixme: Remove section when fastecdsa has released a windows-compatible wheel
-    #  (specifically: both win32 and win_amd64 targets)
-    #  See the following issues for more information;
-    #  https://github.com/libp2p/py-libp2p/issues/363
-    #  https://github.com/AntonKueltz/fastecdsa/issues/11
-    "fastecdsa-any==1.7.5;sys_platform=='win32'",
-    # Wheels are provided for these platforms, or compiling one is minimally frustrating in a
-    # default python installation.
-    "fastecdsa==1.7.5;sys_platform!='win32'",
-]
-
-with open("./README.md") as readme:
-    long_description = readme.read()
-
+try:
+    with open("./README.md", encoding="utf-8") as readme:
+        long_description = readme.read()
+except FileNotFoundError:
+    long_description = description
 
 install_requires = [
     "base58>=1.0.3",
@@ -70,19 +66,14 @@ install_requires = [
     "trio>=0.26.0",
 ]
 
-
-# NOTE: Some dependencies break RTD builds. We can not install system dependencies on the
-# RTD system so we have to exclude these dependencies when we are in an RTD environment.
-readthedocs_is_building = os.environ.get("READTHEDOCS", False)
-if not readthedocs_is_building:
-    install_requires.extend(fastecdsa)
-
+# Add platform-specific dependencies
+install_requires.extend(crypto_requires)
 
 setup(
     name="libp2p",
     # *IMPORTANT*: Don't manually change the version here. See Contributing docs for the release process.
-    version="0.2.3",
-    description="""libp2p: The Python implementation of the libp2p networking stack""",
+    version="0.2.5",
+    description=description,
     long_description=long_description,
     long_description_content_type="text/markdown",
     author="The Ethereum Foundation",
@@ -93,7 +84,8 @@ setup(
     python_requires=">=3.9, <4",
     extras_require=extras_require,
     py_modules=["libp2p"],
-    license="MIT/APACHE2.0",
+    license="MIT AND Apache-2.0",
+    license_files=("LICENSE-MIT", "LICENSE-APACHE"),
     zip_safe=False,
     keywords="libp2p p2p",
     packages=find_packages(exclude=["scripts", "scripts.*", "tests", "tests.*"]),
@@ -101,8 +93,6 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
-        "License :: OSI Approved :: MIT License",
-        "License :: OSI Approved :: Apache Software License",
         "Natural Language :: English",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.9",
@@ -111,13 +101,14 @@ setup(
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
     ],
-    platforms=["unix", "linux", "osx"],
+    platforms=["unix", "linux", "osx", "win32"],
     entry_points={
         "console_scripts": [
             "chat-demo=examples.chat.chat:main",
             "echo-demo=examples.echo.echo:main",
             "ping-demo=examples.ping.ping:main",
             "identify-demo=examples.identify.identify:main",
+            "pubsub-demo=examples.pubsub.pubsub:main",
         ],
     },
 )

{libp2p-0.2.3 → libp2p-0.2.5}/tests/core/examples/test_examples.py

@@ -1,12 +1,24 @@
 import pytest
 import trio
 
+from libp2p.custom_types import (
+    TProtocol,
+)
 from libp2p.host.exceptions import (
     StreamFailure,
 )
 from libp2p.peer.peerinfo import (
     info_from_p2p_addr,
 )
+from libp2p.pubsub.gossipsub import (
+    GossipSub,
+)
+from libp2p.pubsub.pubsub import (
+    Pubsub,
+)
+from libp2p.tools.async_service.trio_service import (
+    background_trio_service,
+)
 from libp2p.tools.utils import (
     MAX_READ_LEN,
 )
@@ -17,6 +29,8 @@ from tests.utils.factories import (
 CHAT_PROTOCOL_ID = "/chat/1.0.0"
 ECHO_PROTOCOL_ID = "/echo/1.0.0"
 PING_PROTOCOL_ID = "/ipfs/ping/1.0.0"
+GOSSIPSUB_PROTOCOL_ID = TProtocol("/meshsub/1.0.0")
+PUBSUB_TEST_TOPIC = "test-pubsub-topic"
 
 
 async def hello_world(host_a, host_b):
@@ -185,6 +199,53 @@ async def ping_demo(host_a, host_b):
     assert response == ping_data
 
 
+async def pubsub_demo(host_a, host_b):
+    gossipsub_a = GossipSub([GOSSIPSUB_PROTOCOL_ID], 3, 2, 4, 0.1, 1)
+    gossipsub_b = GossipSub([GOSSIPSUB_PROTOCOL_ID], 3, 2, 4, 0.1, 1)
+    pubsub_a = Pubsub(host_a, gossipsub_a)
+    pubsub_b = Pubsub(host_b, gossipsub_b)
+    message_a_to_b = "Hello from A to B"
+    b_received = trio.Event()
+    received_by_b = None
+
+    async def handle_subscription_b(subscription):
+        nonlocal received_by_b
+        message = await subscription.get()
+        received_by_b = message.data.decode("utf-8")
+        print(f"Host B received: {received_by_b}")
+        b_received.set()
+
+    async with background_trio_service(pubsub_a):
+        async with background_trio_service(pubsub_b):
+            async with background_trio_service(gossipsub_a):
+                async with background_trio_service(gossipsub_b):
+                    await pubsub_a.wait_until_ready()
+                    await pubsub_b.wait_until_ready()
+
+                    listen_addrs_b = host_b.get_addrs()
+                    peer_info_b = info_from_p2p_addr(listen_addrs_b[0])
+                    try:
+                        await pubsub_a.host.connect(peer_info_b)
+                        print("Connection attempt completed")
+                    except Exception as e:
+                        print(f"Connection error: {e}")
+                        raise
+
+                    subscription_b = await pubsub_b.subscribe(PUBSUB_TEST_TOPIC)
+                    async with trio.open_nursery() as nursery:
+                        nursery.start_soon(handle_subscription_b, subscription_b)
+                        await trio.sleep(0.1)
+                        await pubsub_a.publish(
+                            PUBSUB_TEST_TOPIC, message_a_to_b.encode()
+                        )
+                        with trio.move_on_after(3):
+                            await b_received.wait()
+                        nursery.cancel_scope.cancel()
+
+    assert received_by_b == message_a_to_b
+    assert b_received.is_set()
+
+
 @pytest.mark.parametrize(
     "test",
     [
@@ -195,6 +256,7 @@ async def ping_demo(host_a, host_b):
         chat_demo,
         echo_demo,
         ping_demo,
+        pubsub_demo,
     ],
 )
 @pytest.mark.trio
@@ -203,8 +265,9 @@ async def test_protocols(test, security_protocol):
     async with HostFactory.create_batch_and_listen(
         2, security_protocol=security_protocol
     ) as hosts:
-        addr = hosts[0].get_addrs()[0]
-        info = info_from_p2p_addr(addr)
-        await hosts[1].connect(info)
+        if test != pubsub_demo:
+            addr = hosts[0].get_addrs()[0]
+            info = info_from_p2p_addr(addr)
+            await hosts[1].connect(info)
 
         await test(hosts[0], hosts[1])

{libp2p-0.2.3 → libp2p-0.2.5}/tests/core/tools/timed_cache/test_timed_cache.py

@@ -31,16 +31,17 @@ async def test_simple_last_seen_cache():
     """Test that LastSeenCache correctly refreshes expiry when accessed."""
     cache = LastSeenCache(ttl=2, sweep_interval=1)
 
-    assert cache.add(MSG_1) is True  # First addition should return True
-    assert cache.has(MSG_1) is True  # Should exist
+    assert cache.add(MSG_1) is True
+    assert cache.has(MSG_1) is True
 
-    await trio.sleep(1)
-    assert cache.has(MSG_1) is True  # Accessing should extend TTL
+    await trio.sleep(2.5)  # Wait past TTL
 
-    await trio.sleep(1.5)  # Would have expired if TTL wasn't extended
-    assert cache.has(MSG_1) is True  # Should still exist
+    # Retry loop to ensure sweep happens
+    for _ in range(10):  # Up to 1 second extra
+        if not cache.has(MSG_1):
+            break
+        await trio.sleep(0.1)
 
-    await trio.sleep(2.5)  # Now let it expire
     assert cache.has(MSG_1) is False  # Should be expired
 
     cache.stop()