sim-rs: display more info about EBs with TXs in UI

Author: SupernaviX

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

@@ -123,6 +123,7 @@ impl TraceAggregator {
                 pipeline,
                 producer,
                 size_bytes,
+                transactions,
                 input_blocks,
                 endorser_blocks,
                 ..
@@ -134,6 +135,7 @@ impl TraceAggregator {
                         slot,
                         pipeline,
                         bytes: size_bytes,
+                        txs: transactions.iter().map(|tx| tx.id).collect(),
                         ibs: input_blocks
                             .iter()
                             .map(|ib| self.ibs.get(&ib.id).unwrap().clone())
@@ -144,14 +146,16 @@ impl TraceAggregator {
                             .collect(),
                     },
                 );
-                for tx in input_blocks
+                for tx_id in input_blocks
                     .iter()
                     .map(|ib| self.ibs.get(&ib.id).unwrap())
                     .flat_map(|ib| ib.txs.iter())
+                    .map(|tx| tx.id)
+                    .chain(transactions.iter().map(|tx| tx.id))
                 {
                     let status = self
                         .tx_statuses
-                        .entry(tx.id)
+                        .entry(tx_id)
                         .or_insert(TransactionStatus::InEb);
                     if matches!(status, TransactionStatus::Created | TransactionStatus::InIb) {
                         *status = TransactionStatus::InEb;
@@ -404,6 +408,7 @@ struct EndorsementBlock {
     slot: u64,
     pipeline: u64,
     bytes: u64,
+    txs: Vec<TransactionId>,
     ibs: Vec<InputBlock>,
     ebs: Vec<EndorsementBlock>,
 }

ui/src/components/Blocks/modules/BlockContents.tsx

@@ -138,6 +138,7 @@ const EndorserBlock: FC<IEndorserBlockProps> = ({ eb, hovered, onHover, onClick
     <Box hovered={hovered} onHover={onHover} onClick={onClick}>
       Endorser Block
       <span className='text-sm'>Pipeline {eb.pipeline}, Slot {eb.slot}</span>
+      {eb.txs.length ? <span className='text-sm'>References {eb.txs.length} TX(s)</span> : null}
       {eb.ibs.length ? <span className='text-sm'>References {eb.ibs.length} IB(s)</span> : null}
       {eb.ebs.length ? <span className='text-sm'>References {eb.ebs.length} EB(s)</span> : null}
     </Box>

ui/src/components/Blocks/modules/BlockGraph.tsx

@@ -15,7 +15,8 @@ export const BlockGraph: FC = ({ }) => {
   const data = useMemo(() => {
     return blocks.map(b => {
       const praosTx = b.txs.reduce((txs, tx) => { txs.add(tx.id); return txs; }, new Set()).size;
-      const leiosTx = b.cert?.eb.ibs.reduce((txs, ib) => { ib.txs.forEach(tx => txs.add(tx.id)); return txs }, new Set()).size ?? 0;
+      const leiosTx = b.cert?.eb.ibs.reduce((txs, ib) => { ib.txs.forEach(tx => txs.add(tx.id)); return txs }, new Set()).size ?? 0
+        + (b.cert?.eb.txs.length ?? 0);
       return {
         name: `Slot ${b.slot}`,
         praosTx,

ui/src/components/Sim/hooks/utils.ts

@@ -54,6 +54,7 @@ const getNodeData = (aggregationNodeDataRef: ISimulationAggregatedDataState, nod
 
 const extractEb = (intermediate: ISimulationIntermediateDataState, ebId: string): ISimulationEndorsementBlock => {
   const eb = intermediate.ebs.get(ebId)!;
+  const txs = eb.txs.map(id => intermediate.txs[Number(id)]);
   const ibs = eb.ibs.map(id => {
     const ib = intermediate.ibs.get(id)!;
     for (const tx of ib.txs) {
@@ -77,6 +78,7 @@ const extractEb = (intermediate: ISimulationIntermediateDataState, ebId: string)
     slot: eb.slot,
     pipeline: eb.pipeline,
     bytes: eb.bytes,
+    txs,
     ibs,
     ebs,
   }
@@ -145,18 +147,25 @@ export const processMessage = (
     trackDataReceived(aggregatedData, intermediate, message.recipient, "pb", message.id);
   } else if (message.type === EMessageType.EBGenerated) {
     trackDataGenerated(aggregatedData, intermediate, message.producer, "eb", message.id, message.size_bytes);
-    for (const { id: ibId } of message.input_blocks) {
+    for (const { id: ibId } of message.input_blocks ?? []) {
       for (const tx of intermediate.ibs.get(ibId)?.txs ?? []) {
         if (intermediate.txStatuses[tx] === 'created' || intermediate.txStatuses[tx] === 'inIb') {
           intermediate.txStatuses[tx] = 'inEb';
         }
       }
     }
+    for (const { id: txId } of message.transactions ?? []) {
+      const tx = Number(txId);
+      if (intermediate.txStatuses[tx] === 'created' || intermediate.txStatuses[tx] === 'inIb') {
+        intermediate.txStatuses[tx] = 'inEb';
+      }
+    }
     intermediate.ebs.set(message.id, {
       slot: message.slot,
       pipeline: message.pipeline,
       bytes: message.size_bytes,
-      ibs: message.input_blocks.map(ib => ib.id),
+      txs: message.transactions?.map(tx => tx.id) ?? [],
+      ibs: message.input_blocks?.map(ib => ib.id) ?? [],
       ebs: message.endorser_blocks.map(eb => eb.id),
     });
   } else if (message.type === EMessageType.EBSent) {

ui/src/components/Sim/types.ts

@@ -159,8 +159,13 @@ export interface IEndorserBlockGenerated {
   pipeline: number;
   producer: string;
   size_bytes: number;
-  input_blocks: IInputBlock[]
-  endorser_blocks: IEndorserBlock[]
+  transactions?: ITransaction[];
+  input_blocks?: IInputBlock[];
+  endorser_blocks: IEndorserBlock[];
+}
+
+export interface ITransaction {
+  id: string;
 }
 
 export interface IInputBlock {

ui/src/contexts/SimContext/types.ts

@@ -63,6 +63,7 @@ export interface ISimulationEndorsementBlock {
   slot: number;
   pipeline: number;
   bytes: number;
+  txs: ISimulationTransaction[];
   ibs: ISimulationInputBlock[];
   ebs: ISimulationEndorsementBlock[];
 }
@@ -99,6 +100,7 @@ export interface ISimulationIntermediateEndorsementBlock {
   slot: number;
   pipeline: number;
   bytes: number;
+  txs: string[];
   ibs: string[];
   ebs: string[];
 }