minor and epoch_length = 1200

near · Mar 23, 2023 · 4ebf500 · 4ebf500
1 parent e23c39a
commit 4ebf500
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/chain/chain/src/store.rs b/chain/chain/src/store.rs
@@ -1984,7 +1984,7 @@ impl<'a> ChainStoreUpdate<'a> {
         for _header_hash in header_hashes {
             // 3. Delete header_hash-indexed data
             // TODO #3488: enable
-            self.gc_col(DBCol::BlockHeader, _header_hash.as_bytes());
+            // self.gc_col(DBCol::BlockHeader, _header_hash.as_bytes());
         }
 
         // 4. Delete chunks_tail-related data

diff --git a/nearcore/src/config.rs b/nearcore/src/config.rs
@@ -97,7 +97,7 @@ pub const CHUNK_PRODUCER_KICKOUT_THRESHOLD: u8 = 90;
 /// Fast mode constants for testing/developing.
 pub const FAST_MIN_BLOCK_PRODUCTION_DELAY: u64 = 120;
 pub const FAST_MAX_BLOCK_PRODUCTION_DELAY: u64 = 500;
-pub const FAST_EPOCH_LENGTH: BlockHeightDelta = 60;
+pub const FAST_EPOCH_LENGTH: BlockHeightDelta = 1200;
 
 /// Expected number of blocks per year
 pub const NUM_BLOCKS_PER_YEAR: u64 = 365 * 24 * 60 * 60;

diff --git a/tools/reset-head/src/cli.rs b/tools/reset-head/src/cli.rs
@@ -58,6 +58,11 @@ impl ResetHeadToPrevCommand {
 
         // chain_store_update.dec_block_refcount(&prev_hash)?;
 
+        // stop if it's already the final block
+        if current_final_head.height >= prev_tip.height {
+            return Err(anyhow::anyhow!("cannot revert past final block"))
+        }
+
         // clear block data for current head
         chain_store_update.clear_block_data_head_reset(head_hash)?;