Skip to content

Commit a9baff6

Browse files
Skip transfer from main account
1 parent f229a9f commit a9baff6

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

app/tasks.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,13 @@ def transfer_trc20_from(onetime_acc, symbol):
9898
precision = contract.functions.decimals()
9999

100100
main_priv_key, main_publ_key = get_key(KeyType.fee_deposit)
101+
102+
if onetime_acc == main_publ_key:
103+
logger.warning(
104+
"Transfer from main account is not allowed. Terminating transfer."
105+
)
106+
return False
107+
101108
energy_delegator_priv, energy_delegator_pub = get_energy_delegator()
102109
onetime_priv_key, onetime_publ_key = get_key(KeyType.onetime, pub=onetime_acc)
103110

@@ -465,6 +472,14 @@ def transfer_trx_from(onetime_publ_key):
465472
"""
466473
Transfers TRX from onetime to main account
467474
"""
475+
logger.info(f"Starting TRX transfer from onetime account {onetime_publ_key}")
476+
main_publ_key = query_db2(
477+
'select * from keys where type = "fee_deposit" ', one=True
478+
)["public"]
479+
480+
if main_publ_key == onetime_publ_key:
481+
logger.warning("Skipping TRX transfer from main account.")
482+
return {"status": "error", "error": "Skipping TRX transfer from main account."}
468483

469484
bw = Wallet().bandwidth_of(onetime_publ_key)
470485
if bw < config.BANDWIDTH_PER_TRX_TRANSFER:
@@ -491,10 +506,6 @@ def transfer_trx_from(onetime_publ_key):
491506
if onetime_acc_balance == 0:
492507
return {"status": "error", "error": "skipping 0 TRX account"}
493508

494-
main_publ_key = query_db2(
495-
'select * from keys where type = "fee_deposit" ', one=True
496-
)["public"]
497-
498509
tx_trx = tron_client.trx.transfer(
499510
onetime_publ_key, main_publ_key, int(onetime_acc_balance * 1_000_000)
500511
)

0 commit comments

Comments
 (0)