Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Get results only for defined instruction
  • Loading branch information
afalaleev committed Jan 11, 2022
commit 6a59f31dff7a823bbe05ee7c28518e731c8b9d34
4 changes: 2 additions & 2 deletions proxy/indexer/indexer.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def _decode_tx(self, tx: NeonTxObject):
the parsing order can be other than the execution order
"""
if not tx.neon_res.is_valid():
res_error = tx.neon_res.decode(self.ix.tx)
res_error = tx.neon_res.decode(self.ix.tx, self.ix.sign.idx)
if res_error:
return self._decoding_fail(tx, f'Neon results error "{res_error}"')
if tx.neon_res.is_valid():
Expand Down Expand Up @@ -458,7 +458,7 @@ def execute(self) -> bool:
if neon_tx.error:
return self._decoding_skip(f'Neon tx rlp error "{neon_tx.error}"')

neon_res = NeonTxResultInfo(self.ix.tx)
neon_res = NeonTxResultInfo(self.ix.tx, self.ix.sign.idx)
if neon_res.error:
return self._decoding_skip(f'Neon results error "{neon_res.error}"')

Expand Down
15 changes: 9 additions & 6 deletions proxy/indexer/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ def copy(self):


class NeonTxResultInfo:
def __init__(self, tx=None):
def __init__(self, tx=None, ix_idx=-1):
if not isinstance(tx, dict):
self._set_defaults()
else:
self.decode(tx)
self.decode(tx, ix_idx)

def __str__(self):
return str_fmt_object(self)
Expand Down Expand Up @@ -114,17 +114,20 @@ def _decode_return(self, log, slot):
self.return_value = log[10:].hex()
self.slot = slot

def decode(self, tx: {}):
def decode(self, tx: {}, ix_idx = -1):
self._set_defaults()
meta_ixs = tx['meta']['innerInstructions']
msg = tx['transaction']['message']
msg_ixs = msg["instructions"]
accounts = msg['accountKeys']

evm_ix_idxs = []
for idx, ix in enumerate(msg_ixs):
if accounts[ix["programIdIndex"]] == EVM_LOADER_ID:
evm_ix_idxs.append(idx)
if ix_idx == -1:
for idx, ix in enumerate(msg_ixs):
if accounts[ix["programIdIndex"]] == EVM_LOADER_ID:
evm_ix_idxs.append(idx)
else:
evm_ix_idxs.append(ix_idx)

for inner_ix in meta_ixs:
if inner_ix["index"] in evm_ix_idxs:
Expand Down