refactor(contracts): remove Hyperlane dependency from FeeVault

Remove IHypNativeMinter interface and all Hyperlane-specific fields
(destinationDomain, recipientAddress) from FeeVault. The contract now
uses direct ETH transfers to a configurable bridgeRecipient instead of
Hyperlane's transferRemote(). sendToCelestia() renamed to distribute().

Also removes the hyperlane-monorepo git submodule and updates all
deployment scripts, tests, and documentation.

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

.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

contracts/README.md

@@ -1,6 +1,6 @@
 # EV-Reth Contracts
 
-Smart contracts for EV-Reth, including the FeeVault for bridging collected fees to Celestia.
+Smart contracts for EV-Reth, including the FeeVault for collecting and distributing fees.
 
 ## AdminProxy
 
@@ -10,11 +10,11 @@ See [AdminProxy documentation](../docs/contracts/admin_proxy.md) for detailed se
 
 ## FeeVault
 
-The FeeVault contract collects base fees and bridges them to Celestia via Hyperlane. It supports:
+The FeeVault contract collects base fees and distributes them between a bridge recipient and an optional secondary recipient. It supports:
 
 - Configurable fee splitting between bridge and another recipient
-- Minimum amount thresholds before bridging
-- Call fee for incentivizing bridge calls
+- Minimum amount thresholds before distributing
+- Call fee for incentivizing distribution calls
 - Owner-controlled configuration
 
 ## Prerequisites
@@ -45,17 +45,14 @@ All configuration is set via constructor arguments at deploy time:
 |----------|----------|-------------|
 | `OWNER` | Yes | Owner address (can configure the vault post-deployment) |
 | `SALT` | No | CREATE2 salt (default: `0x0`). Use any bytes32 value |
-| `DESTINATION_DOMAIN` | Yes* | Hyperlane destination chain ID |
-| `RECIPIENT_ADDRESS` | Yes* | Recipient on destination chain (bytes32, left-padded) |
-| `MINIMUM_AMOUNT` | No | Minimum wei to bridge (default: 0) |
-| `CALL_FEE` | No | Fee in wei for calling `sendToCelestia()` (default: 0) |
+| `MINIMUM_AMOUNT` | No | Minimum wei to distribute (default: 0) |
+| `CALL_FEE` | No | Fee in wei for calling `distribute()` (default: 0) |
 | `BRIDGE_SHARE_BPS` | No | Basis points to bridge (default: 10000 = 100%) |
-| `OTHER_RECIPIENT` | No** | Address to receive non-bridged portion |
+| `OTHER_RECIPIENT` | No* | Address to receive non-bridged portion |
 
-*Required for the vault to be operational (can be set to 0 at deploy and configured later via setters)
-**Required if `BRIDGE_SHARE_BPS` < 10000
+*Required if `BRIDGE_SHARE_BPS` < 10000
 
-**Note:** `HYP_NATIVE_MINTER` must be set via `setHypNativeMinter()` after deployment for the vault to be operational.
+**Note:** `BRIDGE_RECIPIENT` must be set via `setBridgeRecipient()` after deployment for the vault to be operational.
 
 ### Choosing a Salt
 
@@ -89,8 +86,6 @@ export OWNER=0xYourOwnerAddress
 export SALT=0x0000000000000000000000000000000000000000000000000000000000000001
 
 # Optional - configure at deploy time (can also be set later)
-export DESTINATION_DOMAIN=1234
-export RECIPIENT_ADDRESS=0x000000000000000000000000...  # bytes32, left-padded cosmos address
 export MINIMUM_AMOUNT=1000000000000000000  # 1 ETH in wei
 export CALL_FEE=100000000000000  # 0.0001 ETH
 export BRIDGE_SHARE_BPS=8000  # 80% to bridge
@@ -107,43 +102,25 @@ forge script script/DeployFeeVault.s.sol:DeployFeeVault \
     --broadcast
 ```
 
-### Post-Deployment: Set HypNativeMinter
+### Post-Deployment: Set Bridge Recipient
 
-After deploying the HypNativeMinter contract, link it to the FeeVault:
+After deployment, set the bridge recipient address:
 
 ```shell
-cast send <FEEVAULT_ADDRESS> "setHypNativeMinter(address)" <HYP_NATIVE_MINTER_ADDRESS> \
+cast send <FEEVAULT_ADDRESS> "setBridgeRecipient(address)" <BRIDGE_RECIPIENT_ADDRESS> \
     --rpc-url <RPC_URL> \
     --private-key <PRIVATE_KEY>
 ```
 
-### Converting Cosmos Addresses to bytes32
-
-The `recipientAddress` must be a bytes32. To convert a bech32 Cosmos address:
-
-1. Decode the bech32 to get the 20-byte address
-2. Left-pad with zeros to 32 bytes
-
-Example using cast:
-
-```shell
-# Left-pad a 20-byte address to 32 bytes
-cast pad --left --len 32 1234567890abcdef1234567890abcdef12345678
-# Output: 0x0000000000000000000000001234567890abcdef1234567890abcdef12345678
-```
-
-Note: When calling `transferRemote()` via cast, you may need to omit the `0x` prefix depending on your invocation method.
-
 ## Admin Functions
 
 All functions are owner-only:
 
 | Function | Description |
 |----------|-------------|
-| `setHypNativeMinter(address)` | Set the Hyperlane minter contract |
-| `setRecipient(uint32, bytes32)` | Set destination domain and recipient |
-| `setMinimumAmount(uint256)` | Set minimum amount to bridge |
-| `setCallFee(uint256)` | Set fee for calling sendToCelestia |
+| `setBridgeRecipient(address)` | Set the bridge recipient address |
+| `setMinimumAmount(uint256)` | Set minimum amount to distribute |
+| `setCallFee(uint256)` | Set fee for calling distribute |
 | `setBridgeShare(uint256)` | Set bridge percentage (basis points) |
 | `setOtherRecipient(address)` | Set recipient for non-bridged funds |
 | `transferOwnership(address)` | Transfer contract ownership |

contracts/foundry.lock

@@ -1,5 +1,8 @@
 {
   "lib/forge-std": {
     "rev": "887e87251562513a7b5ab1ea517c039fe6ee0984"
+  },
+  "lib/permit2": {
+    "rev": "cc56ad0f3439c502c246fc5cfcc3db92bb8b7219"
   }
 }

contracts/lib/hyperlane-monorepo

@@ -10,8 +10,6 @@ contract DeployFeeVault is Script {
         address owner = vm.envAddress("OWNER");
         bytes32 salt = vm.envOr("SALT", bytes32(0));
 
-        uint32 destinationDomain = uint32(vm.envOr("DESTINATION_DOMAIN", uint256(0)));
-        bytes32 recipientAddress = vm.envOr("RECIPIENT_ADDRESS", bytes32(0));
         uint256 minimumAmount = vm.envOr("MINIMUM_AMOUNT", uint256(0));
         uint256 callFee = vm.envOr("CALL_FEE", uint256(0));
         uint256 bridgeShareBps = vm.envOr("BRIDGE_SHARE_BPS", uint256(0)); // 0 defaults to 10000 in constructor
@@ -21,34 +19,28 @@ contract DeployFeeVault is Script {
         vm.startBroadcast();
 
         // Deploy FeeVault with CREATE2
-        FeeVault feeVault = new FeeVault{salt: salt}(
-            owner, destinationDomain, recipientAddress, minimumAmount, callFee, bridgeShareBps, otherRecipient
-        );
+        FeeVault feeVault =
+            new FeeVault{salt: salt}(owner, minimumAmount, callFee, bridgeShareBps, otherRecipient);
 
         vm.stopBroadcast();
 
         console.log("FeeVault deployed at:", address(feeVault));
         console.log("Owner:", owner);
-        console.log("Destination domain:", destinationDomain);
         console.log("Minimum amount:", minimumAmount);
         console.log("Call fee:", callFee);
         console.log("Bridge share bps:", feeVault.bridgeShareBps());
         console.log("");
-        console.log("NOTE: Call setHypNativeMinter() after deploying HypNativeMinter");
+        console.log("NOTE: Call setBridgeRecipient() to set the bridge destination");
     }
 }
 
 /// @notice Compute FeeVault CREATE2 address off-chain
-/// @dev Use this to predict the address before deploying
-///      Requires env vars: DEPLOYER (EOA), OWNER, SALT (optional), and all constructor args
 contract ComputeFeeVaultAddress is Script {
     function run() external view {
         address deployer = vm.envAddress("DEPLOYER");
         bytes32 salt = vm.envOr("SALT", bytes32(0));
 
         address owner = vm.envAddress("OWNER");
-        uint32 destinationDomain = uint32(vm.envOr("DESTINATION_DOMAIN", uint256(0)));
-        bytes32 recipientAddress = vm.envOr("RECIPIENT_ADDRESS", bytes32(0));
         uint256 minimumAmount = vm.envOr("MINIMUM_AMOUNT", uint256(0));
         uint256 callFee = vm.envOr("CALL_FEE", uint256(0));
         uint256 bridgeShareBps = vm.envOr("BRIDGE_SHARE_BPS", uint256(0));
@@ -57,9 +49,7 @@ contract ComputeFeeVaultAddress is Script {
         bytes32 initCodeHash = keccak256(
             abi.encodePacked(
                 type(FeeVault).creationCode,
-                abi.encode(
-                    owner, destinationDomain, recipientAddress, minimumAmount, callFee, bridgeShareBps, otherRecipient
-                )
+                abi.encode(owner, minimumAmount, callFee, bridgeShareBps, otherRecipient)
             )
         );
 

contracts/script/DeployFeeVault.s.sol

@@ -8,27 +8,23 @@ abstract contract FeeVaultAllocBase is Script {
     struct Config {
         address feeVaultAddress;
         address owner;
-        uint32 destinationDomain;
-        bytes32 recipientAddress;
+        address bridgeRecipient;
+        address otherRecipient;
         uint256 minimumAmount;
         uint256 callFee;
         uint256 bridgeShareBpsRaw;
         uint256 bridgeShareBps;
-        address otherRecipient;
-        address hypNativeMinter;
         bytes32 salt;
         address deployer;
     }
 
     function loadConfig() internal view returns (Config memory cfg) {
         cfg.owner = vm.envAddress("OWNER");
-        cfg.destinationDomain = uint32(vm.envOr("DESTINATION_DOMAIN", uint256(0)));
-        cfg.recipientAddress = vm.envOr("RECIPIENT_ADDRESS", bytes32(0));
+        cfg.bridgeRecipient = vm.envOr("BRIDGE_RECIPIENT", address(0));
+        cfg.otherRecipient = vm.envOr("OTHER_RECIPIENT", address(0));
         cfg.minimumAmount = vm.envOr("MINIMUM_AMOUNT", uint256(0));
         cfg.callFee = vm.envOr("CALL_FEE", uint256(0));
         cfg.bridgeShareBpsRaw = vm.envOr("BRIDGE_SHARE_BPS", uint256(0));
-        cfg.otherRecipient = vm.envOr("OTHER_RECIPIENT", address(0));
-        cfg.hypNativeMinter = vm.envOr("HYP_NATIVE_MINTER", address(0));
         cfg.feeVaultAddress = vm.envOr("FEE_VAULT_ADDRESS", address(0));
         cfg.deployer = vm.envOr("DEPLOYER", address(0));
         cfg.salt = vm.envOr("SALT", bytes32(0));
@@ -43,13 +39,7 @@ abstract contract FeeVaultAllocBase is Script {
                 abi.encodePacked(
                     type(FeeVault).creationCode,
                     abi.encode(
-                        cfg.owner,
-                        cfg.destinationDomain,
-                        cfg.recipientAddress,
-                        cfg.minimumAmount,
-                        cfg.callFee,
-                        cfg.bridgeShareBpsRaw,
-                        cfg.otherRecipient
+                        cfg.owner, cfg.minimumAmount, cfg.callFee, cfg.bridgeShareBpsRaw, cfg.otherRecipient
                     )
                 )
             );
@@ -64,29 +54,19 @@ abstract contract FeeVaultAllocBase is Script {
     function computeSlots(Config memory cfg)
         internal
         pure
-        returns (
-            bytes32 slot0,
-            bytes32 slot1,
-            bytes32 slot2,
-            bytes32 slot3,
-            bytes32 slot4,
-            bytes32 slot5,
-            bytes32 slot6
-        )
+        returns (bytes32 slot0, bytes32 slot1, bytes32 slot2, bytes32 slot3, bytes32 slot4, bytes32 slot5)
     {
-        slot0 = bytes32(uint256(uint160(cfg.hypNativeMinter)));
-        slot1 = bytes32((uint256(cfg.destinationDomain) << 160) | uint256(uint160(cfg.owner)));
-        slot2 = cfg.recipientAddress;
+        slot0 = bytes32(uint256(uint160(cfg.owner)));
+        slot1 = bytes32(uint256(uint160(cfg.bridgeRecipient)));
+        slot2 = bytes32(uint256(uint160(cfg.otherRecipient)));
         slot3 = bytes32(cfg.minimumAmount);
         slot4 = bytes32(cfg.callFee);
-        slot5 = bytes32(uint256(uint160(cfg.otherRecipient)));
-        slot6 = bytes32(cfg.bridgeShareBps);
+        slot5 = bytes32(cfg.bridgeShareBps);
     }
 
     function addressKey(address addr) internal pure returns (string memory) {
         bytes memory full = bytes(vm.toString(addr));
         bytes memory key = new bytes(40);
-        // Fixed-length copy for address key without 0x prefix.
         for (uint256 i = 0; i < 40; i++) {
             key[i] = full[i + 2];
         }
@@ -102,13 +82,12 @@ contract GenerateFeeVaultAlloc is FeeVaultAllocBase {
         Config memory cfg = loadConfig();
         bytes memory runtimeCode = type(FeeVault).runtimeCode;
 
-        (bytes32 slot0, bytes32 slot1, bytes32 slot2, bytes32 slot3, bytes32 slot4, bytes32 slot5, bytes32 slot6) =
+        (bytes32 slot0, bytes32 slot1, bytes32 slot2, bytes32 slot3, bytes32 slot4, bytes32 slot5) =
             computeSlots(cfg);
 
         console.log("========== FeeVault Genesis Alloc ==========");
         console.log("FeeVault address:", cfg.feeVaultAddress);
         console.log("Owner:", cfg.owner);
-        console.log("Destination domain:", cfg.destinationDomain);
         console.log("Bridge share bps (raw):", cfg.bridgeShareBpsRaw);
         console.log("Bridge share bps (effective):", cfg.bridgeShareBps);
         console.log("");
@@ -119,8 +98,8 @@ contract GenerateFeeVaultAlloc is FeeVaultAllocBase {
         if (cfg.bridgeShareBps < 10000 && cfg.otherRecipient == address(0)) {
             console.log("WARNING: OTHER_RECIPIENT is zero but bridge share < 10000.");
         }
-        if (cfg.hypNativeMinter == address(0)) {
-            console.log("NOTE: HYP_NATIVE_MINTER is zero; set it before calling sendToCelestia().");
+        if (cfg.bridgeRecipient == address(0)) {
+            console.log("NOTE: BRIDGE_RECIPIENT is zero; set it before calling distribute().");
         }
         console.log("");
 
@@ -137,8 +116,7 @@ contract GenerateFeeVaultAlloc is FeeVaultAllocBase {
         console.log('        "0x2": "%s",', vm.toString(slot2));
         console.log('        "0x3": "%s",', vm.toString(slot3));
         console.log('        "0x4": "%s",', vm.toString(slot4));
-        console.log('        "0x5": "%s",', vm.toString(slot5));
-        console.log('        "0x6": "%s"', vm.toString(slot6));
+        console.log('        "0x5": "%s"', vm.toString(slot5));
         console.log("      }");
         console.log("    }");
         console.log("  }");
@@ -157,7 +135,7 @@ contract GenerateFeeVaultAllocJSON is FeeVaultAllocBase {
         Config memory cfg = loadConfig();
         bytes memory runtimeCode = type(FeeVault).runtimeCode;
 
-        (bytes32 slot0, bytes32 slot1, bytes32 slot2, bytes32 slot3, bytes32 slot4, bytes32 slot5, bytes32 slot6) =
+        (bytes32 slot0, bytes32 slot1, bytes32 slot2, bytes32 slot3, bytes32 slot4, bytes32 slot5) =
             computeSlots(cfg);
 
         string memory json = string(
@@ -178,8 +156,6 @@ contract GenerateFeeVaultAllocJSON is FeeVaultAllocBase {
                 vm.toString(slot4),
                 '","0x5":"',
                 vm.toString(slot5),
-                '","0x6":"',
-                vm.toString(slot6),
                 '"}}}'
             )
         );