chaintool/chainqueue
4
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Remove inconistent data normalization

Browse Source
This commit is contained in:
nolash 2021-08-28 06:28:38 +02:00
parent 3b990a9a87
commit c85851f370
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chainqueue/encode.py
View File

@ -30,7 +30,8 @@ class TxHexNormalizer:
def __hex_normalize(self, data, context): def __hex_normalize(self, data, context):
r = add_0x(hex_uniform(strip_0x(data))) #r = add_0x(hex_uniform(strip_0x(data)))
r = hex_uniform(strip_0x(data))
logg.debug('normalize {} {} -> {}'.format(context, data, r)) logg.debug('normalize {} {} -> {}'.format(context, data, r))
return r return r

9
chainqueue/sql/query.py
View File

@ -133,8 +133,6 @@ def get_nonce_tx_cache(chain_spec, nonce, sender, decoder=None, session=None):
:returns: Transactions :returns: Transactions
:rtype: dict, with transaction hash as key, signed raw transaction as value :rtype: dict, with transaction hash as key, signed raw transaction as value
""" """
sender = add_0x(hex_uniform(strip_0x(sender)))
session = SessionBase.bind_session(session) session = SessionBase.bind_session(session)
q = session.query(Otx) q = session.query(Otx)
q = q.join(TxCache) q = q.join(TxCache)
@ -146,7 +144,7 @@ def get_nonce_tx_cache(chain_spec, nonce, sender, decoder=None, session=None):
tx_signed_bytes = bytes.fromhex(r.signed_tx) tx_signed_bytes = bytes.fromhex(r.signed_tx)
if decoder != None: if decoder != None:
tx = decoder(tx_signed_bytes, chain_spec) tx = decoder(tx_signed_bytes, chain_spec)
tx_from = add_0x(hex_uniform(strip_0x(tx['from']))) tx_from = tx['from']
if sender != None and tx_from != sender: if sender != None and tx_from != sender:
raise CacheIntegrityError('Cache sender {} does not match sender {} in tx {} using decoder {}'.format(sender, tx_from, r.tx_hash, str(decoder))) raise CacheIntegrityError('Cache sender {} does not match sender {} in tx {} using decoder {}'.format(sender, tx_from, r.tx_hash, str(decoder)))
txs[r.tx_hash] = r.signed_tx txs[r.tx_hash] = r.signed_tx
@ -187,7 +185,6 @@ def get_paused_tx_cache(chain_spec, status=None, sender=None, session=None, deco
q = q.filter(not_(Otx.status.op('&')(StatusBits.IN_NETWORK.value)>0)) q = q.filter(not_(Otx.status.op('&')(StatusBits.IN_NETWORK.value)>0))
if sender != None: if sender != None:
sender = add_0x(hex_uniform(strip_0x(sender)))
q = q.filter(TxCache.sender==sender) q = q.filter(TxCache.sender==sender)
txs = {} txs = {}
@ -197,7 +194,8 @@ def get_paused_tx_cache(chain_spec, status=None, sender=None, session=None, deco
tx_signed_bytes = bytes.fromhex(r.signed_tx) tx_signed_bytes = bytes.fromhex(r.signed_tx)
if decoder != None: if decoder != None:
tx = decoder(tx_signed_bytes, chain_spec) tx = decoder(tx_signed_bytes, chain_spec)
tx_from = add_0x(hex_uniform(strip_0x(tx['from']))) #tx_from = add_0x(hex_uniform(strip_0x(tx['from'])))
tx_from = tx['from']
if sender != None and tx_from != sender: if sender != None and tx_from != sender:
raise CacheIntegrityError('Cache sender {} does not match sender {} in tx {} using decoder {}'.format(sender, tx_from, r.tx_hash, str(decoder))) raise CacheIntegrityError('Cache sender {} does not match sender {} in tx {} using decoder {}'.format(sender, tx_from, r.tx_hash, str(decoder)))
gas += tx['gas'] * tx['gasPrice'] gas += tx['gas'] * tx['gasPrice']
@ -414,7 +412,6 @@ def get_account_tx(chain_spec, address, as_sender=True, as_recipient=True, count
txs = {} txs = {}
session = SessionBase.bind_session(session) session = SessionBase.bind_session(session)
address = add_0x(hex_uniform(strip_0x(address)))
try: try:
filter_offset = sql_range_filter(session, criteria=since) filter_offset = sql_range_filter(session, criteria=since)

3
chainqueue/sql/tx.py
View File

@ -43,9 +43,6 @@ def create(chain_spec, nonce, holder_address, tx_hash, signed_tx, obsolete_prede
""" """
session = SessionBase.bind_session(session) session = SessionBase.bind_session(session)
holder_address = holder_address.lower()
tx_hash = tx_hash.lower()
signed_tx = signed_tx.lower()
o = Otx.add( o = Otx.add(
nonce=nonce, nonce=nonce,
tx_hash=tx_hash, tx_hash=tx_hash,