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

Add block height to facuet value lookup in tx list

Browse Source
This commit is contained in:
nolash 2021-07-25 17:27:19 +02:00
parent a9073e1e23
commit 7485ac81ba
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/cic-cache/requirements.txt
View File

@ -9,6 +9,6 @@ psycopg2==2.8.6
celery==4.4.7 celery==4.4.7
redis==3.5.3 redis==3.5.3
chainsyncer[sql]>=0.0.6a1,<0.1.0 chainsyncer[sql]>=0.0.6a1,<0.1.0
erc20-faucet~=0.2.4a1 erc20-faucet>=0.2.4a2, <0.3.0
chainlib>=0.0.7a1,<0.1.0 chainlib-eth>=0.0.7a2,<0.1.0
eth-address-index>=0.1.4a1,<0.2.0 eth-address-index>=0.1.4a1,<0.2.0

11
apps/cic-eth/cic_eth/ext/tx.py
View File

@ -16,6 +16,7 @@ from chainlib.eth.error import RequestMismatchException
from chainlib.eth.block import block_by_number from chainlib.eth.block import block_by_number
from chainlib.eth.contract import abi_decode_single from chainlib.eth.contract import abi_decode_single
from chainlib.eth.constant import ZERO_ADDRESS from chainlib.eth.constant import ZERO_ADDRESS
from chainlib.eth.tx import Tx
from hexathon import strip_0x from hexathon import strip_0x
from cic_eth_registry import CICRegistry from cic_eth_registry import CICRegistry
from cic_eth_registry.erc20 import ERC20Token from cic_eth_registry.erc20 import ERC20Token
@ -42,7 +43,7 @@ def parse_transaction(chain_spec, rpc, tx, sender_address=None):
transfer_data = ERC20.parse_transfer_request(tx['input']) transfer_data = ERC20.parse_transfer_request(tx['input'])
tx_address = transfer_data[0] tx_address = transfer_data[0]
tx_token_value = transfer_data[1] tx_token_value = transfer_data[1]
logg.debug('matched transfer transaction {} sender {} recipient {} value {}'.format(tx['hash'], tx['from'], tx_address, tx_token_value)) logg.debug('matched transfer transaction {} in block {} sender {} recipient {} value {}'.format(tx['hash'], tx['block_number'], tx['from'], tx_address, tx_token_value))
return (tx_address, tx_token_value) return (tx_address, tx_token_value)
except RequestMismatchException: except RequestMismatchException:
pass pass
@ -50,12 +51,11 @@ def parse_transaction(chain_spec, rpc, tx, sender_address=None):
try: try:
transfer_data = Faucet.parse_give_to_request(tx['input']) transfer_data = Faucet.parse_give_to_request(tx['input'])
tx_address = transfer_data[0] tx_address = transfer_data[0]
logg.warning('looking up current faucet value, historic faucet value not implemented yet. use with care!!')
c = Faucet(chain_spec) c = Faucet(chain_spec)
o = c.token_amount(tx['to'], sender_address=sender_address) o = c.token_amount(tx['to'], sender_address=sender_address, height=tx['block_number'])
r = rpc.do(o) r = rpc.do(o)
tx_token_value = Faucet.parse_token_amount(r) tx_token_value = Faucet.parse_token_amount(r)
logg.debug('matched giveto transaction {} sender {} recipient {} value {}'.format(tx['hash'], tx['from'], tx_address, tx_token_value)) logg.debug('matched giveto transaction {} in block {} sender {} recipient {} value {}'.format(tx['hash'], tx['block_number'], tx['from'], tx_address, tx_token_value))
return (tx_address, tx_token_value) return (tx_address, tx_token_value)
except RequestMismatchException: except RequestMismatchException:
@ -121,6 +121,9 @@ def list_tx_by_bloom(self, bloomspec, address, chain_spec_dict):
tx = rpc.do(o) tx = rpc.do(o)
except Exception as e: except Exception as e:
logg.debug('false positive on block {} tx {} ({})'.format(block_height, tx_index, e)) logg.debug('false positive on block {} tx {} ({})'.format(block_height, tx_index, e))
continue
tx = Tx(tx).src()
logg.debug('got tx {}'.format(tx)) logg.debug('got tx {}'.format(tx))
tx_address = None tx_address = None

2
apps/cic-eth/requirements.txt
View File

@ -1,3 +1,3 @@
celery==4.4.7 celery==4.4.7
chainlib-eth>=0.0.7a1,<0.1.0 chainlib-eth>=0.0.7a2,<0.1.0
semver==2.13.0 semver==2.13.0

2
apps/cic-eth/services_requirements.txt
View File

@ -9,7 +9,7 @@ liveness~=0.0.1a7
eth-address-index>=0.1.4a1,<0.2.0 eth-address-index>=0.1.4a1,<0.2.0
eth-accounts-index>=0.0.14a1,<0.1.0 eth-accounts-index>=0.0.14a1,<0.1.0
cic-eth-registry>=0.5.8a1,<0.6.0 cic-eth-registry>=0.5.8a1,<0.6.0
erc20-faucet>=0.2.4a1,<0.3.0 erc20-faucet>=0.2.4a2,<0.3.0
erc20-transfer-authorization>=0.3.4a1,<0.4.0 erc20-transfer-authorization>=0.3.4a1,<0.4.0
sarafu-faucet>=0.0.5a2,<0.1.0 sarafu-faucet>=0.0.5a2,<0.1.0
moolb~=0.1.1b2 moolb~=0.1.1b2