Web3modal/walletconnect

.github/workflows/tox.yaml

@@ -26,35 +26,35 @@ 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
-    - uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    
-    - uses: actions/cache@v2
-      with:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - uses: actions/cache@v2
+        with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
-    - name: Install Dependencies
-      if: steps.cache.outputs.cache-hit != 'true'
-      run: |
-        python -m pip install --upgrade pip wheel setuptools
-        pip install -e .[dev] --use-deprecated=legacy-resolver
+      - name: Install Dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          python -m pip install --upgrade pip==23.1.2 wheel==0.40.0 setuptools==68.0.0
+          pip install -e .[dev] --use-deprecated=legacy-resolver
 
-    # TODO enable again after the protobuf version conflict between pretix and web3.py is resolved
-    #- name: Pip Check
-    #  run: pip check
+      # TODO enable again after the protobuf version conflict between pretix and web3.py is resolved
+      #- name: Pip Check
+      #  run: pip check
 
-    - name: ${{ matrix.toxenv }}
-      run: tox 
-      env: 
-        TOXENV: ${{ matrix.toxenv }}
+      - name: ${{ matrix.toxenv }}
+        run: tox
+        env:
+          TOXENV: ${{ matrix.toxenv }}

.gitignore

@@ -71,4 +71,7 @@ data/
 .vscode
 /.idea
 
-venv
+venv
+
+node_modules
+.DS_Store

pretix_eth/__init__.py

@@ -1,21 +1 @@
-from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy
-
-
-class PluginApp(AppConfig):
-    name = 'pretix_eth'
-    verbose_name = 'Pretix Ethereum Payment Provider'
-
-    class PretixPluginMeta:
-        name = ugettext_lazy('Pretix Ethereum Payment Provider')
-        author = 'Pretix Ethereum Payment Plugin Contributors'
-        category = 'PAYMENT'
-        description = ugettext_lazy('An ethereum payment provider plugin for pretix software')
-        visible = True
-        version = '2.0.6-dev'
-
-    def ready(self):
-        from . import signals  # NOQA
-
-
-default_app_config = 'pretix_eth.PluginApp'
+__version__ = "3.0.0-dev"

pretix_eth/apps.py

@@ -0,0 +1,20 @@
+from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
+
+from . import __version__
+
+
+class EthApp(AppConfig):
+    name = 'pretix_eth'
+    verbose_name = 'Pretix Ethereum Payment Provider'
+
+    class PretixPluginMeta:
+        name = _('Pretix Ethereum Payment Provider')
+        author = 'Pretix Ethereum Payment Plugin Contributors'
+        category = 'PAYMENT'
+        description = _('An ethereum payment provider plugin for pretix software')
+        visible = True
+        version = __version__
+
+    def ready(self):
+        from . import signals  # NOQA

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,
@@ -74,6 +74,7 @@ def payment_to_row(payment):
         token_address,
         token_rate,
     ]
+
     return row
 
 

pretix_eth/forms.py

@@ -1,7 +1,7 @@
 import re
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from pretix.control.forms import ExtFileField