Merge remote-tracking branch 'origin/ev-deployer-part4-ev-dev-integration' into feat/ev-dev-part5-tui

Author: randygrok

.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", "fee distribution", "Foundry deployment scripts", "genesis allocations", or wants to understand how base fees are redirected and distributed.
 ---
 
 # Contracts Onboarding
@@ -9,13 +9,13 @@ 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
 
 ## 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
 
 ### Deployment Scripts
 - `contracts/script/DeployFeeVault.s.sol` - FeeVault deployment with CREATE2
@@ -34,7 +34,7 @@ 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
 
 ## Connection to Rust Code

.github/workflows/ev_deployer.yml

@@ -40,9 +40,6 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 
-      - name: Install Hyperlane soldeer dependencies
-        run: cd contracts/lib/hyperlane-monorepo/solidity && forge soldeer install
-
       - name: Run bytecode verification tests
         run: cargo test -p ev-deployer -- --ignored --test-threads=1
 

.github/workflows/unit.yml

@@ -35,7 +35,7 @@ jobs:
           cargo nextest run \
             --locked \
             --workspace \
-            -E "(kind(lib) | kind(bin) | kind(proc-macro))" \
+            -E "(kind(lib) | kind(bin) | kind(proc-macro)) - package(ev-tests)" \
             --no-tests=warn
 
   client-test:

.gitmodules

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

Cargo.lock

@@ -14,8 +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.
 
-See [`examples/devnet.toml`](examples/devnet.toml) for a complete example with all contracts configured.
-
 ### Config reference
 
 #### `[chain]`
@@ -31,60 +29,12 @@ See [`examples/devnet.toml`](examples/devnet.toml) for a complete example with a
 | `address` | address | Address to deploy at      |
 | `owner`   | address | Owner (must not be zero)  |
 
-#### `[contracts.fee_vault]`
-
-| Field                | Type    | Description                                      |
-|----------------------|---------|--------------------------------------------------|
-| `address`            | address | Address to deploy at                             |
-| `owner`              | address | Owner address                                    |
-| `destination_domain` | u32     | Hyperlane destination domain (default: 0)        |
-| `recipient_address`  | bytes32 | Hyperlane recipient address (default: zero)      |
-| `minimum_amount`     | u64     | Minimum amount for bridging (default: 0)         |
-| `call_fee`           | u64     | Call fee for sendToCelestia (default: 0)         |
-| `bridge_share_bps`   | u64     | Basis points for bridge share, 0–10000 (default: 0, treated as 10000) |
-| `other_recipient`    | address | Other recipient for split accounting (default: zero) |
-| `hyp_native_minter`  | address | HypNativeMinter address (default: zero)          |
-
-#### `[contracts.mailbox]`
-
-| Field           | Type    | Description                                         |
-|-----------------|---------|-----------------------------------------------------|
-| `address`       | address | Address to deploy at                                |
-| `owner`         | address | Owner address (default: zero)                       |
-| `default_ism`   | address | Default interchain security module (default: zero)  |
-| `default_hook`  | address | Default post-dispatch hook (default: zero)          |
-| `required_hook` | address | Required post-dispatch hook, e.g. MerkleTreeHook (default: zero) |
-
-#### `[contracts.merkle_tree_hook]`
-
-| Field     | Type    | Description                                        |
-|-----------|---------|----------------------------------------------------|
-| `address` | address | Address to deploy at                               |
-| `owner`   | address | Owner address (default: zero)                      |
-| `mailbox` | address | Mailbox address (patched into bytecode as immutable)|
-
-#### `[contracts.noop_ism]`
-
-| Field     | Type    | Description          |
-|-----------|---------|----------------------|
-| `address` | address | Address to deploy at |
-
 #### `[contracts.permit2]`
 
 | Field     | Type    | Description                                              |
 |-----------|---------|----------------------------------------------------------|
 | `address` | address | Address to deploy at (canonical: `0x000000000022D473...`) |
 
-#### `[contracts.protocol_fee]`
-
-| Field              | Type    | Description                                       |
-|--------------------|---------|---------------------------------------------------|
-| `address`          | address | Address to deploy at                              |
-| `owner`            | address | Owner address (default: zero)                     |
-| `max_protocol_fee` | u64     | Maximum protocol fee in wei                       |
-| `protocol_fee`     | u64     | Protocol fee charged per dispatch in wei (default: 0) |
-| `beneficiary`      | address | Beneficiary address that receives collected fees (default: zero) |
-
 ## Usage
 
 ### Generate a starter config
@@ -136,12 +86,7 @@ Output:
 ```json
 {
   "admin_proxy": "0x000000000000000000000000000000000000Ad00",
-  "fee_vault": "0x000000000000000000000000000000000000FE00",
-  "mailbox": "0x0000000000000000000000000000000000001200",
-  "merkle_tree_hook": "0x0000000000000000000000000000000000001100",
-  "noop_ism": "0x0000000000000000000000000000000000001300",
-  "permit2": "0x000000000022D473030F116dDEE9F6B43aC78BA3",
-  "protocol_fee": "0x0000000000000000000000000000000000001400"
+  "permit2": "0x000000000022D473030F116dDEE9F6B43aC78BA3"
 }
 ```
 
@@ -153,15 +98,10 @@ ev-deployer compute-address --config deploy.toml --contract admin_proxy
 
 ## Contracts
 
-| Contract           | Description                                             |
-|--------------------|---------------------------------------------------------|
-| `admin_proxy`      | Proxy contract with owner-based access control          |
-| `fee_vault`        | Fee vault with Hyperlane bridging support               |
-| `mailbox`          | Hyperlane core messaging hub                            |
-| `merkle_tree_hook` | Hyperlane required hook (Merkle tree for messages)      |
-| `noop_ism`         | Hyperlane ISM that accepts all messages                 |
-| `permit2`          | Uniswap canonical token approval manager                |
-| `protocol_fee`     | Hyperlane post-dispatch hook that charges a protocol fee|
+| 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/README.md

@@ -5,40 +5,7 @@ chain_id = 1234
 address = "0x000000000000000000000000000000000000Ad00"
 owner = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
 
-[contracts.fee_vault]
-address = "0x000000000000000000000000000000000000FE00"
-owner = "0x000000000000000000000000000000000000Ad00"
-destination_domain = 0
-recipient_address = "0x0000000000000000000000000000000000000000000000000000000000000000"
-minimum_amount = 0
-call_fee = 0
-bridge_share_bps = 10000
-other_recipient = "0x0000000000000000000000000000000000000000"
-hyp_native_minter = "0x0000000000000000000000000000000000000000"
-
-[contracts.mailbox]
-address = "0x0000000000000000000000000000000000001200"
-owner = "0x000000000000000000000000000000000000Ad00"
-default_ism = "0x0000000000000000000000000000000000001300"
-default_hook = "0x0000000000000000000000000000000000001400"
-required_hook = "0x0000000000000000000000000000000000001100"
-
-[contracts.merkle_tree_hook]
-address = "0x0000000000000000000000000000000000001100"
-owner = "0x000000000000000000000000000000000000Ad00"
-mailbox = "0x0000000000000000000000000000000000001200"
-
-[contracts.noop_ism]
-address = "0x0000000000000000000000000000000000001300"
-
 [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"
-
-[contracts.protocol_fee]
-address = "0x0000000000000000000000000000000000001400"
-owner = "0x000000000000000000000000000000000000Ad00"
-max_protocol_fee = 1000000000000000000
-protocol_fee = 0
-beneficiary = "0x000000000000000000000000000000000000Ad00"