Skip to content
Merged
Changes from 2 commits
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
34 changes: 21 additions & 13 deletions fendermint/eth/api/src/apis/eth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -974,21 +974,29 @@ where

let mut log_index_start = 0usize;
for ((tx_idx, tx_result), tx) in tx_results.iter().enumerate().zip(block.data()) {
let msg = match to_chain_message(tx) {
Ok(ChainMessage::Signed(msg)) => msg,
_ => continue,
};

let emitters = from_tm::collect_emitters(&tx_result.events);

// Filter by address.
if !addrs.is_empty()
&& !addrs.contains(&msg.message().from)
&& !addrs.contains(&msg.message().to)
&& addrs.intersection(&emitters).next().is_none()
{
continue;
}
let no_intersection =
Copy link
Copy Markdown
Contributor

@karlem karlem Dec 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: addrs_disjoint_from_emitters might be better?

!addrs.is_empty() && addrs.intersection(&emitters).next().is_none();

match to_chain_message(tx) {
Ok(ChainMessage::Signed(msg)) => {
// Filter by sender and recipient addresses.
if no_intersection
&& !addrs.contains(&msg.message().from)
&& !addrs.contains(&msg.message().to)
{
continue;
}
}
Ok(ChainMessage::Ipc(_)) => {
// ipc messages are system messages, no need to check from and to
if no_intersection {
continue;
}
}
_ => continue,
};

let tx_hash = msg_hash(&tx_result.events, tx);
let tx_idx = et::U64::from(tx_idx);
Expand Down