feat: extract wallet api to own service

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
     "bin/odyssey/",
+    "bin/relay/",
     "crates/node",
     "crates/e2e-tests",
     "crates/wallet",
@@ -148,6 +149,7 @@ alloy-consensus = "0.6.4"
 alloy-eips = "0.6.4"
 alloy-network = "0.6.4"
 alloy-primitives = "0.8.11"
+alloy-provider = "0.6.4"
 alloy-rpc-types = "0.6.4"
 alloy-signer-local = { version = "0.6.4", features = ["mnemonic"] }
 
@@ -159,7 +161,6 @@ reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211a
 reth-cli = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
 reth-cli-util = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
 reth-evm = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
 reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
 reth-node-builder = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
 reth-node-core = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac", features = [
@@ -185,7 +186,6 @@ reth-provider = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aa
     "optimism",
 ] }
 reth-revm = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
-reth-storage-api = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
 reth-tracing = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
 reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }
 reth-trie-db = { git = "https://github.com/paradigmxyz/reth.git", rev = "f211aac" }

bin/odyssey/Cargo.toml

@@ -16,7 +16,6 @@ alloy-signer-local.workspace = true
 alloy-network.workspace = true
 alloy-primitives.workspace = true
 odyssey-node.workspace = true
-odyssey-wallet.workspace = true
 odyssey-walltime.workspace = true
 eyre.workspace = true
 tracing.workspace = true

bin/odyssey/src/main.rs

@@ -23,19 +23,14 @@
 //! - `min-debug-logs`: Disables all logs below `debug` level.
 //! - `min-trace-logs`: Disables all logs below `trace` level.
 
-use alloy_network::EthereumWallet;
-use alloy_primitives::Address;
-use alloy_signer_local::PrivateKeySigner;
 use clap::Parser;
-use eyre::Context;
 use odyssey_node::{chainspec::OdysseyChainSpecParser, node::OdysseyNode};
-use odyssey_wallet::{OdysseyWallet, OdysseyWalletApiServer};
 use odyssey_walltime::{OdysseyWallTime, OdysseyWallTimeRpcApiServer};
 use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher};
 use reth_optimism_cli::Cli;
 use reth_optimism_node::{args::RollupArgs, node::OpAddOns};
 use reth_provider::{providers::BlockchainProvider2, CanonStateSubscriptions};
-use tracing::{info, warn};
+use tracing::info;
 
 #[global_allocator]
 static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator();
@@ -56,36 +51,6 @@ fn main() {
                 .with_components(OdysseyNode::components(&rollup_args))
                 .with_add_ons(OpAddOns::new(rollup_args.sequencer_http))
                 .extend_rpc_modules(move |ctx| {
-                    // register odyssey wallet namespace
-                    if let Ok(sk) = std::env::var("EXP1_SK") {
-                        let signer: PrivateKeySigner =
-                            sk.parse().wrap_err("Invalid EXP0001 secret key.")?;
-                        let wallet = EthereumWallet::from(signer);
-
-                        let raw_delegations = std::env::var("EXP1_WHITELIST")
-                            .wrap_err("No EXP0001 delegations specified")?;
-                        let valid_delegations: Vec<Address> = raw_delegations
-                            .split(',')
-                            .map(|addr| Address::parse_checksummed(addr, None))
-                            .collect::<Result<_, _>>()
-                            .wrap_err("No valid EXP0001 delegations specified")?;
-
-                        ctx.modules.merge_configured(
-                            OdysseyWallet::new(
-                                ctx.provider().clone(),
-                                wallet,
-                                ctx.registry.eth_api().clone(),
-                                ctx.config().chain.chain().id(),
-                                valid_delegations,
-                            )
-                            .into_rpc(),
-                        )?;
-
-                        info!(target: "reth::cli", "EXP0001 wallet configured");
-                    } else {
-                        warn!(target: "reth::cli", "EXP0001 wallet not configured");
-                    }
-
                     let walltime = OdysseyWallTime::spawn(ctx.provider().canonical_state_stream());
                     ctx.modules.merge_configured(walltime.into_rpc())?;
                     info!(target: "reth::cli", "Walltime configured");

bin/relay/Cargo.toml

@@ -0,0 +1,45 @@
+[package]
+name = "odyssey-relay"
+version.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+repository.workspace = true
+description = "Odyssey Relay is an EIP-7702 native transaction batcher and sponsor."
+
+[lints]
+workspace = true
+
+[dependencies]
+alloy-signer-local.workspace = true
+alloy-network.workspace = true
+alloy-primitives.workspace = true
+odyssey-node.workspace = true
+odyssey-wallet.workspace = true
+odyssey-walltime.workspace = true
+eyre.workspace = true
+tracing.workspace = true
+reth-cli-util.workspace = true
+reth-node-builder.workspace = true
+reth-optimism-node.workspace = true
+reth-optimism-cli.workspace = true
+reth-provider.workspace = true
+clap = { workspace = true, features = ["derive"] }
+
+[features]
+default = ["jemalloc"]
+
+asm-keccak = ["reth-optimism-cli/asm-keccak"]
+
+jemalloc = ["reth-cli-util/jemalloc"]
+jemalloc-prof = ["jemalloc", "reth-cli-util/jemalloc-prof"]
+
+min-error-logs = ["tracing/release_max_level_error"]
+min-warn-logs = ["tracing/release_max_level_warn"]
+min-info-logs = ["tracing/release_max_level_info"]
+min-debug-logs = ["tracing/release_max_level_debug"]
+min-trace-logs = ["tracing/release_max_level_trace"]
+
+[[bin]]
+name = "odyssey"
+path = "src/main.rs"

bin/relay/src/main.rs

@@ -0,0 +1,37 @@
+//! # Odyssey Relay
+//!
+//! TBD
+
+use alloy_signer_local::PrivateKeySigner;
+use eyre::Context;
+
+fn run() -> eyre::Result<()> {
+    let signer: PrivateKeySigner = std::env::var("RELAY_SK")
+        .wrap_err("Environment variable `RELAY_SK` must be set")
+        .and_then(|sk| sk.parse().wrap_err("Invalid signing key set in `RELAY_SK`"))?;
+
+    Ok(())
+}
+
+struct Cli {
+    port: u16,
+    upstream: Vec<String>, // todo make url
+    constraints: Constraints,
+}
+
+struct Constraints {
+    max_gas: u64,
+}
+
+#[doc(hidden)]
+fn main() {
+    // Enable backtraces unless a RUST_BACKTRACE value has already been explicitly provided.
+    if std::env::var_os("RUST_BACKTRACE").is_none() {
+        std::env::set_var("RUST_BACKTRACE", "1");
+    }
+
+    if let Err(err) = run() {
+        eprint!("Error: {err:?}");
+        std::process::exit(1);
+    }
+}

crates/wallet/Cargo.toml

@@ -10,17 +10,13 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-alloy-eips.workspace = true
 alloy-network.workspace = true
 alloy-primitives.workspace = true
+alloy-provider.workspace = true
 alloy-rpc-types.workspace = true
 
-reth-storage-api.workspace = true
-reth-rpc-eth-api.workspace = true
 reth-optimism-rpc.workspace = true
 
-revm-primitives.workspace = true
-
 jsonrpsee = { workspace = true, features = ["server", "macros"] }
 serde = { workspace = true, features = ["derive"] }
 thiserror.workspace = true