Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
16 changes: 7 additions & 9 deletions chain/ethereum/src/adapter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,7 @@ impl EthereumLogFilter {
let contract = LogFilterNode::Contract(log.address());
let event = LogFilterNode::Event(*sig);
self.contracts_and_events_graph
.all_edges()
.any(|(s, t, _)| (s == contract && t == event) || (t == contract && s == event))
.contains_edge(contract, event)
|| self.wildcard_events.contains_key(sig)
|| self
.events_with_topic_filters
Expand Down Expand Up @@ -439,13 +438,12 @@ impl EthereumLogFilter {
let contract_node = LogFilterNode::Contract(*address);
let event_node = LogFilterNode::Event(*event_signature);

// Directly iterate over all edges and return true if a matching edge that requires a receipt is found.
for (s, t, &r) in self.contracts_and_events_graph.all_edges() {
if r && ((s == contract_node && t == event_node)
|| (t == contract_node && s == event_node))
{
return true;
}
if self
.contracts_and_events_graph
.edge_weight(contract_node, event_node)
== Some(&true)
{
return true;
}
}

Expand Down
49 changes: 27 additions & 22 deletions chain/ethereum/src/ethereum_adapter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1911,31 +1911,36 @@ pub(crate) fn parse_log_triggers(
return vec![];
}

block
let total_logs: usize = block
.transaction_receipts
.iter()
.flat_map(move |receipt| {
receipt.logs().iter().enumerate().map(move |(index, log)| {
let requires_transaction_receipt = log
.topics()
.first()
.map(|signature| {
log_filter.requires_transaction_receipt(
signature,
Some(&log.address()),
log.topics(),
)
})
.unwrap_or(false);
.map(|r| r.logs().len())
.sum();
let mut triggers = Vec::with_capacity(total_logs);

for receipt in &block.transaction_receipts {
for (index, log) in receipt.logs().iter().enumerate() {
let requires_transaction_receipt = log
.topics()
.first()
.map(|signature| {
log_filter.requires_transaction_receipt(
signature,
Some(&log.address()),
log.topics(),
)
})
.unwrap_or(false);

EthereumTrigger::Log(LogRef::LogPosition(LogPosition {
index,
receipt: receipt.cheap_clone(),
requires_transaction_receipt,
}))
})
})
.collect()
triggers.push(EthereumTrigger::Log(LogRef::LogPosition(LogPosition {
index,
receipt: receipt.cheap_clone(),
requires_transaction_receipt,
})));
}
}

triggers
}

pub(crate) fn parse_call_triggers(
Expand Down