Merge branch 'main' into marko/precompile_proposer

Author: randygrok

Cargo.lock

@@ -86,7 +86,7 @@ reth-tasks = { git = "https://github.com/paradigmxyz/reth.git", tag = "v2.2.0",
 revm = { version = "38.0.0", default-features = false }
 
 # Alloy dependencies (aligned to reth v2.2.0)
-alloy = { version = "2.0.4", features = [
+alloy = { version = "2.0.5", features = [
   "contract",
   "providers",
   "provider-http",
@@ -105,13 +105,13 @@ alloy-rpc-types-engine = { version = "2.0.4", default-features = false }
 alloy-signer = { version = "2.0.4", default-features = false }
 alloy-signer-local = { version = "2.0.4", features = ["mnemonic"] }
 alloy-serde = { version = "2.0.4", default-features = false }
-alloy-primitives = { version = "1.5.6", default-features = false }
+alloy-primitives = { version = "1.6.0", default-features = false }
 alloy-consensus = { version = "2.0.4", default-features = false }
 alloy-consensus-any = { version = "2.0.4", default-features = false }
 alloy-rlp = { version = "0.3.13", default-features = false }
 alloy-genesis = { version = "2.0.4", default-features = false }
 alloy-rpc-types-txpool = { version = "2.0.4", default-features = false }
-alloy-sol-types = { version = "1.5.6", default-features = false }
+alloy-sol-types = { version = "1.6.0", default-features = false }
 
 # Utility dependencies
 bytes = "1.10.1"

Cargo.toml

@@ -18,7 +18,7 @@ tokio = { workspace = true }
 clap = { workspace = true, features = ["derive", "env"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-toml = "0.9"
+toml = "1.1"
 eyre = { workspace = true }
 rand = { workspace = true }
 

bin/ev-deployer/Cargo.toml

@@ -16,13 +16,12 @@ Both modes read the same TOML config. The `address` field in each contract secti
 ## Quick Start
 
 ```bash
-# 1. Generate a config pre-populated for your chain
-ev-deployer init --chain-id 42170 --permit2 --output deploy.toml
+# Genesis: embed contracts into the chain's genesis state
+ev-deployer init genesis --chain-id 42170 --permit2 --deterministic-deployer --output genesis.toml
+ev-deployer genesis --config genesis.toml --merge-into genesis.json --output genesis-out.json
 
-# 2a. Genesis mode: embed into genesis state
-ev-deployer genesis --config deploy.toml --merge-into genesis.json --output genesis-out.json
-
-# 2b. Deploy mode: deploy to a live chain
+# Deploy: deploy contracts to a running chain via CREATE2
+ev-deployer init deploy --chain-id 42170 --permit2 --output deploy.toml
 ev-deployer deploy \
     --config deploy.toml \
     --rpc-url http://localhost:8545 \
@@ -40,31 +39,55 @@ The binary is output to `target/release/ev-deployer`.
 
 ## Commands
 
-### `init`
+### `init genesis`
 
-Generate a starter config file.
+Generate a starter config for **genesis mode** (contracts embedded at chain start). Includes `address` fields for each contract.
 
 ```bash
 # Bare template (all contracts commented out)
-ev-deployer init
+ev-deployer init genesis
 
-# Pre-populated with chain ID, Permit2, and deterministic deployer
-ev-deployer init --chain-id 42170 --permit2 --deterministic-deployer
+# Pre-populated with Permit2 and deterministic deployer
+ev-deployer init genesis --chain-id 42170 --permit2 --deterministic-deployer
 
 # Full config with all contracts
-ev-deployer init \
+ev-deployer init genesis \
     --chain-id 42170 \
     --permit2 \
+    --deterministic-deployer \
     --admin-proxy-owner 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 \
-    --output deploy.toml
+    --output genesis.toml
 ```
 
 | Flag | Description |
 |------|-------------|
 | `--output <PATH>` | Write to file instead of stdout |
 | `--chain-id <ID>` | Set the chain ID (defaults to 0) |
 | `--permit2` | Enable Permit2 with its canonical address |
-| `--deterministic-deployer` | Enable the deterministic deployer (Nick's factory) with its canonical address |
+| `--deterministic-deployer` | Enable the deterministic deployer (Nick's factory) |
+| `--admin-proxy-owner <ADDR>` | Enable AdminProxy with the given owner |
+
+### `init deploy`
+
+Generate a starter config for **deploy mode** (contracts deployed via CREATE2 to a running chain). No `address` fields — addresses are computed deterministically. The deterministic deployer is not included in the config since it cannot be deployed via CREATE2 (it must already exist on-chain).
+
+```bash
+# Config with Permit2
+ev-deployer init deploy --chain-id 42170 --permit2
+
+# Full config
+ev-deployer init deploy \
+    --chain-id 42170 \
+    --permit2 \
+    --admin-proxy-owner 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 \
+    --output deploy.toml
+```
+
+| Flag | Description |
+|------|-------------|
+| `--output <PATH>` | Write to file instead of stdout |
+| `--chain-id <ID>` | Set the chain ID (defaults to 0) |
+| `--permit2` | Enable Permit2 |
 | `--admin-proxy-owner <ADDR>` | Enable AdminProxy with the given owner |
 
 ### `genesis`
@@ -114,15 +137,17 @@ ev-deployer deploy \
 The deploy pipeline:
 
 1. Connects to the RPC and verifies the chain ID matches the config.
-2. Checks that the deterministic deployer (`0x4e59b44847b379578588920ca78fbf26c0b4956c`) exists on-chain.
+2. Checks that the [deterministic deployer](https://github.com/Arachnid/deterministic-deployment-proxy) (`0x4e59b44847b379578588920ca78fbf26c0b4956c`) exists on-chain.
 3. Deploys each configured contract via CREATE2.
 4. Verifies that the on-chain bytecode matches the expected bytecode (including patched immutables).
 
-The `address` field in the config is **ignored** in deploy mode — addresses come from the CREATE2 computation.
+Permit2 is deployed using the [canonical Uniswap salt](https://github.com/Uniswap/permit2/blob/main/script/DeployPermit2.s.sol), so it lands at its well-known address `0x000000000022D473030F116dDEE9F6B43aC78BA3` on any chain.
+
+> **Using with ev-dev**: The deterministic deployer can be included in the ev-dev genesis via `ev-deployer init genesis --deterministic-deployer`, so `ev-deployer deploy` works against ev-dev. See the [ev-dev README](../ev-dev/README.md#live-contract-deployment-create2) for examples.
 
 #### State file and resumability
 
-The `--state` file tracks deployment progress. On first run it generates a random CREATE2 salt and records which contracts have been deployed. If the process is interrupted, re-running with the same state file resumes where it left off.
+The `--state` file tracks deployment progress and records which contracts have been deployed. If the process is interrupted, re-running with the same state file resumes where it left off. Contracts with well-known salts (e.g. Permit2) use their canonical salt; others use a random salt generated on first run.
 
 Immutability rules protect against accidental misconfiguration on resume:
 

bin/ev-deployer/README.md

@@ -73,6 +73,14 @@ pub(crate) const HASHED_NAME: B256 = B256::new(hex!(
     "9ac997416e8ff9d2ff6bebeb7149f65cdae5e32e2b90440b566bb3044041d36a"
 ));
 
+/// The CREATE2 salt used by Uniswap to deploy Permit2 at its canonical address
+/// (`0x000000000022D473030F116dDEE9F6B43aC78BA3`) via Nick's factory.
+///
+/// Source: <https://github.com/Uniswap/permit2/blob/main/script/DeployPermit2.s.sol>
+pub(crate) const PERMIT2_CANONICAL_SALT: B256 = B256::new(hex!(
+    "0000000000000000000000000000000000000000d3af2663da51c10215000000"
+));
+
 /// Build the expected runtime bytecode for a Permit2 deployed at `address` on `chain_id`.
 /// Used by the deploy pipeline to verify on-chain bytecode matches.
 pub(crate) fn expected_runtime_bytecode(chain_id: u64, address: Address) -> Vec<u8> {

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

@@ -62,6 +62,16 @@ mod tests {
         assert_ne!(addr1, addr2);
     }
 
+    #[test]
+    fn permit2_canonical_salt_produces_canonical_address() {
+        use crate::contracts::permit2::{PERMIT2_CANONICAL_SALT, PERMIT2_INITCODE};
+        let addr = compute_address(PERMIT2_CANONICAL_SALT, PERMIT2_INITCODE);
+        let expected: Address = "0x000000000022D473030F116dDEE9F6B43aC78BA3"
+            .parse()
+            .unwrap();
+        assert_eq!(addr, expected);
+    }
+
     #[test]
     fn factory_calldata_format() {
         let salt = B256::with_last_byte(0x42);

bin/ev-deployer/src/deploy/create2.rs

@@ -1,3 +1,5 @@
+//! On-chain deployment pipeline: CREATE2 addressing, state tracking, and orchestration.
+
 pub mod create2;
 pub mod deployer;
 pub mod pipeline;

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

@@ -60,8 +60,6 @@ pub async fn run(pipeline_cfg: &PipelineConfig, deployer: &dyn ChainDeployer) ->
         state
     };
 
-    let salt = state.create2_salt;
-
     // ── Step 2: Deploy Permit2 ──
     if let Some(ref p2_config) = pipeline_cfg.config.contracts.permit2 {
         eprintln!("[3/4] Deploying Permit2...");
@@ -70,8 +68,9 @@ pub async fn run(pipeline_cfg: &PipelineConfig, deployer: &dyn ChainDeployer) ->
             eprintln!("       WARN: contracts.permit2.address is ignored in deploy mode");
         }
 
+        let permit2_salt = contracts::permit2::PERMIT2_CANONICAL_SALT;
         let initcode = contracts::permit2::PERMIT2_INITCODE.to_vec();
-        let address = compute_address(salt, &initcode);
+        let address = compute_address(permit2_salt, &initcode);
 
         let expected_runtime = contracts::permit2::expected_runtime_bytecode(chain_id, address);
 
@@ -81,7 +80,7 @@ pub async fn run(pipeline_cfg: &PipelineConfig, deployer: &dyn ChainDeployer) ->
             &DeployContractParams {
                 name: "permit2",
                 address,
-                salt,
+                salt: permit2_salt,
                 initcode: &initcode,
                 expected_runtime: &expected_runtime,
                 state_path: &pipeline_cfg.state_path,