diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..748fac7 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,4 @@ +- 0.0.2 + * Upgrade eth-monitor support to 0.1.0 target +- 0.0.1 + * Add renderers for account registry add, faucet gift diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..4e379d2 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.2 diff --git a/ge_render/__init__.py b/ge_render/__init__.py index ca245ce..3651c8a 100644 --- a/ge_render/__init__.py +++ b/ge_render/__init__.py @@ -38,34 +38,32 @@ def get_method(chain_str, tx): return chainmap.get(data) -def apply(c, s, chain_spec, conn, block, tx, db_session=None): +def apply(c, result, chain_spec, conn, block, tx, db_session=None): + s = result.get() try: m = get_method(str(chain_spec), tx) except ValueError as e: - return s + return True - if m == None: - return s + if m == None: + return True - r = m(c, s, chain_spec, conn, block, tx) - if r != None: - s = r - - return s + r = m(c, result, chain_spec, conn, block, tx) + return r -def account_registry_add(c, s, chain_spec, conn, block, tx): +def account_registry_add(c, result, chain_spec, conn, block, tx): try: o = AccountsIndex.parse_add_request(tx.payload) s = '{} block {} tx {} account registration for {}'.format(c, block.number, tx.index, o[0]) - return s + result.set(s) except RequestMismatchException as e: - pass + return True - return None + return False -def ge_faucet_gift(i, s, chain_spec, conn, block, tx): +def ge_faucet_gift(i, result, chain_spec, conn, block, tx): c = Faucet(chain_spec) o = c.token_amount(tx.inputs[0], sender_address=ZERO_ADDRESS, height=block.number) @@ -94,22 +92,22 @@ def ge_faucet_gift(i, s, chain_spec, conn, block, tx): try: o = Faucet.parse_give_to_request(tx.payload) s = '{} GE faucet was triggered for {} {} by {} on block {} tx {}'.format(i, v, token_symbol, o[0], block.number, tx.index) - return s + result.set(s) except RequestMismatchException as e: - pass + return True - return None + return False sigmap = { - 'evm:byzantium:8996:bloxberg': { + 'evm:kitabu:5050:sarafu': { '0a3b0a4f': account_registry_add, }, } addrmap = { - 'evm:byzantium:8996:bloxberg': { + 'evm:kitabu:5050:sarafu': { 'd462aadb7251d418e6a9e4f205928f678e1c6b3b': { '63e4bff4': ge_faucet_gift, }, diff --git a/requirements.txt b/requirements.txt index 07ee95a..52650a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -eth-monitor~=0.0.6 eth_accounts_index~=0.1.2 erc20-faucet~=0.3.2 cic-contracts~=0.0.5