fixup! Merge branch 'tiago/type-safe-events' (#2787)

crates/apps/src/lib/node/ledger/shell/finalize_block.rs

@@ -7,10 +7,8 @@ use namada::core::storage::{BlockHash, BlockResults, Epoch, Header};
 use namada::gas::event::WithGasUsed;
 use namada::governance::pgf::inflation as pgf_inflation;
 use namada::hash::Hash;
-use namada::ledger::events::extend::{
-    ComposeEvent, Height, Info, Log, ValidMaspTx,
-};
-use namada::ledger::events::{EmitEvents, EventType};
+use namada::ledger::events::extend::{ComposeEvent, Height, Info, ValidMaspTx};
+use namada::ledger::events::EmitEvents;
 use namada::ledger::gas::GasMetering;
 use namada::ledger::ibc;
 use namada::ledger::pos::namada_proof_of_stake;
@@ -132,15 +130,6 @@ where
         if new_epoch {
             // Apply PoS and PGF inflation
             self.apply_inflation(current_epoch)?;
-
-            // Take IBC events that may be emitted from PGF
-            for ibc_event in self.state.write_log_mut().take_ibc_events() {
-                let mut event = Event::from(ibc_event.clone());
-                // Add the height for IBC event query
-                let height = self.state.in_mem().get_last_block_height() + 1;
-                event["height"] = height.to_string();
-                response.events.push(event);
-            }
         }
 
         let mut stats = InternalStats::default();
@@ -413,8 +402,7 @@ where
                             .map(|args| args.is_committed_fee_unshield)
                             .unwrap_or_default()
                         {
-                            tx_event["is_valid_masp_tx"] =
-                                format!("{}", tx_index);
+                            tx_event.extend(ValidMaspTx(tx_index));
                         }
 
                         // If an inner tx failed for any reason but invalid
@@ -441,10 +429,10 @@ where
                         tx_event["hash"],
                         msg,
                     );
-                    tx_event["gas_used"] =
-                        tx_gas_meter.get_tx_consumed_gas().to_string();
-                    tx_event["info"] = msg.to_string();
-                    tx_event["code"] = ResultCode::InvalidTx.into();
+                    tx_event
+                        .extend(WithGasUsed(tx_gas_meter.get_tx_consumed_gas()))
+                        .extend(Info(msg.to_string()))
+                        .extend(Code(ResultCode::InvalidTx));
                 }
                 Err(msg) => {
                     tracing::info!(
@@ -491,7 +479,7 @@ where
                         .extend(Info(msg.to_string()));
 
                     // If wrapper, invalid tx error code
-                    tx_event["code"] = ResultCode::InvalidTx.into();
+                    tx_event.extend(Code(ResultCode::InvalidTx));
                     // The fee unshield operation could still have been
                     // committed
                     if wrapper_args

crates/apps/src/lib/node/ledger/shell/governance.rs

@@ -16,6 +16,7 @@ use namada::governance::{
     storage as gov_api, ProposalVote, ADDRESS as gov_address,
 };
 use namada::ibc;
+use namada::ledger::events::extend::{ComposeEvent, Height};
 use namada::ledger::governance::utils::ProposalEvent;
 use namada::ledger::pos::BondId;
 use namada::proof_of_stake::bond_amount;
@@ -132,7 +133,6 @@ where
                             proposal_code.is_some(),
                             result,
                         )
-                        .into()
                     }
                     ProposalType::DefaultWithWasm(_) => {
                         let proposal_code =
@@ -182,24 +182,20 @@ where
                             id
                         );
 
-                        for ibc_event in
-                            shell.state.write_log_mut().take_ibc_events()
-                        {
-                            let mut event = Event::from(ibc_event.clone());
-                            // Add the height for IBC event query
-                            let height =
-                                shell.state.in_mem().get_last_block_height()
-                                    + 1;
-                            event["height"] = height.to_string();
-                            events.emit(event);
-                        }
-
                         ProposalEvent::pgf_payments_proposal_event(id, result)
                     }
                 };
                 events.emit(proposal_event);
                 proposals_result.passed.push(id);
 
+                // Take events that could have been emitted by PGF
+                // over IBC, governance proposal execution, etc
+                for event in shell.state.write_log_mut().take_ibc_events() {
+                    events.emit(event.with(Height(
+                        shell.state.in_mem().get_last_block_height() + 1,
+                    )));
+                }
+
                 gov_api::get_proposal_author(&shell.state, id)?
             }
             TallyResult::Rejected => {

crates/core/src/event.rs

@@ -184,15 +184,6 @@ pub enum EventError {
 }
 
 impl Event {
-    /// Create an accepted tx event with empty attributes.
-    pub fn accepted_tx() -> Self {
-        Self {
-            event_type: EventType::Accepted,
-            level: EventLevel::Tx,
-            attributes: HashMap::new(),
-        }
-    }
-
     /// Create an applied tx event with empty attributes.
     pub fn applied_tx() -> Self {
         Self {

crates/core/src/event/extend.rs

@@ -123,8 +123,6 @@ impl ExtendEvent for ValidMaspTx {
 
 #[cfg(test)]
 mod event_composition_tests {
-    use std::collections::HashMap;
-
     use super::*;
 
     #[test]

crates/tx/src/event.rs

@@ -13,12 +13,7 @@ use crate::TxType;
 /// already filled in
 pub fn new_tx_event(tx: &Tx, height: u64) -> Event {
     let base_event = match tx.header().tx_type {
-        TxType::Wrapper(_) => {
-            Event::accepted_tx().with(TxHash(tx.header_hash()))
-        }
-        TxType::Decrypted(_) => Event::applied_tx()
-            .with(TxHash(tx.clone().update_header(TxType::Raw).header_hash())),
-        TxType::Protocol(_) => {
+        TxType::Wrapper(_) | TxType::Protocol(_) => {
             Event::applied_tx().with(TxHash(tx.header_hash()))
         }
         _ => unreachable!(),

crates/tx/src/lib.rs

@@ -7,8 +7,6 @@ mod types;
 
 use data::TxType;
 pub use event::new_tx_event;
-use namada_core::collections::HashMap;
-use namada_core::event::{Event, EventLevel, EventType};
 pub use namada_core::key::SignableEthMessage;
 pub use namada_core::sign::SignatureIndex;
 pub use types::{