sim-rs: log total bytes contained in an IB

Author: SupernaviX

data/simulation/trace.rust.d.ts

@@ -60,6 +60,7 @@ interface RustBlockEvent extends Omit<RustBaseEvent, "message"> {
         type: RustBlockMessageType;
         index?: number;
         header_bytes?: number;
+        total_bytes?: number;
         transactions?: string[];
         vrf?: number;
         endorsement?: any;

data/simulation/trace.rust.schema.json

@@ -71,6 +71,9 @@
                   },
                   "type": "object"
                 },
+                "total_bytes": {
+                  "type": "number"
+                },
                 "transactions": {
                   "items": {
                     "type": "string"

sim-rs/sim-cli/src/events.rs

@@ -252,6 +252,7 @@ impl EventMonitor {
                 Event::IBGenerated {
                     id,
                     header_bytes,
+                    total_bytes,
                     transactions,
                 } => {
                     generated_ibs += 1;
@@ -260,13 +261,13 @@ impl EventMonitor {
                     }
                     pending_ibs.insert(id.clone());
                     ib_txs.insert(id.clone(), transactions.clone());
-                    let mut ib_bytes = header_bytes;
+                    bytes_in_ib.insert(id.clone(), total_bytes as f64);
+                    let mut tx_bytes = header_bytes;
                     for tx_id in &transactions {
                         *txs_in_ib.entry(id.clone()).or_default() += 1.;
                         *ibs_containing_tx.entry(*tx_id).or_default() += 1.;
                         let tx = txs.get_mut(tx_id).unwrap();
-                        ib_bytes += tx.bytes;
-                        *bytes_in_ib.entry(id.clone()).or_default() += tx.bytes as f64;
+                        tx_bytes += tx.bytes;
                         if tx.included_in_ib.is_none() {
                             tx.included_in_ib = Some(time);
                         }
@@ -277,7 +278,7 @@ impl EventMonitor {
                         id.producer,
                         transactions.len(),
                         id.slot,
-                        pretty_bytes(ib_bytes, pbo.clone()),
+                        pretty_bytes(tx_bytes, pbo.clone()),
                     )
                 }
                 Event::IBSent { .. } => {

sim-rs/sim-core/src/events.rs

@@ -125,6 +125,7 @@ pub enum Event {
         #[serde(flatten)]
         id: InputBlockId<Node>,
         header_bytes: u64,
+        total_bytes: u64,
         transactions: Vec<TransactionId>,
     },
     IBSent {
@@ -342,6 +343,8 @@ impl EventTracker {
         self.send(Event::IBGenerated {
             id: self.to_input_block(block.header.id),
             header_bytes: block.header.bytes,
+            total_bytes: block.header.bytes
+                + block.transactions.iter().map(|tx| tx.bytes).sum::<u64>(),
             transactions: block.transactions.iter().map(|tx| tx.id).collect(),
         });
     }