merge main

src/node.rs

@@ -730,7 +730,10 @@ impl<S: ForkSource + std::fmt::Debug> InMemoryNode<S> {
             let mut block_hashes = HashMap::<u64, H256>::new();
             block_hashes.insert(0, H256::zero());
             let mut blocks = HashMap::<H256, Block<TransactionVariant>>::new();
-            blocks.insert(H256::zero(), create_empty_block(0, 0, 1));
+            blocks.insert(
+                H256::zero(),
+                create_empty_block(0, NON_FORK_FIRST_BLOCK_TIMESTAMP, 0),
+            );
 
             InMemoryNodeInner {
                 current_timestamp: NON_FORK_FIRST_BLOCK_TIMESTAMP,

src/utils.rs

@@ -107,6 +107,7 @@ pub fn mine_empty_blocks<S: std::fmt::Debug + ForkSource>(
             // we need these to use the unsafeOverrideBlock method in SystemContext.sol
             let bootloader_code = node.system_contracts.contacts_for_l2_call();
             let (batch_env, mut next_block) = node.create_l1_batch_env(storage.clone());
+            println!("timestamp {}", next_block.timestamp);
             // override the next block's timestamp to match up with interval for subsequent blocks
             if i != 0 {
                 next_block.timestamp = node.current_timestamp.saturating_add(interval_ms);