kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add custom eth error

Browse Source
This commit is contained in:
nolash 2021-03-07 19:01:16 +01:00
parent 69a13235ba
commit cf468fc4c7
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/cic-eth/cic_eth/error.py
View File

@ -73,3 +73,10 @@ class SignerError(Exception):
""" """
pass pass
class EthError(Exception):
"""Exception raised when unspecified error from evm node is encountered
"""
pass

13
apps/cic-eth/cic_eth/eth/tx.py
View File

@ -39,6 +39,7 @@ from cic_eth.task import (
CriticalWeb3Task, CriticalWeb3Task,
CriticalWeb3AndSignerTask, CriticalWeb3AndSignerTask,
CriticalSQLAlchemyAndSignerTask, CriticalSQLAlchemyAndSignerTask,
CriticalSQLAlchemyAndWeb3Task,
) )
celery_app = celery.current_app celery_app = celery.current_app
@ -48,7 +49,7 @@ MAX_NONCE_ATTEMPTS = 3
# TODO this function is too long # TODO this function is too long
@celery_app.task(bind=True, throws=(OutOfGasError), base=CriticalSQLAlchemyTask) @celery_app.task(bind=True, throws=(OutOfGasError), base=CriticalSQLAlchemyAndWeb3Task)
def check_gas(self, tx_hashes, chain_str, txs=[], address=None, gas_required=None): def check_gas(self, tx_hashes, chain_str, txs=[], address=None, gas_required=None):
"""Check the gas level of the sender address of a transaction. """Check the gas level of the sender address of a transaction.
@ -76,6 +77,9 @@ def check_gas(self, tx_hashes, chain_str, txs=[], address=None, gas_required=Non
if address == None: if address == None:
address = o['address'] address = o['address']
if not web3.Web3.isChecksumAddress(address):
raise ValueError('invalid address {}'.format(address))
chain_spec = ChainSpec.from_chain_str(chain_str) chain_spec = ChainSpec.from_chain_str(chain_str)
queue = self.request.delivery_info['routing_key'] queue = self.request.delivery_info['routing_key']
@ -84,7 +88,12 @@ def check_gas(self, tx_hashes, chain_str, txs=[], address=None, gas_required=Non
c = RpcClient(chain_spec) c = RpcClient(chain_spec)
# TODO: it should not be necessary to pass address explicitly, if not passed should be derived from the tx # TODO: it should not be necessary to pass address explicitly, if not passed should be derived from the tx
balance = c.w3.eth.getBalance(address) balance = 0
try:
balance = c.w3.eth.getBalance(address)
except ValueError as e:
raise EthError('balance call for {}'.format())
logg.debug('address {} has gas {} needs {}'.format(address, balance, gas_required)) logg.debug('address {} has gas {} needs {}'.format(address, balance, gas_required))
if gas_required > balance: if gas_required > balance:

6
apps/cic-eth/cic_eth/task.py
View File

@ -6,7 +6,10 @@ import celery
import sqlalchemy import sqlalchemy
# local imports # local imports
from cic_eth.error import SignerError from cic_eth.error import (
SignerError,
EthError,
)
class CriticalTask(celery.Task): class CriticalTask(celery.Task):
@ -33,6 +36,7 @@ class CriticalSQLAlchemyAndWeb3Task(CriticalTask):
sqlalchemy.exc.DatabaseError, sqlalchemy.exc.DatabaseError,
sqlalchemy.exc.TimeoutError, sqlalchemy.exc.TimeoutError,
requests.exceptions.ConnectionError, requests.exceptions.ConnectionError,
EthError,
) )
class CriticalSQLAlchemyAndSignerTask(CriticalTask): class CriticalSQLAlchemyAndSignerTask(CriticalTask):