From f1bca99cb3d7ed964cd909e932ca442bb1688796 Mon Sep 17 00:00:00 2001 From: lassejaco Date: Fri, 27 Jan 2023 18:23:52 +0700 Subject: [PATCH 1/5] ci fix attempt --- pretix_eth/exporter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pretix_eth/exporter.py b/pretix_eth/exporter.py index 850c57eb..4c6b58c9 100644 --- a/pretix_eth/exporter.py +++ b/pretix_eth/exporter.py @@ -65,7 +65,7 @@ def payment_to_row(payment): completion_date, payment.state, fiat_amount, - Web3.fromWei(int(token_amount), 'ether'), + Web3.from_wei(int(token_amount), 'ether'), currency_type, sender_address, recipient_address, From e502718f16b69c48369f10ab04ef383b790f5e92 Mon Sep 17 00:00:00 2001 From: lassejaco Date: Fri, 27 Jan 2023 18:30:05 +0700 Subject: [PATCH 2/5] trigger build --- pretix_eth/exporter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pretix_eth/exporter.py b/pretix_eth/exporter.py index 4c6b58c9..a867b340 100644 --- a/pretix_eth/exporter.py +++ b/pretix_eth/exporter.py @@ -74,6 +74,7 @@ def payment_to_row(payment): token_address, token_rate, ] + return row From 51ecb0b3da3e41091226e8213cb87baa3c2a29e5 Mon Sep 17 00:00:00 2001 From: lassejaco Date: Fri, 27 Jan 2023 18:40:23 +0700 Subject: [PATCH 3/5] lint errors --- pretix_eth/management/commands/confirm_payments.py | 2 +- pretix_eth/network/tokens.py | 1 - pretix_eth/payment.py | 5 +++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pretix_eth/management/commands/confirm_payments.py b/pretix_eth/management/commands/confirm_payments.py index 79ff1805..a6dd6952 100644 --- a/pretix_eth/management/commands/confirm_payments.py +++ b/pretix_eth/management/commands/confirm_payments.py @@ -120,7 +120,7 @@ def confirm_payments_for_event(self, event: Event, no_dry_run, log_verbosity=0): f" hash={signed_message.transaction_hash} not found," f" skipping." ) - if signed_message.age > order_payment.payment_provider.settings.PAYMENT_NOT_RECIEVED_RETRY_TIMEOUT: + if signed_message.age > order_payment.payment_provider.settings.PAYMENT_NOT_RECIEVED_RETRY_TIMEOUT: # noqa: E501 signed_message.invalidate() continue diff --git a/pretix_eth/network/tokens.py b/pretix_eth/network/tokens.py index 2adf39f1..378b740a 100644 --- a/pretix_eth/network/tokens.py +++ b/pretix_eth/network/tokens.py @@ -428,7 +428,6 @@ def payment_instructions( } - class ETHArbitrum(Arbitrum): """ Ethereum on Arbitrum mainnet Network diff --git a/pretix_eth/payment.py b/pretix_eth/payment.py index a47116b3..04565796 100644 --- a/pretix_eth/payment.py +++ b/pretix_eth/payment.py @@ -118,13 +118,14 @@ def settings_form_fields(self): "Customers will be allowed to pay again after their previous payment " "hasn't arrived for a given time. 1800s (30min) is a reasonable starting value" ), - initial=30*60, + initial=30 * 60, ) ), ( "SAFETY_BLOCK_COUNT", forms.IntegerField( - label=_("Number of blocks to be mined after a transaction for it to be considered accepted by the chain."), + label=_( + "Number of blocks to be mined after a transaction for it to be considered accepted by the chain."), help_text=_( "Higher value means better protection from (hypothetical) double spending attacks, " "at the cost of payment confirmation latency." From 47940d5369ef82334371aecbf9cf90e256b4d6f7 Mon Sep 17 00:00:00 2001 From: lassejaco Date: Fri, 27 Jan 2023 18:43:22 +0700 Subject: [PATCH 4/5] no 3.11 --- .github/workflows/tox.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml index f816bf25..a7ac2e6c 100644 --- a/.github/workflows/tox.yaml +++ b/.github/workflows/tox.yaml @@ -26,10 +26,10 @@ jobs: toxenv: py310-core - python-version: "3.10" toxenv: py310-integration - - python-version: "3.11" - toxenv: py311-core - - python-version: "3.11" - toxenv: py311-integration + # - python-version: "3.11" + # toxenv: py311-core + # - python-version: "3.11" + # toxenv: py311-integration steps: - uses: actions/checkout@v2 From c6126527fde8b3e629ddcc3d9956c0ea4540db9d Mon Sep 17 00:00:00 2001 From: lassejaco Date: Fri, 27 Jan 2023 18:46:54 +0700 Subject: [PATCH 5/5] lint again --- pretix_eth/payment.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pretix_eth/payment.py b/pretix_eth/payment.py index 04565796..644f20ba 100644 --- a/pretix_eth/payment.py +++ b/pretix_eth/payment.py @@ -116,7 +116,7 @@ def settings_form_fields(self): label=_("Payment retry timeout in seconds"), help_text=_( "Customers will be allowed to pay again after their previous payment " - "hasn't arrived for a given time. 1800s (30min) is a reasonable starting value" + "hasn't arrived for a given time. 1800s (30min) is a reasonable starting value" # noqa: E501 ), initial=30 * 60, ) @@ -125,9 +125,9 @@ def settings_form_fields(self): "SAFETY_BLOCK_COUNT", forms.IntegerField( label=_( - "Number of blocks to be mined after a transaction for it to be considered accepted by the chain."), + "Number of blocks to be mined after a transaction for it to be considered accepted by the chain."), # noqa: E501 help_text=_( - "Higher value means better protection from (hypothetical) double spending attacks, " + "Higher value means better protection from (hypothetical) double spending attacks, " # noqa: E501 "at the cost of payment confirmation latency." ), initial=5,