lazy evaluate genesis timestamp

ChainSafe · Mar 3, 2023 · d57f68e · d57f68e
1 parent 15e4ee3
commit d57f68e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/blockchain/state_manager/Cargo.toml b/blockchain/state_manager/Cargo.toml
@@ -39,6 +39,7 @@ lazy_static.workspace = true
 lru.workspace = true
 num-traits.workspace = true
 num.workspace = true
+once_cell.workspace = true
 parking_lot.workspace = true
 prometheus.workspace = true
 serde = { workspace = true, features = ["derive"] }

diff --git a/blockchain/state_manager/src/lib.rs b/blockchain/state_manager/src/lib.rs
@@ -41,6 +41,7 @@ use fvm_shared::clock::ChainEpoch;
 use lru::LruCache;
 use num::BigInt;
 use num_traits::identities::Zero;
+use once_cell::unsync::Lazy;
 use parking_lot::Mutex as SyncMutex;
 use serde::{Deserialize, Serialize};
 use tokio::sync::{broadcast::error::RecvError, Mutex as TokioMutex, RwLock};
@@ -397,11 +398,16 @@ where
         };
 
         let mut parent_state = *p_state;
-        let genesis_timestamp = self.chain_store().genesis().unwrap().timestamp();
+        let genesis_timestamp = Lazy::new(|| {
+            self.chain_store()
+                .genesis()
+                .expect("could not find genesis block!")
+                .timestamp()
+        });
 
         for epoch_i in parent_epoch..epoch {
             if epoch_i > parent_epoch {
-                let timestamp = genesis_timestamp + ((EPOCH_DURATION_SECONDS * epoch_i) as u64);
+                let timestamp = *genesis_timestamp + ((EPOCH_DURATION_SECONDS * epoch_i) as u64);
                 let mut vm = create_vm(parent_state, epoch_i, timestamp)?;
                 // run cron for null rounds if any
                 if let Err(e) = vm.run_cron(epoch_i, callback.as_mut()) {