Fix: Circuit Relay v2 connect destination peer without active reservation.

libp2p/relay/circuit_v2/pb/circuit.proto

@@ -49,6 +49,7 @@ message Status {
     PERMISSION_DENIED = 102;
     CONNECTION_FAILED = 200;
     DIAL_REFUSED = 201;
+    NO_RESERVATION = 204;
     STOP_FAILED = 300;
     MALFORMED_MESSAGE = 400;
   }

libp2p/relay/circuit_v2/pb/circuit_pb2.pyi

@@ -3,32 +3,32 @@
 isort:skip_file
 """
 
-import builtins
-import google.protobuf.descriptor
-import google.protobuf.internal.enum_type_wrapper
-import google.protobuf.message
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+import builtins as _builtins
 import sys
-import typing
+import typing as _typing
 
-if sys.version_info >= (3, 10):
-    import typing as typing_extensions
+if sys.version_info >= (3, 11):
+    from typing import TypeAlias as _TypeAlias, Never as _Never
 else:
-    import typing_extensions
+    from typing_extensions import TypeAlias as _TypeAlias, Never as _Never
 
-DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
+DESCRIPTOR: _descriptor.FileDescriptor
 
-@typing.final
-class HopMessage(google.protobuf.message.Message):
+@_typing.final
+class HopMessage(_message.Message):
     """Circuit v2 message types"""
 
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+    DESCRIPTOR: _descriptor.Descriptor
 
     class _Type:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
+        ValueType = _typing.NewType("ValueType", _builtins.int)
+        V: _TypeAlias = ValueType  # noqa: Y015
 
-    class _TypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[HopMessage._Type.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
+    class _TypeEnumTypeWrapper(_enum_type_wrapper._EnumTypeWrapper[HopMessage._Type.ValueType], _builtins.type):
+        DESCRIPTOR: _descriptor.EnumDescriptor
         RESERVE: HopMessage._Type.ValueType  # 0
         CONNECT: HopMessage._Type.ValueType  # 1
         STATUS: HopMessage._Type.ValueType  # 2
@@ -38,134 +38,151 @@ class HopMessage(google.protobuf.message.Message):
     CONNECT: HopMessage.Type.ValueType  # 1
     STATUS: HopMessage.Type.ValueType  # 2
 
-    TYPE_FIELD_NUMBER: builtins.int
-    PEER_FIELD_NUMBER: builtins.int
-    RESERVATION_FIELD_NUMBER: builtins.int
-    LIMIT_FIELD_NUMBER: builtins.int
-    STATUS_FIELD_NUMBER: builtins.int
-    SENDERRECORD_FIELD_NUMBER: builtins.int
-    type: global___HopMessage.Type.ValueType
-    peer: builtins.bytes
-    senderRecord: builtins.bytes
+    TYPE_FIELD_NUMBER: _builtins.int
+    PEER_FIELD_NUMBER: _builtins.int
+    RESERVATION_FIELD_NUMBER: _builtins.int
+    LIMIT_FIELD_NUMBER: _builtins.int
+    STATUS_FIELD_NUMBER: _builtins.int
+    SENDERRECORD_FIELD_NUMBER: _builtins.int
+    type: Global___HopMessage.Type.ValueType
+    peer: _builtins.bytes
+    senderRecord: _builtins.bytes
     """Envelope(PeerRecord)"""
-    @property
-    def reservation(self) -> global___Reservation: ...
-    @property
-    def limit(self) -> global___Limit: ...
-    @property
-    def status(self) -> global___Status: ...
+    @_builtins.property
+    def reservation(self) -> Global___Reservation: ...
+    @_builtins.property
+    def limit(self) -> Global___Limit: ...
+    @_builtins.property
+    def status(self) -> Global___Status: ...
     def __init__(
         self,
         *,
-        type: global___HopMessage.Type.ValueType = ...,
-        peer: builtins.bytes = ...,
-        reservation: global___Reservation | None = ...,
-        limit: global___Limit | None = ...,
-        status: global___Status | None = ...,
-        senderRecord: builtins.bytes | None = ...,
+        type: Global___HopMessage.Type.ValueType = ...,
+        peer: _builtins.bytes = ...,
+        reservation: Global___Reservation | None = ...,
+        limit: Global___Limit | None = ...,
+        status: Global___Status | None = ...,
+        senderRecord: _builtins.bytes | None = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_senderRecord", b"_senderRecord", "limit", b"limit", "reservation", b"reservation", "senderRecord", b"senderRecord", "status", b"status"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_senderRecord", b"_senderRecord", "limit", b"limit", "peer", b"peer", "reservation", b"reservation", "senderRecord", b"senderRecord", "status", b"status", "type", b"type"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["_senderRecord", b"_senderRecord"]) -> typing.Literal["senderRecord"] | None: ...
+    _HasFieldArgType: _TypeAlias = _typing.Literal["_senderRecord", b"_senderRecord", "limit", b"limit", "reservation", b"reservation", "senderRecord", b"senderRecord", "status", b"status"]  # noqa: Y015
+    def HasField(self, field_name: _HasFieldArgType) -> _builtins.bool: ...
+    _ClearFieldArgType: _TypeAlias = _typing.Literal["_senderRecord", b"_senderRecord", "limit", b"limit", "peer", b"peer", "reservation", b"reservation", "senderRecord", b"senderRecord", "status", b"status", "type", b"type"]  # noqa: Y015
+    def ClearField(self, field_name: _ClearFieldArgType) -> None: ...
+    _WhichOneofReturnType__senderRecord: _TypeAlias = _typing.Literal["senderRecord"]  # noqa: Y015
+    _WhichOneofArgType__senderRecord: _TypeAlias = _typing.Literal["_senderRecord", b"_senderRecord"]  # noqa: Y015
+    def WhichOneof(self, oneof_group: _WhichOneofArgType__senderRecord) -> _WhichOneofReturnType__senderRecord | None: ...
 
-global___HopMessage = HopMessage
+Global___HopMessage: _TypeAlias = HopMessage  # noqa: Y015
 
-@typing.final
-class StopMessage(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+@_typing.final
+class StopMessage(_message.Message):
+    DESCRIPTOR: _descriptor.Descriptor
 
     class _Type:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
+        ValueType = _typing.NewType("ValueType", _builtins.int)
+        V: _TypeAlias = ValueType  # noqa: Y015
 
-    class _TypeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[StopMessage._Type.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
+    class _TypeEnumTypeWrapper(_enum_type_wrapper._EnumTypeWrapper[StopMessage._Type.ValueType], _builtins.type):
+        DESCRIPTOR: _descriptor.EnumDescriptor
         CONNECT: StopMessage._Type.ValueType  # 0
         STATUS: StopMessage._Type.ValueType  # 1
 
     class Type(_Type, metaclass=_TypeEnumTypeWrapper): ...
     CONNECT: StopMessage.Type.ValueType  # 0
     STATUS: StopMessage.Type.ValueType  # 1
 
-    TYPE_FIELD_NUMBER: builtins.int
-    PEER_FIELD_NUMBER: builtins.int
-    STATUS_FIELD_NUMBER: builtins.int
-    SENDERRECORD_FIELD_NUMBER: builtins.int
-    type: global___StopMessage.Type.ValueType
-    peer: builtins.bytes
-    senderRecord: builtins.bytes
+    TYPE_FIELD_NUMBER: _builtins.int
+    PEER_FIELD_NUMBER: _builtins.int
+    STATUS_FIELD_NUMBER: _builtins.int
+    SENDERRECORD_FIELD_NUMBER: _builtins.int
+    type: Global___StopMessage.Type.ValueType
+    peer: _builtins.bytes
+    senderRecord: _builtins.bytes
     """Envelope(PeerRecord) encoded"""
-    @property
-    def status(self) -> global___Status: ...
+    @_builtins.property
+    def status(self) -> Global___Status: ...
     def __init__(
         self,
         *,
-        type: global___StopMessage.Type.ValueType = ...,
-        peer: builtins.bytes = ...,
-        status: global___Status | None = ...,
-        senderRecord: builtins.bytes | None = ...,
+        type: Global___StopMessage.Type.ValueType = ...,
+        peer: _builtins.bytes = ...,
+        status: Global___Status | None = ...,
+        senderRecord: _builtins.bytes | None = ...,
     ) -> None: ...
-    def HasField(self, field_name: typing.Literal["_senderRecord", b"_senderRecord", "senderRecord", b"senderRecord", "status", b"status"]) -> builtins.bool: ...
-    def ClearField(self, field_name: typing.Literal["_senderRecord", b"_senderRecord", "peer", b"peer", "senderRecord", b"senderRecord", "status", b"status", "type", b"type"]) -> None: ...
-    def WhichOneof(self, oneof_group: typing.Literal["_senderRecord", b"_senderRecord"]) -> typing.Literal["senderRecord"] | None: ...
-
-global___StopMessage = StopMessage
-
-@typing.final
-class Reservation(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    VOUCHER_FIELD_NUMBER: builtins.int
-    SIGNATURE_FIELD_NUMBER: builtins.int
-    EXPIRE_FIELD_NUMBER: builtins.int
-    voucher: builtins.bytes
-    signature: builtins.bytes
-    expire: builtins.int
+    _HasFieldArgType: _TypeAlias = _typing.Literal["_senderRecord", b"_senderRecord", "senderRecord", b"senderRecord", "status", b"status"]  # noqa: Y015
+    def HasField(self, field_name: _HasFieldArgType) -> _builtins.bool: ...
+    _ClearFieldArgType: _TypeAlias = _typing.Literal["_senderRecord", b"_senderRecord", "peer", b"peer", "senderRecord", b"senderRecord", "status", b"status", "type", b"type"]  # noqa: Y015
+    def ClearField(self, field_name: _ClearFieldArgType) -> None: ...
+    _WhichOneofReturnType__senderRecord: _TypeAlias = _typing.Literal["senderRecord"]  # noqa: Y015
+    _WhichOneofArgType__senderRecord: _TypeAlias = _typing.Literal["_senderRecord", b"_senderRecord"]  # noqa: Y015
+    def WhichOneof(self, oneof_group: _WhichOneofArgType__senderRecord) -> _WhichOneofReturnType__senderRecord | None: ...
+
+Global___StopMessage: _TypeAlias = StopMessage  # noqa: Y015
+
+@_typing.final
+class Reservation(_message.Message):
+    DESCRIPTOR: _descriptor.Descriptor
+
+    VOUCHER_FIELD_NUMBER: _builtins.int
+    SIGNATURE_FIELD_NUMBER: _builtins.int
+    EXPIRE_FIELD_NUMBER: _builtins.int
+    voucher: _builtins.bytes
+    signature: _builtins.bytes
+    expire: _builtins.int
     def __init__(
         self,
         *,
-        voucher: builtins.bytes = ...,
-        signature: builtins.bytes = ...,
-        expire: builtins.int = ...,
+        voucher: _builtins.bytes = ...,
+        signature: _builtins.bytes = ...,
+        expire: _builtins.int = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["expire", b"expire", "signature", b"signature", "voucher", b"voucher"]) -> None: ...
-
-global___Reservation = Reservation
-
-@typing.final
-class Limit(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
-
-    DURATION_FIELD_NUMBER: builtins.int
-    DATA_FIELD_NUMBER: builtins.int
-    duration: builtins.int
-    data: builtins.int
+    _HasFieldArgType: _TypeAlias = _Never  # noqa: Y015
+    def HasField(self, field_name: _HasFieldArgType) -> _builtins.bool: ...
+    _ClearFieldArgType: _TypeAlias = _typing.Literal["expire", b"expire", "signature", b"signature", "voucher", b"voucher"]  # noqa: Y015
+    def ClearField(self, field_name: _ClearFieldArgType) -> None: ...
+    def WhichOneof(self, oneof_group: _Never) -> None: ...
+
+Global___Reservation: _TypeAlias = Reservation  # noqa: Y015
+
+@_typing.final
+class Limit(_message.Message):
+    DESCRIPTOR: _descriptor.Descriptor
+
+    DURATION_FIELD_NUMBER: _builtins.int
+    DATA_FIELD_NUMBER: _builtins.int
+    duration: _builtins.int
+    data: _builtins.int
     def __init__(
         self,
         *,
-        duration: builtins.int = ...,
-        data: builtins.int = ...,
+        duration: _builtins.int = ...,
+        data: _builtins.int = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["data", b"data", "duration", b"duration"]) -> None: ...
+    _HasFieldArgType: _TypeAlias = _Never  # noqa: Y015
+    def HasField(self, field_name: _HasFieldArgType) -> _builtins.bool: ...
+    _ClearFieldArgType: _TypeAlias = _typing.Literal["data", b"data", "duration", b"duration"]  # noqa: Y015
+    def ClearField(self, field_name: _ClearFieldArgType) -> None: ...
+    def WhichOneof(self, oneof_group: _Never) -> None: ...
 
-global___Limit = Limit
+Global___Limit: _TypeAlias = Limit  # noqa: Y015
 
-@typing.final
-class Status(google.protobuf.message.Message):
-    DESCRIPTOR: google.protobuf.descriptor.Descriptor
+@_typing.final
+class Status(_message.Message):
+    DESCRIPTOR: _descriptor.Descriptor
 
     class _Code:
-        ValueType = typing.NewType("ValueType", builtins.int)
-        V: typing_extensions.TypeAlias = ValueType
+        ValueType = _typing.NewType("ValueType", _builtins.int)
+        V: _TypeAlias = ValueType  # noqa: Y015
 
-    class _CodeEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper._EnumTypeWrapper[Status._Code.ValueType], builtins.type):
-        DESCRIPTOR: google.protobuf.descriptor.EnumDescriptor
+    class _CodeEnumTypeWrapper(_enum_type_wrapper._EnumTypeWrapper[Status._Code.ValueType], _builtins.type):
+        DESCRIPTOR: _descriptor.EnumDescriptor
         OK: Status._Code.ValueType  # 0
         RESERVATION_REFUSED: Status._Code.ValueType  # 100
         RESOURCE_LIMIT_EXCEEDED: Status._Code.ValueType  # 101
         PERMISSION_DENIED: Status._Code.ValueType  # 102
         CONNECTION_FAILED: Status._Code.ValueType  # 200
         DIAL_REFUSED: Status._Code.ValueType  # 201
+        NO_RESERVATION: Status._Code.ValueType  # 204
         STOP_FAILED: Status._Code.ValueType  # 300
         MALFORMED_MESSAGE: Status._Code.ValueType  # 400
 
@@ -176,19 +193,24 @@ class Status(google.protobuf.message.Message):
     PERMISSION_DENIED: Status.Code.ValueType  # 102
     CONNECTION_FAILED: Status.Code.ValueType  # 200
     DIAL_REFUSED: Status.Code.ValueType  # 201
+    NO_RESERVATION: Status.Code.ValueType  # 204
     STOP_FAILED: Status.Code.ValueType  # 300
     MALFORMED_MESSAGE: Status.Code.ValueType  # 400
 
-    CODE_FIELD_NUMBER: builtins.int
-    MESSAGE_FIELD_NUMBER: builtins.int
-    code: global___Status.Code.ValueType
-    message: builtins.str
+    CODE_FIELD_NUMBER: _builtins.int
+    MESSAGE_FIELD_NUMBER: _builtins.int
+    code: Global___Status.Code.ValueType
+    message: _builtins.str
     def __init__(
         self,
         *,
-        code: global___Status.Code.ValueType = ...,
-        message: builtins.str = ...,
+        code: Global___Status.Code.ValueType = ...,
+        message: _builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["code", b"code", "message", b"message"]) -> None: ...
+    _HasFieldArgType: _TypeAlias = _Never  # noqa: Y015
+    def HasField(self, field_name: _HasFieldArgType) -> _builtins.bool: ...
+    _ClearFieldArgType: _TypeAlias = _typing.Literal["code", b"code", "message", b"message"]  # noqa: Y015
+    def ClearField(self, field_name: _ClearFieldArgType) -> None: ...
+    def WhichOneof(self, oneof_group: _Never) -> None: ...
 
-global___Status = Status
+Global___Status: _TypeAlias = Status  # noqa: Y015