Correct remaining crypto_dev_signer prefixes

This commit is contained in:
nolash 2021-10-15 22:58:33 +02:00
parent 760ff71632
commit ccacffe962
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
5 changed files with 3 additions and 62 deletions

View File

@ -9,7 +9,7 @@ from http.server import (
# local imports
from .handle import SignRequestHandler
from crypto_dev_signer.error import SignerError
from funga.error import SignerError
logg = logging.getLogger(__name__)

View File

@ -1 +0,0 @@
from .tx import EthTxExecutor

View File

@ -1,58 +0,0 @@
# standard imports
import logging
# local imports
from crypto_dev_signer.helper import TxExecutor
from crypto_dev_signer.error import NetworkError
logg = logging.getLogger()
logging.getLogger('web3').setLevel(logging.CRITICAL)
logging.getLogger('urllib3').setLevel(logging.CRITICAL)
class EthTxExecutor(TxExecutor):
def __init__(self, w3, sender, signer, chain_id, verifier=None, block=False):
self.w3 = w3
nonce = self.w3.eth.getTransactionCount(sender, 'pending')
super(EthTxExecutor, self).__init__(sender, signer, self.translator, self.dispatcher, self.reporter, nonce, chain_id, self.fee_helper, self.fee_price_helper, verifier, block)
def fee_helper(self, tx):
estimate = self.w3.eth.estimateGas(tx)
if estimate < 21000:
estimate = 21000
logg.debug('estimate {} {}'.format(tx, estimate))
return estimate
def fee_price_helper(self):
return self.w3.eth.gasPrice
def dispatcher(self, tx):
error_object = None
try:
tx_hash = self.w3.eth.sendRawTransaction(tx)
except ValueError as e:
error_object = e.args[0]
logg.error('node could not intepret rlp {}'.format(tx))
if error_object != None:
raise NetworkError(error_object)
return tx_hash
def reporter(self, tx):
return self.w3.eth.getTransactionReceipt(tx)
def translator(self, tx):
if tx.get('feePrice') != None:
tx['gasPrice'] = tx['feePrice']
del tx['feePrice']
if tx.get('feeUnits') != None:
tx['gas'] = tx['feeUnits']
del tx['feeUnits']
return tx

View File

@ -13,7 +13,7 @@ from hexathon import (
# local imports
from funga.eth.encoding import chain_id_to_v
#from crypto_dev_signer.eth.rlp import rlp_encode
#from funga.eth.rlp import rlp_encode
import rlp
logg = logging.getLogger(__name__)

View File

@ -53,7 +53,7 @@ setup(
long_description_content_type='text/markdown',
entry_points = {
'console_scripts': [
'funga-eth=funga.eth.runnable.signer:main',
'funga-ethd=funga.eth.runnable.signer:main',
'eth-keyfile=funga.eth.runnable.keyfile:main',
],
},