Fixup

rusk/Cargo.toml

@@ -32,6 +32,7 @@ serde_json = "1"
 serde_with = { version = "3.1", features = ["hex"] }
 humantime-serde = "1"
 bs58 = "0.4"
+base64 = "0.22"
 hex = "0.4"
 parking_lot = "0.12"
 rkyv = { version = "0.7", default-features = false, features = ["size_32"] }

rusk/src/bin/main.rs

@@ -94,7 +94,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         None => None,
     };
 
-    // TODO: Pass event sender to the services that need it
     let channel_cap = config.http.ws_event_channel_cap;
     let (event_sender, event_receiver) = broadcast::channel(channel_cap);
 
@@ -107,6 +106,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             state_dir,
             config.chain.generation_timeout(),
             config.http.feeder_call_gas,
+            event_sender,
         )?;
 
         info!("Rusk VM loaded");

rusk/src/lib/chain.rs

@@ -12,12 +12,15 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use parking_lot::RwLock;
+use tokio::sync::broadcast;
 
 use node::database::rocksdb::Backend;
 use node::network::Kadcast;
 use rusk_abi::dusk::{dusk, Dusk};
 use rusk_abi::VM;
 
+use crate::http::ContractEvent;
+
 pub const MINIMUM_STAKE: Dusk = dusk(1000.0);
 
 #[derive(Debug, Clone, Copy)]
@@ -33,6 +36,7 @@ pub struct Rusk {
     dir: PathBuf,
     pub(crate) generation_timeout: Option<Duration>,
     pub(crate) feeder_gas_limit: u64,
+    pub(crate) event_sender: broadcast::Sender<ContractEvent>,
 }
 
 #[derive(Clone)]

rusk/src/lib/chain/rusk.rs

@@ -27,8 +27,10 @@ use rusk_abi::{
     STAKE_CONTRACT, TRANSFER_CONTRACT, VM,
 };
 use rusk_profile::to_rusk_state_id_path;
+use tokio::sync::broadcast;
 
 use super::{coinbase_value, emission_amount, Rusk, RuskTip};
+use crate::http::ContractEvent;
 use crate::{Error, Result};
 
 pub static DUSK_KEY: LazyLock<BlsPublicKey> = LazyLock::new(|| {
@@ -42,6 +44,7 @@ impl Rusk {
         dir: P,
         generation_timeout: Option<Duration>,
         feeder_gas_limit: u64,
+        event_sender: broadcast::Sender<ContractEvent>,
     ) -> Result<Self> {
         let dir = dir.as_ref();
         let commit_id_path = to_rusk_state_id_path(dir);
@@ -73,6 +76,7 @@ impl Rusk {
             dir: dir.into(),
             generation_timeout,
             feeder_gas_limit,
+            event_sender,
         })
     }
 
@@ -200,7 +204,7 @@ impl Rusk {
             txs,
             missed_generators,
         )
-        .map(|(a, b, _)| (a, b))
+        .map(|(a, b, _, _)| (a, b))
     }
 
     /// Accept the given transactions.
@@ -220,7 +224,7 @@ impl Rusk {
     ) -> Result<(Vec<SpentTransaction>, VerificationOutput)> {
         let session = self.session(block_height, None)?;
 
-        let (spent_txs, verification_output, session) = accept(
+        let (spent_txs, verification_output, session, events) = accept(
             session,
             block_height,
             block_gas_limit,
@@ -239,6 +243,10 @@ impl Rusk {
 
         self.set_current_commit(session.commit()?);
 
+        for event in events {
+            let _ = self.event_sender.send(event.into());
+        }
+
         Ok((spent_txs, verification_output))
     }
 
@@ -259,7 +267,7 @@ impl Rusk {
     ) -> Result<(Vec<SpentTransaction>, VerificationOutput)> {
         let session = self.session(block_height, None)?;
 
-        let (spent_txs, verification_output, session) = accept(
+        let (spent_txs, verification_output, session, events) = accept(
             session,
             block_height,
             block_gas_limit,
@@ -282,6 +290,10 @@ impl Rusk {
         let commit_id_path = to_rusk_state_id_path(&self.dir);
         fs::write(commit_id_path, commit)?;
 
+        for event in events {
+            let _ = self.event_sender.send(event.into());
+        }
+
         Ok((spent_txs, verification_output))
     }
 
@@ -435,21 +447,29 @@ fn accept(
     generator: &BlsPublicKey,
     txs: &[Transaction],
     missed_generators: &[BlsPublicKey],
-) -> Result<(Vec<SpentTransaction>, VerificationOutput, Session)> {
+) -> Result<(
+    Vec<SpentTransaction>,
+    VerificationOutput,
+    Session,
+    Vec<Event>,
+)> {
     let mut session = session;
 
     let mut block_gas_left = block_gas_limit;
 
     let mut spent_txs = Vec::with_capacity(txs.len());
     let mut dusk_spent = 0;
 
+    let mut events = Vec::new();
     let mut event_hasher = Sha3_256::new();
 
     for unspent_tx in txs {
         let tx = &unspent_tx.inner;
         let receipt = execute(&mut session, tx)?;
 
         update_hasher(&mut event_hasher, &receipt.events);
+        events.extend(receipt.events);
+
         let gas_spent = receipt.gas_spent;
 
         dusk_spent += gas_spent * tx.fee.gas_price;
@@ -485,6 +505,7 @@ fn accept(
             event_hash,
         },
         session,
+        events,
     ))
 }