refactor: receive external block in mine_external methods (#1731)

Author: dinhani-cw

src/bin/importer_offline.rs

@@ -157,10 +157,10 @@ fn execute_block_importer(
 
             // re-execute (and import) block
             batch_tx_len += block.transactions.len();
-            executor.execute_external_block(block, &mut receipts)?;
+            executor.execute_external_block(block.clone(), &mut receipts)?;
 
             // mine and save block
-            miner.mine_external_and_commit()?;
+            miner.mine_external_and_commit(block)?;
         }
         let batch_duration = before_block.elapsed();
 

src/eth/follower/importer/importer.rs

@@ -180,7 +180,7 @@ impl Importer {
             let mut receipts = ExternalReceipts::from(receipts);
             #[cfg(feature = "metrics")]
             let receipts_len = receipts.len();
-            if let Err(e) = executor.execute_external_block(block, &mut receipts) {
+            if let Err(e) = executor.execute_external_block(block.clone(), &mut receipts) {
                 let message = GlobalState::shutdown_from(TASK_NAME, "failed to reexecute external block");
                 return log_and_err!(reason = e, message);
             };
@@ -200,7 +200,7 @@ impl Importer {
                 );
             }
 
-            if let Err(e) = miner.mine_external_and_commit() {
+            if let Err(e) = miner.mine_external_and_commit(block) {
                 let message = GlobalState::shutdown_from(TASK_NAME, "failed to mine external block");
                 return log_and_err!(reason = e, message);
             };

src/eth/miner/miner.rs

@@ -237,17 +237,17 @@ impl Miner {
     }
 
     /// Same as [`Self::mine_external`], but automatically commits the block instead of returning it.
-    pub fn mine_external_and_commit(&self) -> anyhow::Result<()> {
+    pub fn mine_external_and_commit(&self, external_block: ExternalBlock) -> anyhow::Result<()> {
         let _mine_and_commit_lock = self.locks.mine_and_commit.lock().map_lock_error("mine_external_and_commit")?;
 
-        let block = self.mine_external()?;
+        let block = self.mine_external(external_block)?;
         self.commit(block)
     }
 
     /// Mines external block and external transactions.
     ///
     /// Local transactions are not allowed to be part of the block.
-    pub fn mine_external(&self) -> anyhow::Result<Block> {
+    pub fn mine_external(&self, external_block: ExternalBlock) -> anyhow::Result<Block> {
         // track
         #[cfg(feature = "tracing")]
         let _span = info_span!("miner::mine_external", block_number = field::Empty).entered();
@@ -258,9 +258,6 @@ impl Miner {
         // mine block
         let block = self.storage.finish_pending_block()?;
         Span::with(|s| s.rec_str("block_number", &block.header.number));
-        let Some(external_block) = block.external_block else {
-            return log_and_err!("failed to mine external block because there is no external block being reexecuted");
-        };
 
         // mine transactions
         let mut external_txs = Vec::with_capacity(block.transactions.len());