From 22c802bcca32c715994d24d6de5539209e2c5972 Mon Sep 17 00:00:00 2001
From: PelleKrab <pelle.krabbenhoeft@coinbase.com>
Date: Thu, 18 Jun 2026 14:52:55 -0700
Subject: [PATCH] fix(networks): import BaseUpgrade from genesis

---
 Cargo.lock                     | 21 +++++++++++----------
 crates/evm/networks/Cargo.toml |  5 +++--
 crates/evm/networks/src/lib.rs |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a013e51a2..019a18206 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2162,8 +2162,8 @@ dependencies = [
 
 [[package]]
 name = "base-common-chains"
-version = "1.1.0"
-source = "git+https://github.com/base/base.git?rev=a3c3011b16dae73aaea455ec0a5ff614e65b7d0a#a3c3011b16dae73aaea455ec0a5ff614e65b7d0a"
+version = "0.0.0"
+source = "git+https://github.com/base/base.git?rev=2d880020851d36462683c413fc9db0f9b424278c#2d880020851d36462683c413fc9db0f9b424278c"
 dependencies = [
  "alloy-chains",
  "alloy-eips 2.0.5",
@@ -2179,8 +2179,8 @@ dependencies = [
 
 [[package]]
 name = "base-common-genesis"
-version = "1.1.0"
-source = "git+https://github.com/base/base.git?rev=a3c3011b16dae73aaea455ec0a5ff614e65b7d0a#a3c3011b16dae73aaea455ec0a5ff614e65b7d0a"
+version = "0.0.0"
+source = "git+https://github.com/base/base.git?rev=2d880020851d36462683c413fc9db0f9b424278c#2d880020851d36462683c413fc9db0f9b424278c"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -2196,8 +2196,8 @@ dependencies = [
 
 [[package]]
 name = "base-common-precompiles"
-version = "1.1.0"
-source = "git+https://github.com/base/base.git?rev=a3c3011b16dae73aaea455ec0a5ff614e65b7d0a#a3c3011b16dae73aaea455ec0a5ff614e65b7d0a"
+version = "0.0.0"
+source = "git+https://github.com/base/base.git?rev=2d880020851d36462683c413fc9db0f9b424278c#2d880020851d36462683c413fc9db0f9b424278c"
 dependencies = [
  "alloy-evm",
  "alloy-primitives",
@@ -2210,8 +2210,8 @@ dependencies = [
 
 [[package]]
 name = "base-precompile-macros"
-version = "1.1.0"
-source = "git+https://github.com/base/base.git?rev=a3c3011b16dae73aaea455ec0a5ff614e65b7d0a#a3c3011b16dae73aaea455ec0a5ff614e65b7d0a"
+version = "0.0.0"
+source = "git+https://github.com/base/base.git?rev=2d880020851d36462683c413fc9db0f9b424278c#2d880020851d36462683c413fc9db0f9b424278c"
 dependencies = [
  "alloy-primitives",
  "proc-macro2",
@@ -2221,8 +2221,8 @@ dependencies = [
 
 [[package]]
 name = "base-precompile-storage"
-version = "1.1.0"
-source = "git+https://github.com/base/base.git?rev=a3c3011b16dae73aaea455ec0a5ff614e65b7d0a#a3c3011b16dae73aaea455ec0a5ff614e65b7d0a"
+version = "0.0.0"
+source = "git+https://github.com/base/base.git?rev=2d880020851d36462683c413fc9db0f9b424278c#2d880020851d36462683c413fc9db0f9b424278c"
 dependencies = [
  "alloy-evm",
  "alloy-primitives",
@@ -5150,6 +5150,7 @@ dependencies = [
  "alloy-op-hardforks",
  "alloy-primitives",
  "base-common-chains",
+ "base-common-genesis",
  "base-common-precompiles",
  "clap",
  "revm 40.0.3",
diff --git a/crates/evm/networks/Cargo.toml b/crates/evm/networks/Cargo.toml
index 55d73c113..4573e76fd 100644
--- a/crates/evm/networks/Cargo.toml
+++ b/crates/evm/networks/Cargo.toml
@@ -29,8 +29,9 @@ 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 = "a3c3011b16dae73aaea455ec0a5ff614e65b7d0a" }
-base-common-chains = { git = "https://github.com/base/base.git", rev = "a3c3011b16dae73aaea455ec0a5ff614e65b7d0a" }
+base-common-precompiles = { git = "https://github.com/base/base.git", rev = "2d880020851d36462683c413fc9db0f9b424278c" }
+base-common-chains = { git = "https://github.com/base/base.git", rev = "2d880020851d36462683c413fc9db0f9b424278c" }
+base-common-genesis = { git = "https://github.com/base/base.git", rev = "2d880020851d36462683c413fc9db0f9b424278c" }
 
 revm = { workspace = true, features = [
     "std",
diff --git a/crates/evm/networks/src/lib.rs b/crates/evm/networks/src/lib.rs
index 92cbdb4e9..3cf59564a 100644
--- a/crates/evm/networks/src/lib.rs
+++ b/crates/evm/networks/src/lib.rs
@@ -13,7 +13,7 @@ use alloy_eips::eip1559::BaseFeeParams;
 use alloy_evm::precompiles::{DynPrecompile, PrecompilesMap};
 use alloy_op_hardforks::{OpChainHardforks, OpHardforks};
 use alloy_primitives::{Address, U256, address, keccak256, map::AddressHashMap};
-use base_common_chains::BaseUpgrade;
+use base_common_genesis::BaseUpgrade;
 use base_common_precompiles::{
     ActivationFeature, ActivationRegistry, ActivationRegistryStorage, B20AssetPrecompile,
     B20Factory, B20FactoryStorage, B20StablecoinPrecompile, B20Variant, PolicyRegistryPrecompile,