Artificial checkpoint only for 1st batch

Author: ii-cruz

blockchain/src/blockchain/history_sync.rs

@@ -196,41 +196,25 @@ impl Blockchain {
         let mut block_state = vec![];
         let mut block_transactions = vec![];
         let mut block_inherents = vec![];
-
-        let mut prev_batch = 0;
         let mut prev_block = 0;
+        let mut prev_batch = 0;
 
         for hist_tx in history.iter().skip(first_new_hist_tx) {
             if hist_tx.block_number > prev_block {
-                // If a macro block does not have any history items, we need to add it here so that
-                // we always commit FinalizeBatch/FinalizeEpoch inherents.
-                // FIXME We're missing the block timestamp to do this correctly.
-                // Also, this works only if a single macro block is missing between history items.
-                let batch_number = Policy::batch_at(hist_tx.block_number);
-                if batch_number > prev_batch
-                    && block_state.last().is_some_and(|block_state: &BlockState| {
-                        !Policy::is_macro_block_at(block_state.number)
-                    })
-                {
-                    debug!(
-                        history_item_block_number = hist_tx.block_number,
-                        prev_block,
-                        history_item_batch = batch_number,
-                        prev_batch,
-                        last_block = ?block_state.last(),
-                        "Inserting macro block"
+                let new_batch = Policy::batch_at(prev_block);
+                if prev_batch == 0 && new_batch > 1 {
+                    assert_eq!(
+                        new_batch, 2,
+                        "We cannot skip over macro blocks after batch 1 due to reward payout txs."
                     );
-                    assert_eq!(batch_number, prev_batch + 1, "Missing batch");
-
                     block_state.push(BlockState {
-                        number: Policy::macro_block_of(prev_batch).unwrap(),
-                        time: 0,                                        // FIXME
+                        number: Policy::macro_block_after(hist_tx.block_number),
+                        time: 0, // FIX ME change the response to never skip macro_blocks.
                         protocol_version: this.state.current_version(), // Cannot change, protocol version upgrades only on election blocks.
                     });
                     block_transactions.push(vec![]);
                     block_inherents.push(vec![]);
                 }
-
                 block_state.push(BlockState {
                     number: hist_tx.block_number,
                     time: hist_tx.block_time,
@@ -239,8 +223,8 @@ impl Blockchain {
                 block_transactions.push(vec![]);
                 block_inherents.push(vec![]);
 
-                prev_batch = batch_number;
                 prev_block = hist_tx.block_number;
+                prev_batch = new_batch;
             }
 
             match &hist_tx.data {