diff --git a/Cargo.lock b/Cargo.lock index 6e00dfc44..9552173d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2325,7 +2325,7 @@ dependencies = [ [[package]] name = "base-common-chains" version = "0.0.0" -source = "git+https://github.com/base/base.git?rev=f9d7bf5072faaf33b803d23f3102e4def1b23d75#f9d7bf5072faaf33b803d23f3102e4def1b23d75" +source = "git+https://github.com/base/base.git?rev=990694fce8f1358b71cf0854e871f74e2a3e2cb9#990694fce8f1358b71cf0854e871f74e2a3e2cb9" dependencies = [ "alloy-chains", "alloy-eips", @@ -2341,7 +2341,7 @@ dependencies = [ [[package]] name = "base-common-consensus" version = "0.0.0" -source = "git+https://github.com/base/base.git?rev=f9d7bf5072faaf33b803d23f3102e4def1b23d75#f9d7bf5072faaf33b803d23f3102e4def1b23d75" +source = "git+https://github.com/base/base.git?rev=990694fce8f1358b71cf0854e871f74e2a3e2cb9#990694fce8f1358b71cf0854e871f74e2a3e2cb9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2365,7 +2365,7 @@ dependencies = [ [[package]] name = "base-common-eip8130" version = "0.0.0" -source = "git+https://github.com/base/base.git?rev=f9d7bf5072faaf33b803d23f3102e4def1b23d75#f9d7bf5072faaf33b803d23f3102e4def1b23d75" +source = "git+https://github.com/base/base.git?rev=990694fce8f1358b71cf0854e871f74e2a3e2cb9#990694fce8f1358b71cf0854e871f74e2a3e2cb9" dependencies = [ "alloy-primitives", "base-common-consensus", @@ -2375,7 +2375,7 @@ dependencies = [ [[package]] name = "base-common-genesis" version = "0.0.0" -source = "git+https://github.com/base/base.git?rev=f9d7bf5072faaf33b803d23f3102e4def1b23d75#f9d7bf5072faaf33b803d23f3102e4def1b23d75" +source = "git+https://github.com/base/base.git?rev=990694fce8f1358b71cf0854e871f74e2a3e2cb9#990694fce8f1358b71cf0854e871f74e2a3e2cb9" dependencies = [ "alloy-chains", "alloy-consensus", @@ -2393,7 +2393,7 @@ dependencies = [ [[package]] name = "base-common-precompiles" version = "0.0.0" -source = "git+https://github.com/base/base.git?rev=f9d7bf5072faaf33b803d23f3102e4def1b23d75#f9d7bf5072faaf33b803d23f3102e4def1b23d75" +source = "git+https://github.com/base/base.git?rev=990694fce8f1358b71cf0854e871f74e2a3e2cb9#990694fce8f1358b71cf0854e871f74e2a3e2cb9" dependencies = [ "alloy-evm", "alloy-primitives", @@ -2409,7 +2409,7 @@ dependencies = [ [[package]] name = "base-precompile-macros" version = "0.0.0" -source = "git+https://github.com/base/base.git?rev=f9d7bf5072faaf33b803d23f3102e4def1b23d75#f9d7bf5072faaf33b803d23f3102e4def1b23d75" +source = "git+https://github.com/base/base.git?rev=990694fce8f1358b71cf0854e871f74e2a3e2cb9#990694fce8f1358b71cf0854e871f74e2a3e2cb9" dependencies = [ "alloy-primitives", "proc-macro2", @@ -2420,7 +2420,7 @@ dependencies = [ [[package]] name = "base-precompile-storage" version = "0.0.0" -source = "git+https://github.com/base/base.git?rev=f9d7bf5072faaf33b803d23f3102e4def1b23d75#f9d7bf5072faaf33b803d23f3102e4def1b23d75" +source = "git+https://github.com/base/base.git?rev=990694fce8f1358b71cf0854e871f74e2a3e2cb9#990694fce8f1358b71cf0854e871f74e2a3e2cb9" dependencies = [ "alloy-evm", "alloy-primitives", diff --git a/crates/anvil/src/cmd.rs b/crates/anvil/src/cmd.rs index 995829ae7..60b70ae73 100644 --- a/crates/anvil/src/cmd.rs +++ b/crates/anvil/src/cmd.rs @@ -850,7 +850,7 @@ mod tests { let args: NodeArgs = NodeArgs::parse_from(["anvil", "--base"]); assert_eq!( args.evm.networks.base_upgrade(), - Some(foundry_evm_networks::BaseUpgrade::Cobalt) + Some(foundry_evm_networks::BaseUpgrade::Denim) ); } diff --git a/crates/evm/networks/Cargo.toml b/crates/evm/networks/Cargo.toml index 98465e963..41eecff0a 100644 --- a/crates/evm/networks/Cargo.toml +++ b/crates/evm/networks/Cargo.toml @@ -29,8 +29,8 @@ alloy-primitives = { workspace = true, features = [ # github.com/base/base; bump via ./script/bump-base.sh. To iterate against a # local base/base checkout instead, uncomment the [patch] block at the bottom # of the workspace root Cargo.toml. -base-common-precompiles = { git = "https://github.com/base/base.git", rev = "f9d7bf5072faaf33b803d23f3102e4def1b23d75" } -base-common-chains = { git = "https://github.com/base/base.git", rev = "f9d7bf5072faaf33b803d23f3102e4def1b23d75" } +base-common-precompiles = { git = "https://github.com/base/base.git", rev = "990694fce8f1358b71cf0854e871f74e2a3e2cb9" } +base-common-chains = { git = "https://github.com/base/base.git", rev = "990694fce8f1358b71cf0854e871f74e2a3e2cb9" } revm = { workspace = true, features = [ "std", diff --git a/crates/evm/networks/src/lib.rs b/crates/evm/networks/src/lib.rs index 6050cc5d4..f31ddc9d8 100644 --- a/crates/evm/networks/src/lib.rs +++ b/crates/evm/networks/src/lib.rs @@ -58,7 +58,7 @@ const DEFAULT_BASE_ACTIVATION_ADMIN: Address = /// `--base` is passed with no value. Deliberately not tied to upstream /// `BaseUpgrade::LATEST` (`Beryl`), which lags base-anvil's own release /// cadence; bump this alongside `./script/bump-base.sh` as new upgrades land. -const DEFAULT_BASE_UPGRADE: BaseUpgrade = BaseUpgrade::Cobalt; +const DEFAULT_BASE_UPGRADE: BaseUpgrade = BaseUpgrade::Denim; pub mod celo; @@ -118,7 +118,7 @@ pub struct NetworkConfigs { long, conflicts_with = "celo", num_args(0..=1), - default_missing_value = "cobalt", // keep in sync with DEFAULT_BASE_UPGRADE + default_missing_value = "denim", // keep in sync with DEFAULT_BASE_UPGRADE )] #[serde(default, with = "base_flag")] base: Option, @@ -347,10 +347,10 @@ mod tests { #[test] fn default_missing_value_matches_default_base_upgrade() { - // Guards against the CLI's `default_missing_value = "cobalt"` string + // Guards against the CLI's `default_missing_value = "denim"` string // literal drifting from `DEFAULT_BASE_UPGRADE`, since clap can't // reference the constant directly. - assert_eq!("cobalt".parse::().unwrap(), DEFAULT_BASE_UPGRADE); + assert_eq!("denim".parse::().unwrap(), DEFAULT_BASE_UPGRADE); } #[test]