Merge branch 'Polygant:master' into dev/force-kyc

Polygant · Jun 6, 2023 · 6771bd5 · 6771bd5
2 parents f0134c9 + 482fb76
commit 6771bd5
Show file tree

Hide file tree

Showing 72 changed files with 5,817 additions and 3,071 deletions.
diff --git a/admin_panel/forms.py b/admin_panel/forms.py
@@ -7,9 +7,9 @@
 from core.consts.currencies import CURRENCIES_LIST
 from core.currency import Currency
 from core.pairs import PAIRS_LIST
-from cryptocoins.tasks.eth import ethereum_manager
-from cryptocoins.tasks.trx import tron_manager
-from cryptocoins.tasks.bnb import bnb_manager
+from cryptocoins.coins.eth.ethereum import ethereum_manager
+from cryptocoins.coins.trx.tron import tron_manager
+from cryptocoins.coins.bnb.bnb import bnb_manager
 from lib.cipher import AESCoderDecoder
 
 CryptoBitcoin = Bitcoin()

diff --git a/admin_panel/views.py b/admin_panel/views.py
@@ -16,10 +16,7 @@
 from cryptocoins.coins.btc.service import BTCCoinService
 from cryptocoins.coins.eth import ETH_CURRENCY
 from cryptocoins.coins.trx import TRX_CURRENCY
-from cryptocoins.coins.usdt import USDT_CURRENCY
-from cryptocoins.tasks.eth import process_payouts as eth_process_payouts
-from cryptocoins.tasks.trx import process_payouts as trx_process_payouts
-from cryptocoins.tasks.bnb import process_payouts as bnb_process_payouts
+from cryptocoins.tasks.evm import process_payouts_task
 
 
 @staff_member_required
@@ -90,7 +87,7 @@ def admin_eth_withdrawal_request_approve(request):
         try:
             if form.is_valid():
                 password = form.cleaned_data.get('key')
-                eth_process_payouts.apply_async([password,])
+                process_payouts_task.apply_async(['ETH', password,], queue='eth_payouts')
                 messages.success(request, 'Withdrawals in processing')
                 return redirect('admin_withdrawal_request_approve_eth')  # need for clear post data
         except Exception as e:  # all messages and errors to admin message
@@ -122,7 +119,7 @@ def admin_trx_withdrawal_request_approve(request):
         try:
             if form.is_valid():
                 password = form.cleaned_data.get('key')
-                trx_process_payouts.apply_async([password, ])
+                process_payouts_task.apply_async(['TRX', password, ], queue='trx_payouts')
                 messages.success(request, 'Withdrawals in processing')
                 return redirect('admin_withdrawal_request_approve_trx')  # need for clear post data
         except Exception as e:  # all messages and errors to admin message
@@ -154,7 +151,7 @@ def admin_bnb_withdrawal_request_approve(request):
         try:
             if form.is_valid():
                 password = form.cleaned_data.get('key')
-                bnb_process_payouts.apply_async([password, ])
+                process_payouts_task.apply_async(['BNB', password, ], queue='bnb_payouts')
                 messages.success(request, 'Withdrawals in processing')
                 return redirect('admin_withdrawal_request_approve_bnb')  # need for clear post data
         except Exception as e:  # all messages and errors to admin message

diff --git a/admin_rest/__init__.py b/admin_rest/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'admin_rest.apps.AdminRestConfig'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		default_app_config = 'admin_rest.apps.AdminRestConfig'