Merge branch 'main' into chore01

Signed-off-by: varun-r-mallya <varunrmallya@gmail.com>

libp2p/relay/circuit_v2/transport.py

@@ -219,11 +219,25 @@ class CircuitV2Transport(ITransport):
             # Get a relay from the list of discovered relays
             relays = self.discovery.get_relays()
             if relays:
-                # TODO: Implement more sophisticated relay selection
+                # Prioritize relays with active reservations
-                # For now, just return the first available relay
+                relays_with_reservations = []
-                return relays[0]
+                other_relays = []
+
+                for relay_id in relays:
+                    relay_info = self.discovery.get_relay_info(relay_id)
+                    if relay_info and relay_info.has_reservation:
+                        relays_with_reservations.append(relay_id)
+                    else:
+                        other_relays.append(relay_id)
+
+                # Return first available relay with reservation, or fallback to others
+                if relays_with_reservations:
+                    return relays_with_reservations[
+                        attempts % len(relays_with_reservations)
+                    ]
+                elif other_relays:
+                    return other_relays[attempts % len(other_relays)]
 
-            # Wait and try discovery
             await trio.sleep(1)
             attempts += 1
 

newsfragments/732.deprecation.rst

@@ -1 +0,0 @@
-update cryptographic dependencies: pycryptodome to ≥3.19.1, pynacl to ≥1.5.0, coincurve to ≥21.0.0

pyproject.toml

@@ -17,7 +17,7 @@ maintainers = [
 ]
 dependencies = [
     "base58>=1.0.3",
-    "coincurve>=21.0.0",
+    "coincurve>=10.0.0",
     "exceptiongroup>=1.2.0; python_version < '3.11'",
     "grpcio>=1.41.0",
     "lru-dict>=1.1.6",
@@ -28,7 +28,7 @@ dependencies = [
     "protobuf>=4.25.0,<5.0.0",
     "pycryptodome>=3.9.2",
     "pymultihash>=0.8.2",
-    "pynacl>=1.5.0",
+    "pynacl>=1.3.0",
     "rpcudp>=3.0.0",
     "trio-typing>=0.0.4",
     "trio>=0.26.0",