chore: activate prague hardfork and Solidity version 0.8.30 as default (#10565)

* start defaulting to prague, add fix for blob handle scaling post cancun

* fix anvil test

* switch to 0.8.30 for tests

* switch foundry-compilers to default to prague, small test fixes

* add workaround for Vyper not yet supporting Prague

* fix issues

* fix tests, questionable gas difference and address difference

* make prague explicit

* fix clippy

* bump compilers version

* bump to 0.16.3

* pass in blob params, add normalize vyper evm version helper, fix solar iter 0.1.4

* temporarily allow compilers git patch

* bump to msrv 1.87 in line with foundry-compilers

* bump compilers version

* bump to foundry-compilers 0.17.1

Author: zerosnacks

Cargo.lock

@@ -31,7 +31,7 @@ resolver = "2"
 version = "1.2.2"
 edition = "2021"
 # Remember to update clippy.toml as well
-rust-version = "1.86"
+rust-version = "1.87"
 authors = ["Foundry Contributors"]
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/foundry-rs/foundry"
@@ -198,14 +198,14 @@ foundry-wallets = { path = "crates/wallets" }
 foundry-linking = { path = "crates/linking" }
 
 # solc & compilation utilities
-foundry-block-explorers = { version = "0.17.0", default-features = false }
-foundry-compilers = { version = "0.16.1", default-features = false }
+foundry-block-explorers = { version = "0.18.0", default-features = false }
+foundry-compilers = { version = "0.17.1", default-features = false }
 foundry-fork-db = "0.15"
 solang-parser = { version = "=0.3.9", package = "foundry-solang-parser" }
-solar-ast = { version = "=0.1.3", default-features = false }
-solar-parse = { version = "=0.1.3", default-features = false }
-solar-interface = { version = "=0.1.3", default-features = false }
-solar-sema = { version = "=0.1.3", default-features = false }
+solar-ast = { version = "=0.1.4", default-features = false }
+solar-parse = { version = "=0.1.4", default-features = false }
+solar-interface = { version = "=0.1.4", default-features = false }
+solar-sema = { version = "=0.1.4", default-features = false }
 
 ## alloy
 alloy-consensus = { version = "1.0.7", default-features = false }
@@ -401,4 +401,5 @@ zip-extract = "=0.2.1"
 # revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors.git", rev = "a625c04" }
 
 ## foundry
+# foundry-compilers = { git = "https://github.com/foundry-rs/compilers.git", rev = "855dee4" }
 # foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "811a61a" }

Cargo.toml

@@ -1,4 +1,4 @@
-msrv = "1.86"
+msrv = "1.87"
 
 # `bytes::Bytes` is included by default and `alloy_primitives::Bytes` is a wrapper around it,
 # so it is safe to ignore it as well.

clippy.toml

@@ -780,11 +780,17 @@ impl Backend {
 
     /// Returns [`BlobParams`] corresponding to the current spec.
     pub fn blob_params(&self) -> BlobParams {
-        if self.env.read().evm_env.cfg_env.spec >= SpecId::PRAGUE {
-            BlobParams::prague()
-        } else {
-            BlobParams::cancun()
+        let spec_id = self.env.read().evm_env.cfg_env.spec;
+
+        if spec_id >= SpecId::OSAKA {
+            return BlobParams::osaka();
         }
+
+        if spec_id >= SpecId::PRAGUE {
+            return BlobParams::prague();
+        }
+
+        BlobParams::cancun()
     }
 
     /// Returns an error if EIP1559 is not active (pre Berlin)

crates/anvil/src/eth/backend/mem/mod.rs

@@ -192,6 +192,8 @@ pub fn calculate_next_block_base_fee(gas_used: u64, gas_limit: u64, base_fee: u6
 
 /// An async service that takes care of the `FeeHistory` cache
 pub struct FeeHistoryService {
+    /// blob parameters for the current spec
+    blob_params: BlobParams,
     /// incoming notifications about new blocks
     new_blocks: NewBlockNotifications,
     /// contains all fee history related entries
@@ -204,11 +206,18 @@ pub struct FeeHistoryService {
 
 impl FeeHistoryService {
     pub fn new(
+        blob_params: BlobParams,
         new_blocks: NewBlockNotifications,
         cache: FeeHistoryCache,
         storage_info: StorageInfo,
     ) -> Self {
-        Self { new_blocks, cache, fee_history_limit: MAX_FEE_HISTORY_CACHE_SIZE, storage_info }
+        Self {
+            blob_params,
+            new_blocks,
+            cache,
+            fee_history_limit: MAX_FEE_HISTORY_CACHE_SIZE,
+            storage_info,
+        }
     }
 
     /// Returns the configured history limit
@@ -245,7 +254,8 @@ impl FeeHistoryService {
         let base_fee = header.base_fee_per_gas.map(|g| g as u128).unwrap_or_default();
         let excess_blob_gas = header.excess_blob_gas.map(|g| g as u128);
         let blob_gas_used = header.blob_gas_used.map(|g| g as u128);
-        let base_fee_per_blob_gas = header.blob_fee(BlobParams::cancun());
+        let base_fee_per_blob_gas = header.blob_fee(self.blob_params);
+
         let mut item = FeeHistoryCacheItem {
             base_fee,
             gas_used_ratio: 0f64,

crates/anvil/src/eth/fees.rs

@@ -19,13 +19,15 @@ use crate::{
     shutdown::Signal,
     tasks::TaskManager,
 };
+use alloy_eips::eip7840::BlobParams;
 use alloy_primitives::{Address, U256};
 use alloy_signer_local::PrivateKeySigner;
 use eth::backend::fork::ClientFork;
 use eyre::Result;
 use foundry_common::provider::{ProviderBuilder, RetryProvider};
 use futures::{FutureExt, TryFutureExt};
 use parking_lot::Mutex;
+use revm::primitives::hardfork::SpecId;
 use server::try_spawn_ipc;
 use std::{
     future::Future,
@@ -198,6 +200,11 @@ pub async fn try_spawn(mut config: NodeConfig) -> Result<(EthApi, NodeHandle)> {
 
     let fee_history_cache = Arc::new(Mutex::new(Default::default()));
     let fee_history_service = FeeHistoryService::new(
+        match backend.spec_id() {
+            SpecId::OSAKA => BlobParams::osaka(),
+            SpecId::PRAGUE => BlobParams::prague(),
+            _ => BlobParams::cancun(),
+        },
         backend.new_block_notifications(),
         Arc::clone(&fee_history_cache),
         StorageInfo::new(Arc::clone(&backend)),

crates/anvil/src/lib.rs

@@ -165,7 +165,7 @@ impl RunArgs {
             if evm_version.is_none() {
                 // if the block has the excess_blob_gas field, we assume it's a Cancun block
                 if block.header.excess_blob_gas.is_some() {
-                    evm_version = Some(EvmVersion::Cancun);
+                    evm_version = Some(EvmVersion::Prague);
                 }
             }
             apply_chain_and_block_specific_env_changes::<AnyNetwork>(env.as_env_mut(), block);

crates/cast/src/cmd/run.rs

@@ -2329,7 +2329,7 @@ contract CounterInExternalLibScript is Script {
 ...
 Traces:
   [..] → new <unknown>@0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512
-    ├─ [..] 0x52F3e85EC3F0f9D0a2200D646482fcD134D5adc9::updateCounterInExternalLib(0, 100) [delegatecall]
+    ├─ [..] 0x6fD8bf6770F4bEe578348D24028000cE9c4D2bB9::updateCounterInExternalLib(0, 100) [delegatecall]
     │   └─ ← [Stop]
     └─ ← [Return] 62 bytes of code
 

crates/cast/tests/cli/main.rs

@@ -234,7 +234,7 @@ impl<'hir> Visit<'hir> for BytecodeDependencyCollector<'hir> {
                         for &var in clause.args {
                             self.visit_nested_var(var)?;
                         }
-                        for stmt in clause.block {
+                        for stmt in clause.block.stmts {
                             self.visit_stmt(stmt)?;
                         }
                     }

crates/common/src/preprocessor/deps.rs

@@ -79,7 +79,7 @@ allow_paths = []
 # additional solc include paths
 include_paths = []
 force = false
-evm_version = 'shanghai'
+evm_version = 'prague'
 gas_reports = ['*']
 gas_reports_ignore = []
 ## Sets the concrete solc version to use, this overrides the `auto_detect_solc` value