diff --git a/contrib/requirements/requirements-hw.txt b/contrib/requirements/requirements-hw.txt index a8706d446..8b16d7839 100644 --- a/contrib/requirements/requirements-hw.txt +++ b/contrib/requirements/requirements-hw.txt @@ -29,7 +29,7 @@ pyserial>=3.5.0,<4.0.0 # prefer older protobuf (see #7922) # (pulled in via e.g. keepkey and bitbox02) -protobuf>=3.12,<4 +protobuf>=3.20,<4 # prefer older colorama to avoid needing hatchling # (pulled in via trezor -> click -> colorama) diff --git a/contrib/requirements/requirements.txt b/contrib/requirements/requirements.txt index 0f2dd7b5c..820e9cca0 100644 --- a/contrib/requirements/requirements.txt +++ b/contrib/requirements/requirements.txt @@ -1,5 +1,5 @@ qrcode -protobuf>=3.12,<4 +protobuf>=3.20,<4 qdarkstyle>=2.7 aiorpcx>=0.22.0,<0.23 aiohttp>=3.3.0,<4.0.0 diff --git a/electrum/paymentrequest_pb2.py b/electrum/paymentrequest_pb2.py index f5b2c3815..fe5c53b99 100644 --- a/electrum/paymentrequest_pb2.py +++ b/electrum/paymentrequest_pb2.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: paymentrequest.proto - +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database # @@protoc_insertion_point(imports) @@ -13,367 +13,24 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor.FileDescriptor( - name='paymentrequest.proto', - package='payments', - syntax='proto2', - serialized_options=b'\n\036org.bitcoin.protocols.paymentsB\006Protos', - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x14paymentrequest.proto\x12\x08payments\"+\n\x06Output\x12\x11\n\x06\x61mount\x18\x01 \x01(\x04:\x01\x30\x12\x0e\n\x06script\x18\x02 \x02(\x0c\"\xa3\x01\n\x0ePaymentDetails\x12\x15\n\x07network\x18\x01 \x01(\t:\x04main\x12!\n\x07outputs\x18\x02 \x03(\x0b\x32\x10.payments.Output\x12\x0c\n\x04time\x18\x03 \x02(\x04\x12\x0f\n\x07\x65xpires\x18\x04 \x01(\x04\x12\x0c\n\x04memo\x18\x05 \x01(\t\x12\x13\n\x0bpayment_url\x18\x06 \x01(\t\x12\x15\n\rmerchant_data\x18\x07 \x01(\x0c\"\x95\x01\n\x0ePaymentRequest\x12\"\n\x17payment_details_version\x18\x01 \x01(\r:\x01\x31\x12\x16\n\x08pki_type\x18\x02 \x01(\t:\x04none\x12\x10\n\x08pki_data\x18\x03 \x01(\x0c\x12\"\n\x1aserialized_payment_details\x18\x04 \x02(\x0c\x12\x11\n\tsignature\x18\x05 \x01(\x0c\"\'\n\x10X509Certificates\x12\x13\n\x0b\x63\x65rtificate\x18\x01 \x03(\x0c\"i\n\x07Payment\x12\x15\n\rmerchant_data\x18\x01 \x01(\x0c\x12\x14\n\x0ctransactions\x18\x02 \x03(\x0c\x12#\n\trefund_to\x18\x03 \x03(\x0b\x32\x10.payments.Output\x12\x0c\n\x04memo\x18\x04 \x01(\t\">\n\nPaymentACK\x12\"\n\x07payment\x18\x01 \x02(\x0b\x32\x11.payments.Payment\x12\x0c\n\x04memo\x18\x02 \x01(\tB(\n\x1eorg.bitcoin.protocols.paymentsB\x06Protos' -) - - - - -_OUTPUT = _descriptor.Descriptor( - name='Output', - full_name='payments.Output', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='amount', full_name='payments.Output.amount', index=0, - number=1, type=4, cpp_type=4, label=1, - has_default_value=True, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='script', full_name='payments.Output.script', index=1, - number=2, type=12, cpp_type=9, label=2, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=34, - serialized_end=77, -) - - -_PAYMENTDETAILS = _descriptor.Descriptor( - name='PaymentDetails', - full_name='payments.PaymentDetails', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='network', full_name='payments.PaymentDetails.network', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=True, default_value=b"main".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='outputs', full_name='payments.PaymentDetails.outputs', index=1, - number=2, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='time', full_name='payments.PaymentDetails.time', index=2, - number=3, type=4, cpp_type=4, label=2, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='expires', full_name='payments.PaymentDetails.expires', index=3, - number=4, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='memo', full_name='payments.PaymentDetails.memo', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='payment_url', full_name='payments.PaymentDetails.payment_url', index=5, - number=6, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='merchant_data', full_name='payments.PaymentDetails.merchant_data', index=6, - number=7, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=80, - serialized_end=243, -) - - -_PAYMENTREQUEST = _descriptor.Descriptor( - name='PaymentRequest', - full_name='payments.PaymentRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='payment_details_version', full_name='payments.PaymentRequest.payment_details_version', index=0, - number=1, type=13, cpp_type=3, label=1, - has_default_value=True, default_value=1, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='pki_type', full_name='payments.PaymentRequest.pki_type', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=True, default_value=b"none".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='pki_data', full_name='payments.PaymentRequest.pki_data', index=2, - number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='serialized_payment_details', full_name='payments.PaymentRequest.serialized_payment_details', index=3, - number=4, type=12, cpp_type=9, label=2, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='signature', full_name='payments.PaymentRequest.signature', index=4, - number=5, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=246, - serialized_end=395, -) - - -_X509CERTIFICATES = _descriptor.Descriptor( - name='X509Certificates', - full_name='payments.X509Certificates', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='certificate', full_name='payments.X509Certificates.certificate', index=0, - number=1, type=12, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=397, - serialized_end=436, -) - - -_PAYMENT = _descriptor.Descriptor( - name='Payment', - full_name='payments.Payment', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='merchant_data', full_name='payments.Payment.merchant_data', index=0, - number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='transactions', full_name='payments.Payment.transactions', index=1, - number=2, type=12, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='refund_to', full_name='payments.Payment.refund_to', index=2, - number=3, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='memo', full_name='payments.Payment.memo', index=3, - number=4, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=438, - serialized_end=543, -) - - -_PAYMENTACK = _descriptor.Descriptor( - name='PaymentACK', - full_name='payments.PaymentACK', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='payment', full_name='payments.PaymentACK.payment', index=0, - number=1, type=11, cpp_type=10, label=2, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='memo', full_name='payments.PaymentACK.memo', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto2', - extension_ranges=[], - oneofs=[ - ], - serialized_start=545, - serialized_end=607, -) - -_PAYMENTDETAILS.fields_by_name['outputs'].message_type = _OUTPUT -_PAYMENT.fields_by_name['refund_to'].message_type = _OUTPUT -_PAYMENTACK.fields_by_name['payment'].message_type = _PAYMENT -DESCRIPTOR.message_types_by_name['Output'] = _OUTPUT -DESCRIPTOR.message_types_by_name['PaymentDetails'] = _PAYMENTDETAILS -DESCRIPTOR.message_types_by_name['PaymentRequest'] = _PAYMENTREQUEST -DESCRIPTOR.message_types_by_name['X509Certificates'] = _X509CERTIFICATES -DESCRIPTOR.message_types_by_name['Payment'] = _PAYMENT -DESCRIPTOR.message_types_by_name['PaymentACK'] = _PAYMENTACK -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -Output = _reflection.GeneratedProtocolMessageType('Output', (_message.Message,), { - 'DESCRIPTOR' : _OUTPUT, - '__module__' : 'paymentrequest_pb2' - # @@protoc_insertion_point(class_scope:payments.Output) - }) -_sym_db.RegisterMessage(Output) - -PaymentDetails = _reflection.GeneratedProtocolMessageType('PaymentDetails', (_message.Message,), { - 'DESCRIPTOR' : _PAYMENTDETAILS, - '__module__' : 'paymentrequest_pb2' - # @@protoc_insertion_point(class_scope:payments.PaymentDetails) - }) -_sym_db.RegisterMessage(PaymentDetails) - -PaymentRequest = _reflection.GeneratedProtocolMessageType('PaymentRequest', (_message.Message,), { - 'DESCRIPTOR' : _PAYMENTREQUEST, - '__module__' : 'paymentrequest_pb2' - # @@protoc_insertion_point(class_scope:payments.PaymentRequest) - }) -_sym_db.RegisterMessage(PaymentRequest) - -X509Certificates = _reflection.GeneratedProtocolMessageType('X509Certificates', (_message.Message,), { - 'DESCRIPTOR' : _X509CERTIFICATES, - '__module__' : 'paymentrequest_pb2' - # @@protoc_insertion_point(class_scope:payments.X509Certificates) - }) -_sym_db.RegisterMessage(X509Certificates) - -Payment = _reflection.GeneratedProtocolMessageType('Payment', (_message.Message,), { - 'DESCRIPTOR' : _PAYMENT, - '__module__' : 'paymentrequest_pb2' - # @@protoc_insertion_point(class_scope:payments.Payment) - }) -_sym_db.RegisterMessage(Payment) - -PaymentACK = _reflection.GeneratedProtocolMessageType('PaymentACK', (_message.Message,), { - 'DESCRIPTOR' : _PAYMENTACK, - '__module__' : 'paymentrequest_pb2' - # @@protoc_insertion_point(class_scope:payments.PaymentACK) - }) -_sym_db.RegisterMessage(PaymentACK) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14paymentrequest.proto\x12\x08payments\"+\n\x06Output\x12\x11\n\x06\x61mount\x18\x01 \x01(\x04:\x01\x30\x12\x0e\n\x06script\x18\x02 \x02(\x0c\"\xa3\x01\n\x0ePaymentDetails\x12\x15\n\x07network\x18\x01 \x01(\t:\x04main\x12!\n\x07outputs\x18\x02 \x03(\x0b\x32\x10.payments.Output\x12\x0c\n\x04time\x18\x03 \x02(\x04\x12\x0f\n\x07\x65xpires\x18\x04 \x01(\x04\x12\x0c\n\x04memo\x18\x05 \x01(\t\x12\x13\n\x0bpayment_url\x18\x06 \x01(\t\x12\x15\n\rmerchant_data\x18\x07 \x01(\x0c\"\x95\x01\n\x0ePaymentRequest\x12\"\n\x17payment_details_version\x18\x01 \x01(\r:\x01\x31\x12\x16\n\x08pki_type\x18\x02 \x01(\t:\x04none\x12\x10\n\x08pki_data\x18\x03 \x01(\x0c\x12\"\n\x1aserialized_payment_details\x18\x04 \x02(\x0c\x12\x11\n\tsignature\x18\x05 \x01(\x0c\"\'\n\x10X509Certificates\x12\x13\n\x0b\x63\x65rtificate\x18\x01 \x03(\x0c\"i\n\x07Payment\x12\x15\n\rmerchant_data\x18\x01 \x01(\x0c\x12\x14\n\x0ctransactions\x18\x02 \x03(\x0c\x12#\n\trefund_to\x18\x03 \x03(\x0b\x32\x10.payments.Output\x12\x0c\n\x04memo\x18\x04 \x01(\t\">\n\nPaymentACK\x12\"\n\x07payment\x18\x01 \x02(\x0b\x32\x11.payments.Payment\x12\x0c\n\x04memo\x18\x02 \x01(\tB(\n\x1eorg.bitcoin.protocols.paymentsB\x06Protos') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'paymentrequest_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: -DESCRIPTOR._options = None + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\n\036org.bitcoin.protocols.paymentsB\006Protos' + _OUTPUT._serialized_start=34 + _OUTPUT._serialized_end=77 + _PAYMENTDETAILS._serialized_start=80 + _PAYMENTDETAILS._serialized_end=243 + _PAYMENTREQUEST._serialized_start=246 + _PAYMENTREQUEST._serialized_end=395 + _X509CERTIFICATES._serialized_start=397 + _X509CERTIFICATES._serialized_end=436 + _PAYMENT._serialized_start=438 + _PAYMENT._serialized_end=543 + _PAYMENTACK._serialized_start=545 + _PAYMENTACK._serialized_end=607 # @@protoc_insertion_point(module_scope)