fix: Add test for gc and remove all panics.

velas · Feb 11, 2025 · bbe2b80 · bbe2b80
1 parent 4d83bb4
commit bbe2b80
Show file tree

Hide file tree

Showing 17 changed files with 238 additions and 72 deletions.
diff --git a/core/src/replay_stage.rs b/core/src/replay_stage.rs
@@ -35,7 +35,7 @@ use {
         block_error::BlockError,
         blockstore::Blockstore,
         blockstore_processor::{self, BlockstoreProcessorError, TransactionStatusSender},
-        evm::recoreder::EvmArchiveManagerSender,
+        evm::recorder::EvmArchiveManagerSender,
         leader_schedule_cache::LeaderScheduleCache,
         leader_schedule_utils::first_of_consecutive_leader_slots,
     },

diff --git a/core/src/tvu.rs b/core/src/tvu.rs
@@ -33,7 +33,7 @@ use {
     solana_gossip::cluster_info::ClusterInfo,
     solana_ledger::{
         blockstore::Blockstore, blockstore_processor::TransactionStatusSender,
-        evm::recoreder::EvmArchiveManagerSender, leader_schedule_cache::LeaderScheduleCache,
+        evm::recorder::EvmArchiveManagerSender, leader_schedule_cache::LeaderScheduleCache,
     },
     solana_poh::poh_recorder::PohRecorder,
     solana_rpc::{

diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -42,7 +42,7 @@ use {
         blockstore_db::{BlockstoreOptions, BlockstoreRecoveryMode, LedgerColumnOptions},
         blockstore_processor::{self, TransactionStatusSender},
         evm::{
-            recoreder::{
+            recorder::{
                 EvmArchiveManagerReceiver, EvmArchiveManagerSender, EvmArchiveManagerService,
             },
             EvmArchive, EvmArchiveInner, EvmArchiveType,

diff --git a/evm-utils/evm-state/src/state.rs b/evm-utils/evm-state/src/state.rs
@@ -275,7 +275,7 @@ impl EvmBackend<Incomming> {
         }
     }
 
-    pub fn set_initial(
+    pub fn init_accounts_without_commit(
         &mut self,
         accounts: impl IntoIterator<Item = (H160, evm::backend::MemoryAccount)>,
     ) {
@@ -298,7 +298,6 @@ impl EvmBackend<Incomming> {
             self.set_account_state(address, account_state);
             self.ext_storage(address, storage);
         }
-        self.flush_changes()
     }
 
     pub fn new_incomming_for_root(mut self, root: H256) -> Option<Self> {

diff --git a/evm-utils/evm-state/src/storage/mod.rs b/evm-utils/evm-state/src/storage/mod.rs
@@ -273,7 +273,7 @@ impl StorageSecondary {
     }
 
     fn open(location: Location, gc_enabled: bool) -> Result<Self> {
-        log::warn!("gc_enabled {}", gc_enabled);
+        log::debug!("gc_enabled {}", gc_enabled);
         let db_opts = default_db_opts()?;
 
         let descriptors = Descriptors::secondary_descriptors(gc_enabled);
@@ -321,7 +321,7 @@ impl Storage<OptimisticTransactionDB> {
     }
 
     fn open(location: Location, gc_enabled: bool) -> Result<Self> {
-        log::warn!("gc_enabled {}", gc_enabled);
+        log::debug!("gc_enabled {}", gc_enabled);
         log::info!("location is {:?}", location);
         let db_opts = default_db_opts()?;
 
@@ -332,7 +332,7 @@ impl Storage<OptimisticTransactionDB> {
 
         let descriptors = Descriptors::compute(exist_cfs, &db_opts, gc_enabled);
         let db = {
-            warn!("Trying as primary at : {:?}", &location);
+            info!("Trying as primary at : {:?}", &location);
             let mut db = DB::open_cf_descriptors(&db_opts, &location, descriptors.all)?;
 
             for removed_cf in descriptors.cleanup_cfs {
@@ -888,6 +888,8 @@ pub struct RootCleanup<'a> {
 }
 
 impl<'a> RootCleanup<'a> {
+    // cleanup nodes from trie,
+    // remove only nodes that already has zero parents.
     pub fn new(storage: &'a Storage, roots: Vec<H256>) -> Self {
         Self {
             elems: roots,

diff --git a/evm-utils/subchain-manager/src/implementation.rs b/evm-utils/subchain-manager/src/implementation.rs
@@ -75,7 +75,8 @@ impl genesis_json::GenesisConfig {
         let simulation = client.simulate_transaction(&transaction)?;
         if let Some(err) = simulation.value.err {
             return Err(color_eyre::eyre::Error::msg(format!(
-                "Simulation error: {err}"
+                "Simulation error: {err}, logs: {:?}",
+                simulation.value.logs
             )));
         }
 

diff --git a/ledger/src/bank_forks_utils.rs b/ledger/src/bank_forks_utils.rs
@@ -5,7 +5,7 @@ use {
             self, BlockstoreProcessorError, CacheBlockMetaSender, ProcessOptions,
             TransactionStatusSender,
         },
-        evm::recoreder::EvmArchiveManagerSender,
+        evm::recorder::EvmArchiveManagerSender,
         leader_schedule_cache::LeaderScheduleCache,
     },
     crossbeam_channel::unbounded,

diff --git a/ledger/src/blockstore_processor.rs b/ledger/src/blockstore_processor.rs
@@ -4,7 +4,7 @@ use {
         blockstore::Blockstore,
         blockstore_db::BlockstoreError,
         blockstore_meta::SlotMeta,
-        evm::recoreder::{EvmArchiveManagerRequest, EvmArchiveManagerSender, RecorderEntry},
+        evm::recorder::{EvmArchiveManagerRequest, EvmArchiveManagerSender, RecorderEntry},
         leader_schedule_cache::LeaderScheduleCache,
         token_balances::collect_token_balances,
     },