Emit a different event for each log

NomicFoundation · Feb 9, 2024 · 8c738b6 · 8c738b6
1 parent 3803728
commit 8c738b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/crates/edr_napi/src/subscribe.rs b/crates/edr_napi/src/subscribe.rs
@@ -27,7 +27,7 @@ impl SubscriberCallback {
                     .and_then(|filter_id| event.set_named_property("filterId", filter_id))?;
 
                 let result = match ctx.value.result {
-                    edr_provider::SubscriptionEventData::Logs(logs) => ctx.env.to_js_value(&logs),
+                    edr_provider::SubscriptionEventData::Log(log) => ctx.env.to_js_value(&log),
                     edr_provider::SubscriptionEventData::NewHeads(block) => {
                         let block = eth::Block::<B256>::from(block);
                         ctx.env.to_js_value(&block)

diff --git a/crates/edr_provider/src/data.rs b/crates/edr_provider/src/data.rs
@@ -999,10 +999,12 @@ impl<LoggerErrorT: Debug> ProviderData<LoggerErrorT> {
 
                         let mut filtered_logs = filter_logs(new_logs, criteria);
                         if filter.is_subscription {
-                            (self.subscriber_callback)(SubscriptionEvent {
-                                filter_id: *filter_id,
-                                result: SubscriptionEventData::Logs(filtered_logs.clone()),
-                            });
+                            for log in filtered_logs {
+                                (self.subscriber_callback)(SubscriptionEvent {
+                                    filter_id: *filter_id,
+                                    result: SubscriptionEventData::Log(log.clone()),
+                                });
+                            }
                         } else {
                             logs.append(&mut filtered_logs);
                         }

diff --git a/crates/edr_provider/src/subscribe.rs b/crates/edr_provider/src/subscribe.rs
@@ -12,7 +12,7 @@ pub struct SubscriptionEvent {
 /// Subscription event data.
 #[derive(Clone, Debug)]
 pub enum SubscriptionEventData {
-    Logs(Vec<LogOutput>),
+    Log(LogOutput),
     NewHeads(BlockAndTotalDifficulty<BlockchainError>),
     NewPendingTransactions(B256),
 }