Linter complaints

mikulas-mrva · mikulas-mrva · commit 58f394afd3c8 · 2022-09-30T18:03:57.000+02:00
diff --git a/pretix_eth/management/commands/confirm_payments.py b/pretix_eth/management/commands/confirm_payments.py
@@ -58,11 +58,17 @@ def confirm_payments_for_event(self, event: Event, no_dry_run, log_verbosity=0):
                 )
             )
             if log_verbosity > 0:
-                logger.info(f" * Found {unconfirmed_order_payments.count()} unconfirmed order payments")
+                logger.info(
+                    f" * Found {unconfirmed_order_payments.count()} "
+                    f"unconfirmed order payments"
+                )
 
         for order_payment in unconfirmed_order_payments:
             if log_verbosity > 0:
-                logger.info(f" * trying to confirm payment: {order_payment} (has {order_payment.signed_messages.all().count()} signed messages)")
+                logger.info(
+                    f" * trying to confirm payment: {order_payment} "
+                    f"(has {order_payment.signed_messages.all().count()} signed messages)"
+                )
             # it is tempting to put .filter(invalid=False) here, but remember
             # there is still a chance that low-gas txs are mined later on.
             for signed_message in order_payment.signed_messages.all():
@@ -89,44 +95,69 @@ def confirm_payments_for_event(self, event: Event, no_dry_run, log_verbosity=0):
                 # Get balance
                 w3 = Web3(load_provider_from_uri(network_rpc_url))
                 if log_verbosity > 0:
-                    logger.info(f"   * Looking for a receip for a transaction with hash={signed_message.transaction_hash}")
+                    logger.info(
+                        f"   * Looking for a receip for a transaction with "
+                        f"hash={signed_message.transaction_hash}"
+                    )
                 try:
                     receipt = w3.eth.getTransactionReceipt(signed_message.transaction_hash)
                 except TransactionNotFound:
                     if log_verbosity > 0:
-                        logger.info(f"   * Transaction hash={signed_message.transaction_hash} not found, skipping.")
-                    if signed_message.age > 30*60:
+                        logger.info(
+                            f"   * Transaction"
+                            f" hash={signed_message.transaction_hash} not found,"
+                            f" skipping."
+                        )
+                    if signed_message.age > 30 * 60:
                         signed_message.invalidate()
                     continue
 
                 if receipt.status == 0:
                     if log_verbosity > 0:
-                        logger.info(f"   * Transaction hash={signed_message.transaction_hash} was has status=0, invalidating.")
+                        logger.info(
+                            f"   * Transaction hash={signed_message.transaction_hash}"
+                            f" was has status=0, invalidating."
+                        )
                     signed_message.invalidate()
                     continue
 
                 block_number = receipt.blockNumber
 
-                if block_number is None or block_number + SAFETY_BLOCK_COUNT > w3.eth.get_block_number():
-                    logger.warning(f"  * Transfer found in a block that is too young, waiting until at least {SAFETY_BLOCK_COUNT} more blocks are confirmed.")
+                if (
+                        block_number is None
+                        or block_number + SAFETY_BLOCK_COUNT > w3.eth.get_block_number()
+                ):
+                    logger.warning(
+                        f"  * Transfer found in a block that is too young, "
+                        f"waiting until at least {SAFETY_BLOCK_COUNT} more blocks are confirmed."
+                    )
                     continue
 
                 if token.IS_NATIVE_ASSET:
                     # ETH
-                    payment_amount = w3.eth.getTransaction(signed_message.transaction_hash).value
+                    payment_amount = w3.eth.getTransaction(
+                        signed_message.transaction_hash).value
                     receipt_reciever = receipt.to.lower()
                     correct_recipient = receipt_reciever == signed_message.recipient_address.lower()
 
                 else:
                     # DAI
-                    contract = w3.eth.contract(address=token.ADDRESS, abi=TOKEN_ABI)
-                    transaction_details = contract.events.Transfer().processReceipt(receipt)[0].args
+                    contract = w3.eth.contract(address=token.ADDRESS,
+                                               abi=TOKEN_ABI)
+                    transaction_details = \
+                    contract.events.Transfer().processReceipt(receipt)[0].args
                     payment_amount = transaction_details.value
                     # check that the payment happened on the right contract address
                     correct_contract = token.ADDRESS.lower() == receipt.to.lower()
-                    # take recipient address from the topics, not from the "from" field, as that's the contract address
-                    receipt_reciever = receipt.logs[0].topics[2][12:].hex().lower()
-                    correct_recipient = correct_contract and (receipt_reciever == signed_message.recipient_address.lower())
+                    # take recipient address from the topics,
+                    # not from the "from" field, as that's the contract address
+                    receipt_reciever = receipt.logs[0].topics[2][
+                                       12:].hex().lower()
+                    correct_recipient = (
+                            correct_contract
+                            and (
+                                        receipt_reciever == signed_message.recipient_address.lower())
+                    )
 
 
                 receipt_sender = getattr(receipt, 'from').lower()
@@ -137,18 +168,26 @@ def confirm_payments_for_event(self, event: Event, no_dry_run, log_verbosity=0):
                         f"  * Transaction hash provided does not match correct sender and recipient"
                     )
                     if log_verbosity > 0:
-                        logger.info(f"receipt sender={receipt_sender}, expected sender={signed_message.sender_address.lower()}")
-                        logger.info(f"receipt recipient={receipt_reciever}, expected recipient={signed_message.recipient_address.lower()}")
+                        logger.info(
+                            f"receipt sender={receipt_sender}, "
+                            f"expected sender={signed_message.sender_address.lower()}"
+                        )
+                        logger.info(
+                            f"receipt recipient={receipt_reciever}, "
+                            f"expected recipient={signed_message.recipient_address.lower()}"
+                        )
                     continue
 
                 if payment_amount > 0:
                     logger.info(f"Payments found for {full_id} at {signed_message.sender_address}:")
                     if payment_amount < expected_amount:
                         logger.warning(
-                            f"  * Expected payment of at least {expected_amount} {token.TOKEN_SYMBOL}"
+                            f"  * Expected payment of at least"
+                            f" {expected_amount} {token.TOKEN_SYMBOL}"
                         )
                         logger.warning(
-                            f"  * Given payment was {payment_amount} {token.TOKEN_SYMBOL}"
+                            f"  * Given payment was"
+                            f" {payment_amount} {token.TOKEN_SYMBOL}"
                         )
                         logger.warning(f"  * Skipping")  # noqa: F541
                         continue
diff --git a/pretix_eth/models.py b/pretix_eth/models.py
@@ -13,7 +13,11 @@ class SignedMessage(models.Model):
     sender_address = models.CharField(max_length=42)
     recipient_address = models.CharField(max_length=42)
     chain_id = models.IntegerField()
-    order_payment = models.ForeignKey(to=OrderPayment, on_delete=models.CASCADE, related_name='signed_messages')
+    order_payment = models.ForeignKey(
+        to=OrderPayment,
+        on_delete=models.CASCADE,
+        related_name='signed_messages',
+    )
     transaction_hash = models.CharField(max_length=66, null=True)
     invalid = models.BooleanField(default=False)
     created_at = models.DateTimeField(editable=False, null=True)
diff --git a/pretix_eth/network/tokens.py b/pretix_eth/network/tokens.py
@@ -26,37 +26,40 @@
     },
     {
         "constant": False,
-        "inputs": [{"name": "_to", "type": "address"}, {"name": "_value", "type": "uint256"}],
+        "inputs": [
+            {"name": "_to", "type": "address"},
+            {"name": "_value", "type": "uint256"},
+        ],
         "name": "transfer",
         "outputs": [{"name": "", "type": "bool"}],
-        "type": "function"
+        "type": "function",
     },
     # Event
     {
-      "anonymous": False,
-      "inputs": [
-        {
-          "indexed": True,
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": True,
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": False,
-          "internalType": "uint256",
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event"
-    }
+        "anonymous": False,
+        "inputs": [
+            {
+                "indexed": True,
+                "internalType": "address",
+                "name": "from",
+                "type": "address",
+            },
+            {
+                "indexed": True,
+                "internalType": "address",
+                "name": "to",
+                "type": "address",
+            },
+            {
+                "indexed": False,
+                "internalType": "uint256",
+                "name": "value",
+                "type": "uint256",
+            },
+        ],
+        "name": "Transfer",
+        "type": "event",
+    },
 ]
 
 
@@ -163,13 +166,13 @@ def get_balance_of_address(self, hex_wallet_address, rpc_url):
 
     def get_transaction_link(self, transaction_hash: Optional[str]) -> Optional[
         str]:
-        return '{base}/tx/{hash}'.format(
+        return "{base}/tx/{hash}".format(
             base=self.EIP3091_EXPLORER_URL,
             hash=transaction_hash,
         )
 
     def get_address_link(self, address: Optional[str]) -> Optional[str]:
-        return '{base}/address/{address}'.format(
+        return "{base}/address/{address}".format(
             base=self.EIP3091_EXPLORER_URL,
             address=address,
         )
diff --git a/pretix_eth/payment.py b/pretix_eth/payment.py
@@ -18,7 +18,6 @@
 
 from eth_utils import from_wei
 
-#from .models import WalletAddress
 from .network.tokens import (
     IToken,
     registry,
@@ -215,7 +214,8 @@ def payment_prepare(self, request: HttpRequest, payment: OrderPayment):
         return False
 
     def payment_is_valid_session(self, request):
-        # Note: payment_currency_type check already done in token_verbose_name_to_token_network_id()
+        # Note: payment_currency_type check already done
+        # in token_verbose_name_to_token_network_id()
         return all(
             (
                 "payment_currency_type" in request.session,
@@ -225,7 +225,8 @@ def payment_is_valid_session(self, request):
         )
 
     def _payment_is_valid_info(self, payment: OrderPayment) -> bool:
-        # Note: payment_currency_type check already done in token_verbose_name_to_token_network_id()
+        # Note: payment_currency_type check already done
+        # in token_verbose_name_to_token_network_id()
         return all(
             (
                 "currency_type" in payment.info_data,
@@ -302,7 +303,8 @@ def payment_control_render(self, request: HttpRequest, payment: OrderPayment):
 
         hex_wallet_address = self.get_receiving_address()
 
-        # display all submitted transaction hashes along with their respective sendr and recipient addresses
+        # display all submitted transaction hashes along with
+        # their respective sendr and recipient addresses
         last_signed_message: SignedMessage = payment.signed_messages.last()
 
         if last_signed_message is not None:
@@ -343,4 +345,4 @@ def payment_partial_refund_supported(self, payment: OrderPayment):
         return self.payment_refund_supported(payment)
 
     def execute_refund(self, refund: OrderRefund):
-        raise Exception("Refunds are disabled for this payment provider for private key security reasons.")
+        raise Exception("Refunds are disabled for this payment provider.")
diff --git a/pretix_eth/serializers.py b/pretix_eth/serializers.py
@@ -8,11 +8,11 @@
 from pretix_eth.utils import get_message_to_sign
 
 
-
 class TransactionDetailsSerializer(Serializer):
     chain_id = fields.IntegerField()
     currency = fields.CharField()
-    erc20_contract_address = fields.CharField(allow_null=True)  # contract address for non-native currencies like DAI
+    # contract address for non-native ERC20 currencies like DAI
+    erc20_contract_address = fields.CharField(allow_null=True)
     recipient_address = fields.CharField()
     amount = fields.CharField()
     message = fields.CharField()
@@ -38,11 +38,12 @@ def to_representation(self, instance):
             "chain_id": token.CHAIN_ID,
             "network_identifier": token.NETWORK_IDENTIFIER,
             "currency": token.TOKEN_SYMBOL,
-            "erc20_contract_address":  token.ADDRESS,
+            "erc20_contract_address": token.ADDRESS,
             "recipient_address": recipient_address,
             "amount": str(instance.info_data.get('amount')),
             "message": get_message_to_sign(
-                sender_address=self.context.get('request').query_params.get('sender_address'),
+                sender_address=self.context.get('request').query_params.get(
+                    'sender_address'),
                 receiver_address=recipient_address,
                 chain_id=token.CHAIN_ID,
                 order_code=instance.order.code
diff --git a/pretix_eth/signals.py b/pretix_eth/signals.py
@@ -1,6 +1,4 @@
 from django.dispatch import receiver
-from django.urls import resolve, reverse
-from django.utils.translation import gettext_lazy as _
 from django.template.loader import get_template
 
 from pretix.base.middleware import _parse_csp, _merge_csp, _render_csp
@@ -9,17 +7,11 @@
     process_response,
 )
 from pretix.base.signals import (
-    logentry_display,
     register_payment_providers,
     register_data_exporters,
 )
 
-from pretix.control.signals import (
-    event_dashboard_widgets,
-    nav_event_settings,
-)
 from .exporter import EthereumOrdersExporter
-from . import models
 
 
 NUM_WIDGET = '<div class="numwidget"><span class="num">{num}</span><span class="text">{text}</span></div>'  # noqa: E501
@@ -36,12 +28,12 @@ def signal_process_response(sender, request, response, **kwargs):
         'style-src': [
             "'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='",
             "'sha256-O+AX3tWIOimhuzg+lrMfltcdtWo7Mp2Y9qJUkE6ysWE='",
-            "'sha256-loEB2lJVNc8mwYhvyJtb9aHD7kvSHU2kaRWkXHRpApY='",  # walletconnect-web3-provider-1.8.0.js
         ],
         'script-src': [
-            "'sha256-G0alWBi3d/qUeACYUzGOmJ34+fZaiiZaP2XpCEg7UFA='",  # web3modal-HOTFIX.js
-            "'sha256-loEB2lJVNc8mwYhvyJtb9aHD7kvSHU2kaRWkXHRpApY='",  # walletconnect-web3-provider-1.8.0.js
-            "'sha256-sqlmDxtDyZOFztnt94HoSfNbtRvmgNuCqYTRVVH6X3k='",  # web3.min-1.7.5.js
+            # web3modal-HOTFIX.js
+            "'sha256-G0alWBi3d/qUeACYUzGOmJ34+fZaiiZaP2XpCEg7UFA='",
+            # web3.min-1.7.5.js
+            "'sha256-sqlmDxtDyZOFztnt94HoSfNbtRvmgNuCqYTRVVH6X3k='",
         ],
         # Chrome correctly errors out without this CSP
         'connect-src': [
diff --git a/pretix_eth/utils.py b/pretix_eth/utils.py
@@ -8,12 +8,9 @@
 
 
 def get_message_to_sign(
-        sender_address: str,
-        receiver_address: str,
-        chain_id: int,
+        sender_address: str, receiver_address: str, chain_id: int,
         order_code: str
-    ):
-
+):
     message_structured = {
         "domain": {
             "chainId": chain_id,
@@ -49,17 +46,12 @@ def get_message_to_sign(
 
 
 def get_rpc_url_for_network(payment_provider, network_id):
-       rpc_urls = json.loads(
-           payment_provider.settings.NETWORK_RPC_URL
-       )
-
-       expected_network_rpc_url_key = f"{network_id}_RPC_URL"
+    rpc_urls = json.loads(payment_provider.settings.NETWORK_RPC_URL)
 
-       if expected_network_rpc_url_key in rpc_urls:
-           return rpc_urls[expected_network_rpc_url_key]
-       else:
-           logger.warning(
-               f"No RPC URL configured for {network_id}. Skipping..."
-           )
-           return None
+    expected_network_rpc_url_key = f"{network_id}_RPC_URL"
 
+    if expected_network_rpc_url_key in rpc_urls:
+        return rpc_urls[expected_network_rpc_url_key]
+    else:
+        logger.warning(f"No RPC URL configured for {network_id}. Skipping...")
+        return None
