Merge branch 'main' into pnet

Author: seetadev

FUNDING.json

@@ -0,0 +1,7 @@
+{
+  "drips": {
+    "filecoin": {
+      "ownedBy": "0x856c29E91eb30b8D9154a74a543dcC8D970D5D15"
+    }
+  }
+}

docs/conf.py

@@ -291,7 +291,12 @@
 ]
 
 # Prevent autodoc from trying to import module from tests.factories
-autodoc_mock_imports = ["tests.factories"]
+autodoc_mock_imports = [
+    "tests.factories",
+    # Mocked ONLY for Sphinx/autodoc: this module does not exist in the codebase
+    # but some doc tools may try to import it. No real code references this import.
+    "libp2p.relay.circuit_v2.lib"
+]
 
 # Documents to append as an appendix to all manuals.
 # texinfo_appendices = []

libp2p/relay/circuit_v2/discovery.py

@@ -27,6 +27,7 @@
 from libp2p.peer.id import (
     ID,
 )
+from libp2p.peer.peerstore import env_to_send_in_RPC
 from libp2p.tools.async_service import (
     Service,
 )
@@ -45,6 +46,9 @@
 from .protocol_buffer import (
     StatusCode,
 )
+from .utils import (
+    maybe_consume_signed_record,
+)
 
 logger = logging.getLogger("libp2p.relay.circuit_v2.discovery")
 
@@ -391,10 +395,13 @@ async def make_reservation(self, peer_id: ID) -> bool:
                 return False
 
             try:
+                # Prepare signed envelope
+                envelope_bytes, _ = env_to_send_in_RPC(self.host)
                 # Create and send reservation request
                 request = HopMessage(
                     type=HopMessage.RESERVE,
                     peer=self.host.get_id().to_bytes(),
+                    senderRecord=envelope_bytes,
                 )
 
                 with trio.fail_after(self.stream_timeout):
@@ -410,6 +417,17 @@ async def make_reservation(self, peer_id: ID) -> bool:
                     response = HopMessage()
                     response.ParseFromString(response_bytes)
 
+                    # Consume the source signed_peer_record if sent
+                    if response.HasField("senderRecord"):
+                        if not maybe_consume_signed_record(
+                            response, self.host, peer_id
+                        ):
+                            logger.error(
+                                "Received invalid senderRecord, dropping the stream"
+                            )
+                            await stream.close()
+                            return False
+
                     # Check if reservation was successful
                     if response.type == HopMessage.RESERVE and response.HasField(
                         "status"

libp2p/relay/circuit_v2/pb/circuit.proto

@@ -15,6 +15,7 @@ message HopMessage {
   Reservation reservation = 3;
   Limit limit = 4;
   Status status = 5;
+  optional bytes senderRecord = 6;  // Envelope(PeerRecord)
 }
 
 message StopMessage {
@@ -26,6 +27,7 @@ message StopMessage {
   Type type = 1;
   bytes peer = 2;
   Status status = 3;
+  optional bytes senderRecord = 4;   // Envelope(PeerRecord) encoded
 }
 
 message Reservation {