chore: more alloy num changes

Author: Evalir

examples/trevm_block_driver_example.rs

@@ -38,8 +38,8 @@ struct SimpleBlock {
 
 impl Block for SimpleBlock {
     fn fill_block_env(&self, block_env: &mut BlockEnv) {
-        block_env.number = self.number;
-        block_env.timestamp = self.timestamp;
+        block_env.number = U256::from(self.number);
+        block_env.timestamp = U256::from(self.timestamp);
         block_env.gas_limit = 30_000_000u64; // 30M gas limit
     }
 }

examples/tx_tracer_cli.rs

@@ -79,8 +79,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // Prepare block environment
     let mut block_env = BlockEnv::default();
-    block_env.number = 1;
-    block_env.timestamp = 1234567890;
+    block_env.number = U256::from(1u64);
+    block_env.timestamp = U256::from(1234567890u64);
     block_env.gas_limit = 30_000_000;
     block_env.basefee = 1_000_000_000; // 1 gwei
     block_env.beneficiary = Address::with_last_byte(255);

src/fill/alloy.rs

@@ -299,7 +299,7 @@ impl Block for alloy::consensus::Header {
 
         if let Some(excess_blob_gas) = self.excess_blob_gas {
             block_env
-                .set_blob_excess_gas_and_price(excess_blob_gas, self.withdrawals_root.is_some());
+                .set_blob_excess_gas_and_price(excess_blob_gas, revm::primitives::eip4844::BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE);
         }
     }
 
@@ -329,7 +329,7 @@ impl Block for alloy::rpc::types::eth::Header {
         *prevrandao = Some(self.mix_hash);
         *blob_excess_gas_and_price = self
             .blob_gas_used
-            .map(|bgu| BlobExcessGasAndPrice::new(bgu, self.withdrawals_root.is_some()));
+            .map(|bgu| BlobExcessGasAndPrice::new(bgu, revm::primitives::eip4844::BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE));
     }
 }
 

src/fill/traits.rs

@@ -197,16 +197,16 @@ mod test {
                 prevrandao,
                 blob_excess_gas_and_price,
             } = block_env;
-            *number = 1;
+            *number = U256::ONE;
             *beneficiary = Default::default();
-            *timestamp = 1720450148; // Time when I was writing the test code
+            *timestamp = U256::from(1720450148u64); // Time when I was writing the test code
             *gas_limit = 30_000_000;
             *basefee = 5 * GWEI_TO_WEI;
 
             let diff = B256::repeat_byte(0xab);
             *prevrandao = Some(diff);
             *difficulty = U256::from_be_bytes(diff.into());
-            *blob_excess_gas_and_price = Some(BlobExcessGasAndPrice::new(1_000_000, false));
+            *blob_excess_gas_and_price = Some(BlobExcessGasAndPrice::new(1_000_000, revm::primitives::eip4844::BLOB_BASE_FEE_UPDATE_FRACTION_PRAGUE));
         }
 
         fn tx_count_hint(&self) -> Option<usize> {

src/journal/coder.rs

@@ -686,20 +686,16 @@ mod test {
         roundtrip(&changed_acc);
 
         let bytecode = Bytecode::new_raw(Bytes::from(vec![1, 2, 3]));
-        let eof_bytes = Bytecode::Eof(Arc::new(Eof::default()));
         roundtrip(&bytecode);
-        roundtrip(&eof_bytes);
 
         let bsi = BundleStateIndex {
             state: vec![
                 (Address::repeat_byte(0xa), created_acc),
-                (Address::repeat_byte(0xb), changed_acc),
             ]
             .into_iter()
             .collect(),
             new_contracts: vec![
                 (B256::repeat_byte(0xa), Cow::Owned(bytecode)),
-                (B256::repeat_byte(0xb), Cow::Owned(eof_bytes)),
             ]
             .into_iter()
             .collect(),

src/system/eip2935.rs

@@ -75,12 +75,12 @@ mod test {
         let mut trevm = crate::test_utils::test_trevm().fill_cfg(&NoopCfg).fill_block(&NoopBlock);
 
         trevm.inner_mut_unchecked().modify_block(|block| {
-            block.number = block_num;
+            block.number = U256::from(block_num);
         });
 
         // we set the previous block hash in the cachedb, as it will be loaded
         // during eip application
-        trevm.inner_mut_unchecked().db().cache.block_hashes.insert(prev_block_num, prev_hash);
+        trevm.inner_mut_unchecked().db_mut().cache.block_hashes.insert(prev_block_num, prev_hash);
 
         trevm.apply_eip2935().unwrap();
 

src/system/eip4788.rs

@@ -89,7 +89,7 @@ mod test {
         let mut trevm = crate::test_utils::test_trevm().fill_cfg(&NoopCfg).fill_block(&NoopBlock);
 
         trevm.inner_mut_unchecked().modify_block(|block| {
-            block.timestamp = timestamp;
+            block.timestamp = U256::from(timestamp);
         });
 
         let parent_beacon_root = B256::repeat_byte(0xaa);