Merge pull request #124 from bnb-chain/develop

fix: bsc snapshot issues (#122)

crates/blockchain-tree/src/chain.rs

@@ -214,13 +214,18 @@ impl AppendableChain {
         let block = block.unseal();
 
         let state = executor.execute((&block, U256::MAX, ancestor_blocks).into())?;
-        let BlockExecutionOutput { state, receipts, requests, .. } = state;
+        let BlockExecutionOutput { state, receipts, requests, gas_used: _, snapshot } = state;
         externals
             .consensus
             .validate_block_post_execution(&block, PostExecutionInput::new(&receipts, &requests))?;
 
-        let initial_execution_outcome =
-            ExecutionOutcome::new(state, receipts.into(), block.number, vec![requests.into()]);
+        let initial_execution_outcome = ExecutionOutcome::new_with_snapshots(
+            state,
+            receipts.into(),
+            block.number,
+            vec![requests.into()],
+            vec![snapshot.unwrap_or_default()],
+        );
 
         // check state root if the block extends the canonical chain __and__ if state root
         // validation was requested.

crates/bsc/evm/src/execute.rs

@@ -928,9 +928,10 @@ where
                     self.parlia.chain_spec().is_bohr_active_at_timestamp(header.timestamp),
                 )
                 .ok_or_else(|| BscBlockExecutionError::ApplySnapshotFailed)?;
+
+            cache.put(snap.block_hash, snap.clone());
         }
 
-        cache.put(snap.block_hash, snap.clone());
         Ok(snap)
     }
 

crates/cli/commands/src/stage/drop.rs

@@ -97,6 +97,7 @@ impl Command {
                 tx.clear::<tables::StorageChangeSets>()?;
                 tx.clear::<tables::Bytecodes>()?;
                 tx.clear::<tables::Receipts>()?;
+                tx.clear::<tables::ParliaSnapshot>()?;
                 tx.put::<tables::StageCheckpoints>(
                     StageId::Execution.to_string(),
                     Default::default(),