Merge branch 'main' into marko/reth2.2

Author: tac0turtle

.claude/skills/contracts.md

@@ -1,5 +1,5 @@
 ---
-description: This skill should be used when the user asks about "ev-reth contracts", "FeeVault", "AdminProxy", "fee bridging to Celestia", "Hyperlane integration", "Foundry deployment scripts", "genesis allocations", or wants to understand how base fees are redirected and bridged.
+description: This skill should be used when the user asks about "ev-reth contracts", "FeeVault", "AdminProxy", "Permit2", "fee distribution", "Foundry deployment scripts", "genesis allocations", or wants to understand how base fees are redirected and distributed.
 ---
 
 # Contracts Onboarding
@@ -9,13 +9,15 @@ description: This skill should be used when the user asks about "ev-reth contrac
 The contracts live in `contracts/` and use Foundry for development. There are two main contracts:
 
 1. **AdminProxy** (`src/AdminProxy.sol`) - Bootstrap contract for admin addresses at genesis
-2. **FeeVault** (`src/FeeVault.sol`) - Collects base fees, bridges to Celestia via Hyperlane (cross-chain messaging protocol)
+2. **FeeVault** (`src/FeeVault.sol`) - Collects base fees and distributes them between configured recipients
+3. **Permit2** (`lib/permit2`) - Uniswap's canonical token approval manager, deployed at genesis via `ev-deployer` (no Foundry deploy script — bytecode is embedded in Rust)
 
 ## Key Files
 
 ### Contract Sources
 - `contracts/src/AdminProxy.sol` - Transparent proxy pattern for admin control
-- `contracts/src/FeeVault.sol` - Fee collection and bridging logic
+- `contracts/src/FeeVault.sol` - Fee collection and distribution logic
+- `contracts/lib/permit2` - Uniswap Permit2 submodule (bytecode used by ev-deployer)
 
 ### Deployment Scripts
 - `contracts/script/DeployFeeVault.s.sol` - FeeVault deployment with CREATE2
@@ -34,9 +36,12 @@ The AdminProxy contract provides a bootstrap mechanism for setting admin address
 ### FeeVault
 The FeeVault serves as the destination for redirected base fees (instead of burning them). Key responsibilities:
 - Receive base fees from block production
-- Bridge accumulated fees to Celestia via Hyperlane
+- Distribute accumulated fees between configured recipients
 - Manage withdrawal permissions
 
+### Permit2
+Uniswap's canonical token approval manager deployed at genesis. Unlike AdminProxy and FeeVault, Permit2 has no Foundry deploy script — its bytecode is embedded directly in the Rust `ev-deployer` (`bin/ev-deployer/src/contracts/permit2.rs`), which patches EIP-712 immutables (chain ID, domain separator) at genesis time.
+
 ## Connection to Rust Code
 
 The contracts integrate with ev-reth through:

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "contracts/lib/forge-std"]
 	path = contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "contracts/lib/permit2"]
+	path = contracts/lib/permit2
+	url = https://github.com/Uniswap/permit2

bin/ev-deployer/README.md

@@ -14,15 +14,6 @@ The binary is output to `target/release/ev-deployer`.
 
 EV Deployer uses a TOML config file to define what contracts to include and how to configure them. See [`examples/devnet.toml`](examples/devnet.toml) for a complete example.
 
-```toml
-[chain]
-chain_id = 1234
-
-[contracts.admin_proxy]
-address = "0x000000000000000000000000000000000000Ad00"
-owner = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
-```
-
 ### Config reference
 
 #### `[chain]`
@@ -38,6 +29,12 @@ owner = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
 | `address` | address | Address to deploy at      |
 | `owner`   | address | Owner (must not be zero)  |
 
+#### `[contracts.permit2]`
+
+| Field     | Type    | Description                                              |
+|-----------|---------|----------------------------------------------------------|
+| `address` | address | Address to deploy at (canonical: `0x000000000022D473030F116dDEE9F6B43aC78BA3`) |
+
 ## Usage
 
 ### Generate a starter config
@@ -88,7 +85,8 @@ Output:
 
 ```json
 {
-  "admin_proxy": "0x000000000000000000000000000000000000Ad00"
+  "admin_proxy": "0x000000000000000000000000000000000000Ad00",
+  "permit2": "0x000000000022D473030F116dDEE9F6B43aC78BA3"
 }
 ```
 
@@ -100,9 +98,10 @@ ev-deployer compute-address --config deploy.toml --contract admin_proxy
 
 ## Contracts
 
-| Contract       | Description                                         |
-|----------------|-----------------------------------------------------|
-| `admin_proxy`  | Proxy contract with owner-based access control      |
+| Contract      | Description                                        |
+|---------------|----------------------------------------------------|
+| `admin_proxy` | Proxy contract with owner-based access control     |
+| `permit2`     | Uniswap canonical token approval manager           |
 
 Runtime bytecodes are embedded in the binary — no external toolchain is needed at deploy time.
 

bin/ev-deployer/examples/devnet.toml

@@ -4,3 +4,8 @@ chain_id = 1234
 [contracts.admin_proxy]
 address = "0x000000000000000000000000000000000000Ad00"
 owner = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+
+[contracts.permit2]
+# Canonical Uniswap Permit2 address (same on all chains via CREATE2).
+# Using it here so frontends, SDKs and routers work out of the box.
+address = "0x000000000022D473030F116dDEE9F6B43aC78BA3"

bin/ev-deployer/src/config.rs

@@ -2,11 +2,10 @@
 
 use alloy_primitives::Address;
 use serde::Deserialize;
-use std::path::Path;
+use std::{collections::HashSet, path::Path};
 
 /// Top-level deploy configuration.
 #[derive(Debug, Deserialize)]
-#[allow(dead_code)]
 pub(crate) struct DeployConfig {
     /// Chain configuration.
     pub chain: ChainConfig,
@@ -17,7 +16,6 @@ pub(crate) struct DeployConfig {
 
 /// Chain-level settings.
 #[derive(Debug, Deserialize)]
-#[allow(dead_code)]
 pub(crate) struct ChainConfig {
     /// The chain ID.
     pub chain_id: u64,
@@ -28,6 +26,22 @@ pub(crate) struct ChainConfig {
 pub(crate) struct ContractsConfig {
     /// `AdminProxy` contract config (optional).
     pub admin_proxy: Option<AdminProxyConfig>,
+    /// `Permit2` contract config (optional).
+    pub permit2: Option<Permit2Config>,
+}
+
+impl ContractsConfig {
+    /// Collect all configured deploy addresses.
+    fn all_addresses(&self) -> Vec<Address> {
+        let mut addrs = Vec::new();
+        if let Some(ref ap) = self.admin_proxy {
+            addrs.push(ap.address);
+        }
+        if let Some(ref p2) = self.permit2 {
+            addrs.push(p2.address);
+        }
+        addrs
+    }
 }
 
 /// `AdminProxy` configuration.
@@ -39,6 +53,13 @@ pub(crate) struct AdminProxyConfig {
     pub owner: Address,
 }
 
+/// `Permit2` configuration (Uniswap token approval manager).
+#[derive(Debug, Deserialize)]
+pub(crate) struct Permit2Config {
+    /// Address to deploy at.
+    pub address: Address,
+}
+
 impl DeployConfig {
     /// Load and validate config from a TOML file.
     pub(crate) fn load(path: &Path) -> eyre::Result<Self> {
@@ -57,6 +78,19 @@ impl DeployConfig {
             );
         }
 
+        if let Some(ref p2) = self.contracts.permit2 {
+            eyre::ensure!(
+                !p2.address.is_zero(),
+                "permit2.address must not be the zero address"
+            );
+        }
+
+        // Detect duplicate deploy addresses across all contracts.
+        let mut seen = HashSet::new();
+        for addr in self.contracts.all_addresses() {
+            eyre::ensure!(seen.insert(addr), "duplicate deploy address: {addr}");
+        }
+
         Ok(())
     }
 }
@@ -106,6 +140,71 @@ chain_id = 1
         assert!(config.contracts.admin_proxy.is_none());
     }
 
+    #[test]
+    fn reject_zero_permit2_address() {
+        let toml = r#"
+[chain]
+chain_id = 1
+
+[contracts.permit2]
+address = "0x0000000000000000000000000000000000000000"
+"#;
+        let config: DeployConfig = toml::from_str(toml).unwrap();
+        assert!(config.validate().is_err());
+    }
+
+    #[test]
+    fn reject_duplicate_deploy_address() {
+        let toml = r#"
+[chain]
+chain_id = 1
+
+[contracts.admin_proxy]
+address = "0x000000000000000000000000000000000000Ad00"
+owner = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+
+[contracts.permit2]
+address = "0x000000000000000000000000000000000000Ad00"
+"#;
+        let config: DeployConfig = toml::from_str(toml).unwrap();
+        let err = config.validate().unwrap_err().to_string();
+        assert!(err.contains("duplicate deploy address"), "{err}");
+    }
+
+    #[test]
+    fn permit2_only() {
+        let toml = r#"
+[chain]
+chain_id = 1
+
+[contracts.permit2]
+address = "0x000000000022D473030F116dDEE9F6B43aC78BA3"
+"#;
+        let config: DeployConfig = toml::from_str(toml).unwrap();
+        config.validate().unwrap();
+        assert!(config.contracts.permit2.is_some());
+        assert!(config.contracts.admin_proxy.is_none());
+    }
+
+    #[test]
+    fn both_contracts() {
+        let toml = r#"
+[chain]
+chain_id = 1
+
+[contracts.admin_proxy]
+address = "0x000000000000000000000000000000000000Ad00"
+owner = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
+
+[contracts.permit2]
+address = "0x000000000022D473030F116dDEE9F6B43aC78BA3"
+"#;
+        let config: DeployConfig = toml::from_str(toml).unwrap();
+        config.validate().unwrap();
+        assert!(config.contracts.admin_proxy.is_some());
+        assert!(config.contracts.permit2.is_some());
+    }
+
     #[test]
     fn admin_proxy_only() {
         let toml = r#"

bin/ev-deployer/src/contracts/immutables.rs

@@ -0,0 +1,76 @@
+//! Bytecode patching for Solidity immutable variables.
+//!
+//! Solidity `immutable` values are embedded in the **runtime bytecode** by the
+//! compiler, not in storage.  When compiling with placeholder values (e.g.
+//! `address(0)`, `uint32(0)`), the compiler leaves zero-filled regions at known
+//! byte offsets.  This module replaces those regions with the actual values from
+//! the deploy config at genesis-generation time.
+
+use alloy_primitives::{B256, U256};
+
+/// A single immutable reference inside a bytecode blob.
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct ImmutableRef {
+    /// Byte offset into the **runtime** bytecode.
+    pub start: usize,
+    /// Number of bytes (always 32 for EVM words).
+    pub length: usize,
+}
+
+/// Patch a mutable bytecode slice, writing `value` at every listed offset.
+///
+/// # Panics
+///
+/// Panics if any reference extends past the end of `bytecode`.
+pub(crate) fn patch_bytes(bytecode: &mut [u8], refs: &[ImmutableRef], value: &[u8; 32]) {
+    for r in refs {
+        assert!(
+            r.start + r.length <= bytecode.len(),
+            "immutable ref out of bounds: start={} length={} bytecode_len={}",
+            r.start,
+            r.length,
+            bytecode.len()
+        );
+        bytecode[r.start..r.start + r.length].copy_from_slice(value);
+    }
+}
+
+/// Convenience: patch with an ABI-encoded `uint256`.
+pub(crate) fn patch_u256(bytecode: &mut [u8], refs: &[ImmutableRef], val: U256) {
+    let word = B256::from(val);
+    patch_bytes(bytecode, refs, &word.0);
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn patch_single_ref() {
+        let mut bytecode = vec![0u8; 64];
+        let refs = [ImmutableRef {
+            start: 10,
+            length: 32,
+        }];
+        let value = B256::from(U256::from(42u64));
+        patch_bytes(&mut bytecode, &refs, &value.0);
+
+        assert_eq!(bytecode[41], 42);
+        // bytes before are untouched
+        assert_eq!(bytecode[9], 0);
+        // bytes after are untouched
+        assert_eq!(bytecode[42], 0);
+    }
+
+    #[test]
+    #[should_panic(expected = "immutable ref out of bounds")]
+    fn patch_out_of_bounds_panics() {
+        let mut bytecode = vec![0u8; 16];
+        let refs = [ImmutableRef {
+            start: 0,
+            length: 32,
+        }];
+        let value = [0u8; 32];
+        patch_bytes(&mut bytecode, &refs, &value);
+    }
+}

bin/ev-deployer/src/contracts/mod.rs

@@ -1,6 +1,8 @@
 //! Contract bytecode and storage encoding.
 
 pub(crate) mod admin_proxy;
+pub(crate) mod immutables;
+pub(crate) mod permit2;
 
 use alloy_primitives::{Address, Bytes, B256};
 use std::collections::BTreeMap;

bin/ev-deployer/src/contracts/permit2.rs

@@ -17,6 +17,11 @@ pub(crate) fn build_alloc(config: &DeployConfig) -> Value {
         insert_contract(&mut alloc, &contract);
     }
 
+    if let Some(ref p2_config) = config.contracts.permit2 {
+        let contract = contracts::permit2::build(p2_config, config.chain.chain_id);
+        insert_contract(&mut alloc, &contract);
+    }
+
     Value::Object(alloc)
 }
 
@@ -102,6 +107,7 @@ mod tests {
                     address: address!("000000000000000000000000000000000000ad00"),
                     owner: address!("f39Fd6e51aad88F6F4ce6aB8827279cffFb92266"),
                 }),
+                permit2: None,
             },
         }
     }

bin/ev-deployer/src/genesis.rs

@@ -14,3 +14,7 @@ chain_id = 0
 # [contracts.admin_proxy]
 # address = "0x000000000000000000000000000000000000Ad00"
 # owner = "0x..."
+
+# Permit2: Uniswap canonical token approval manager.
+# [contracts.permit2]
+# address = "0x000000000022D473030F116dDEE9F6B43aC78BA3"