sim-rs: implement full-with-tx-references variant

Author: SupernaviX

data/simulation/config.d.ts

@@ -252,6 +252,8 @@ export enum LeiosVariant {
   Full = "full",
   /** Full Leios Without IBs: EBs reference TXs directly, as well as other EBs */
   FullWithoutIbs = "full-without-ibs",
+  /** Full Leios With TX References: IBs only contain references to TXs instead of the whole body */
+  FullWithTXReferences = "full-with-tx-references"
 }
 
 export enum MempoolSamplingStrategy {

data/simulation/config.schema.json

@@ -73,7 +73,7 @@
       "type": "object"
     },
     "LeiosVariant": {
-      "enum": ["short", "full", "full-without-ibs"],
+      "enum": ["short", "full", "full-without-ibs", "full-with-tx-references"],
       "type": "string"
     },
     "LogNormalDistribution": {

data/simulation/variants/config.full-with-tx-references.yaml

@@ -0,0 +1 @@
+leios-variant: full-with-tx-references

sim-rs/parameters/no-ibs.yaml

@@ -1,3 +1,4 @@
 leios-variant: full-without-ibs
+leios-mempool-strategy: random
 leios-late-ib-inclusion: true
-praos-chain-quality: 40
+praos-chain-quality: 100

sim-rs/parameters/tx-references.yaml

@@ -0,0 +1,4 @@
+leios-variant: full-with-tx-references
+leios-mempool-strategy: random
+leios-late-ib-inclusion: true
+praos-chain-quality: 100

sim-rs/sim-core/src/config.rs

@@ -8,7 +8,11 @@ use std::{
 use anyhow::{anyhow, bail, Result};
 use serde::{Deserialize, Serialize};
 
-use crate::{clock::Timestamp, model::TransactionId, probability::FloatDistribution};
+use crate::{
+    clock::Timestamp,
+    model::{Transaction, TransactionId},
+    probability::FloatDistribution,
+};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct NodeId(usize);
@@ -141,6 +145,7 @@ pub enum LeiosVariant {
     Short,
     Full,
     FullWithoutIbs,
+    FullWithTxReferences,
 }
 
 #[derive(Debug, Copy, Clone, Deserialize, PartialEq, Eq)]
@@ -338,6 +343,7 @@ impl CpuTimeConfig {
 
 #[derive(Debug, Clone)]
 pub(crate) struct BlockSizeConfig {
+    variant: LeiosVariant,
     pub block_header: u64,
     cert_constant: u64,
     cert_per_node: u64,
@@ -351,6 +357,7 @@ pub(crate) struct BlockSizeConfig {
 impl BlockSizeConfig {
     fn new(params: &RawParameters) -> Self {
         Self {
+            variant: params.leios_variant,
             block_header: params.rb_head_size_bytes,
             cert_constant: params.cert_size_bytes_constant,
             cert_per_node: params.cert_size_bytes_per_node,
@@ -366,6 +373,13 @@ impl BlockSizeConfig {
         self.cert_constant + self.cert_per_node * nodes as u64
     }
 
+    pub fn ib_payload(&self, txs: &[Arc<Transaction>]) -> u64 {
+        match self.variant {
+            LeiosVariant::FullWithTxReferences => txs.len() as u64 * self.eb_per_ib,
+            _ => txs.iter().map(|tx| tx.bytes).sum(),
+        }
+    }
+
     pub fn eb(&self, txs: usize, ibs: usize, ebs: usize) -> u64 {
         self.eb_constant + self.eb_per_ib * (txs + ibs + ebs) as u64
     }

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

@@ -462,7 +462,7 @@ impl EventTracker {
 
     pub fn track_ib_generated(&self, block: &crate::model::InputBlock) {
         let header_bytes = block.header.bytes;
-        let tx_payload_bytes = block.transactions.iter().map(|tx| tx.bytes).sum();
+        let tx_payload_bytes = block.tx_payload_bytes;
         self.send(Event::IBGenerated {
             id: self.to_input_block(block.header.id),
             slot: block.header.id.slot,

sim-rs/sim-core/src/model.rs

@@ -133,11 +133,12 @@ pub struct InputBlockHeader {
 #[derive(Debug)]
 pub struct InputBlock {
     pub header: InputBlockHeader,
+    pub tx_payload_bytes: u64,
     pub transactions: Vec<Arc<Transaction>>,
 }
 impl InputBlock {
     pub fn bytes(&self) -> u64 {
-        self.header.bytes + self.transactions.iter().map(|tx| tx.bytes).sum::<u64>()
+        self.header.bytes + self.tx_payload_bytes
     }
 }
 
@@ -215,6 +216,7 @@ pub enum NoVoteReason {
     MissingIB,
     MissingEB,
     ExtraTX,
+    MissingTX,
     UncertifiedEBReference,
 }
 

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

@@ -178,7 +178,7 @@ impl HasBytesSize for SimulationMessage {
 
             Self::AnnounceVotes(_) => 8,
             Self::RequestVotes(_) => 8,
-            Self::Votes(v) => 8 * v.ebs.len() as u64,
+            Self::Votes(v) => v.bytes,
         }
     }
 }

sim-rs/sim-core/src/sim/node.rs

@@ -723,6 +723,7 @@ impl Node {
             let transactions = self.select_txs_for_ib(header.shard);
             let ib = InputBlock {
                 header,
+                tx_payload_bytes: self.sim_config.sizes.ib_payload(&transactions),
                 transactions,
             };
             self.schedule_cpu_task(CpuTaskType::IBBlockGenerated(ib));
@@ -828,7 +829,9 @@ impl Node {
         let (&block, _, _) = match self.sim_config.variant {
             LeiosVariant::Short => candidates
                 .max_by_key(|(eb, age, votes)| (*age, self.count_txs_in_eb(eb), *votes))?,
-            LeiosVariant::Full | LeiosVariant::FullWithoutIbs => candidates
+            LeiosVariant::Full
+            | LeiosVariant::FullWithoutIbs
+            | LeiosVariant::FullWithTxReferences => candidates
                 .max_by_key(|(eb, age, votes)| (Reverse(*age), self.count_txs_in_eb(eb), *votes))?,
         };
 
@@ -1538,14 +1541,21 @@ impl Node {
             }
         }
 
-        for ib in &eb.ibs {
-            if !matches!(self.leios.ibs.get(ib), Some(InputBlockState::Received(_))) {
+        for ib_id in &eb.ibs {
+            let Some(InputBlockState::Received(ib)) = self.leios.ibs.get(ib_id) else {
                 return Err(NoVoteReason::MissingIB);
-            }
-            if !expected_ib_pipelines.contains(&ib.pipeline) {
+            };
+            if !expected_ib_pipelines.contains(&ib_id.pipeline) {
                 return Err(NoVoteReason::InvalidSlot);
             }
-            ib_set.insert(*ib);
+            if matches!(self.sim_config.variant, LeiosVariant::FullWithTxReferences) {
+                for tx in &ib.transactions {
+                    if !matches!(self.txs.get(&tx.id), Some(TransactionView::Received(_))) {
+                        return Err(NoVoteReason::MissingTX);
+                    }
+                }
+            }
+            ib_set.insert(*ib_id);
         }
 
         if let Some(expected_eb_pipelines) = self.pipelines_for_eb_references(eb.pipeline) {