Merge pull request #54 from base/rayyanalam/adapt-b20-install-api

Adapt --base precompile install to observer/upgrade API

Author: rayyan224

Cargo.lock

@@ -224,7 +224,7 @@ fn _serialize_value_as_json(value: DynSolValue, defs: &StructDefinitions) -> Res
         DynSolValue::Tuple(values) => Ok(Value::Array(
             values.into_iter().map(|v| _serialize_value_as_json(v, defs)).collect::<Result<_>>()?,
         )),
-        DynSolValue::Function(_) => eyre::bail!("cannot serialize function pointer"),
+        DynSolValue::Function(_) => Err(eyre::eyre!("cannot serialize function pointer")),
     }
 }
 
@@ -275,9 +275,9 @@ impl StructDefinitions {
         match matches.len() {
             0 => Ok(None),
             1 => Ok(Some(matches[0])),
-            _ => eyre::bail!(
+            _ => Err(eyre::eyre!(
                 "there are several structs with the same name. Use `<contract_name>.{key}` instead."
-            ),
+            )),
         }
     }
 }

crates/common/fmt/src/dynamic.rs

@@ -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 = "401ffe4d60f3d0e9c34168c865521a3b186339df" }
-base-common-chains = { git = "https://github.com/base/base.git", rev = "401ffe4d60f3d0e9c34168c865521a3b186339df" }
+base-common-precompiles = { git = "https://github.com/base/base.git", rev = "3ce1275095c21506d9e1173b7bd08425357112b7" }
+base-common-chains = { git = "https://github.com/base/base.git", rev = "3ce1275095c21506d9e1173b7bd08425357112b7" }
 
 revm = { workspace = true, features = [
     "std",

crates/evm/networks/Cargo.toml

@@ -16,7 +16,8 @@ use alloy_primitives::{Address, U256, address, keccak256, map::AddressHashMap};
 use base_common_chains::BaseUpgrade;
 use base_common_precompiles::{
     ActivationFeature, ActivationRegistry, ActivationRegistryStorage, B20Factory,
-    B20FactoryStorage, BerylLookup, PolicyRegistryPrecompile, PolicyRegistryStorage,
+    B20FactoryStorage, BerylLookup, NoopPrecompileCallObserver, PolicyRegistryPrecompile,
+    PolicyRegistryStorage,
 };
 use clap::Parser;
 use serde::{Deserialize, Serialize};
@@ -158,17 +159,21 @@ impl NetworkConfigs {
             });
         }
         if self.base {
-            // Mirrors `BasePrecompiles::install` for the Beryl upgrade in
-            // base/base/crates/common/precompiles/src/provider.rs. Three
-            // singleton precompiles plus the versioned B-20 prefix dispatcher.
-            // `BerylLookup::install` owns the dispatcher and threads the Base
-            // upgrade so each B-20 token resolves its logic version per-call
-            // (e.g. Stablecoin V1 at Beryl). Pinned to Beryl until `--base-fork`
-            // (BOP-428) makes the fork selectable at runtime.
+            // Mirrors `BasePrecompiles::install_with_observer` for the Beryl
+            // upgrade in base/base/crates/common/precompiles/src/provider.rs.
+            // Three singleton precompiles plus the versioned B-20 prefix
+            // dispatcher. `BerylLookup::install` owns the dispatcher and
+            // threads the Base upgrade so each B-20 token resolves its logic
+            // version per-call (e.g. Stablecoin V1 at Beryl). Pinned to Beryl
+            // until `--base-fork` (BOP-428) makes the fork selectable at runtime.
+            //
+            // Factory/policy take a no-op observer: metrics observation is
+            // scoped to the B-20 token call path, which anvil does not wire up.
             let admin = Some(self.base_activation_admin());
-            B20Factory::install(precompiles);
-            BerylLookup::install(precompiles, BaseUpgrade::Beryl);
-            PolicyRegistryPrecompile::install(precompiles);
+            let upgrade = BaseUpgrade::Beryl;
+            B20Factory::install_with_observer(precompiles, upgrade, NoopPrecompileCallObserver);
+            BerylLookup::install(precompiles, upgrade);
+            PolicyRegistryPrecompile::install(precompiles, upgrade);
             ActivationRegistry::install(precompiles, admin);
         }
     }