chore(bin): Lifts the Ingress Binary to bin Directory (#125)

* chore(bin): lift binary to bin directory

* chore(bin): lift binary to bin directory

* fixes

Author: refcell

Cargo.lock

@@ -7,8 +7,9 @@ homepage = "https://github.com/base/tips"
 repository = "https://github.com/base/tips"
 
 [workspace]
-members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core", "crates/system-tests"]
 resolver = "2"
+members = ["crates/*", "bin/*"]
+default-members = ["bin/tips-ingress-rpc"]
 
 [workspace.lints.rust]
 missing-debug-implementations = "warn"
@@ -31,7 +32,9 @@ redundant-clone = "warn"
 [workspace.dependencies]
 # local
 tips-core = { path = "crates/core" }
-tips-audit = { path = "crates/audit" }
+tips-audit = { path = "bin/tips-audit" }
+tips-audit-lib = { path = "crates/audit" }
+tips-ingress-rpc-lib = { path = "crates/ingress-rpc" }
 tips-system-tests = { path = "crates/system-tests" }
 account-abstraction-core = { path = "crates/account-abstraction-core" }
 

Cargo.toml

@@ -21,7 +21,7 @@ COPY . .
 RUN --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=/usr/local/cargo/git \
     --mount=type=cache,target=/app/target \
-    cargo build && \
+    cargo build -p tips-ingress-rpc -p tips-audit && \
     cp target/debug/tips-ingress-rpc /tmp/tips-ingress-rpc && \
     cp target/debug/tips-audit /tmp/tips-audit
 

Dockerfile

@@ -13,13 +13,13 @@ The project consists of several components:
 ### 🗄️ Datastore (`crates/datastore`)
 Postgres storage layer that provides API's to persist and retrieve bundles.
 
-### 📊 Audit (`crates/audit`)
+### 📊 Audit (`bin/tips-audit`)
 Event streaming and archival system that:
 - Provides an API to publish bundle events to Kafka
 - Archives bundle history to S3 for long-term storage
 - See [S3 Storage Format](docs/AUDIT_S3_FORMAT.md) for data structure details
 
-### 🔌 Ingress RPC (`crates/ingress-rpc`)
+### 🔌 Ingress RPC (`bin/tips-ingress-rpc`)
 The main entry point that provides a JSON-RPC API for receiving transactions and bundles.
 
 ### 🖥️ UI (`ui`)

README.md

@@ -0,0 +1,21 @@
+[package]
+name = "tips-audit"
+version.workspace = true
+rust-version.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+edition.workspace = true
+
+[dependencies]
+tips-core.workspace = true
+tips-audit-lib.workspace = true
+clap.workspace = true
+tokio.workspace = true
+anyhow.workspace = true
+tracing.workspace = true
+dotenvy.workspace = true
+rdkafka.workspace = true
+aws-config.workspace = true
+aws-sdk-s3.workspace = true
+aws-credential-types.workspace = true

bin/tips-audit/Cargo.toml

@@ -5,7 +5,7 @@ use aws_sdk_s3::{Client as S3Client, config::Builder as S3ConfigBuilder};
 use clap::{Parser, ValueEnum};
 use rdkafka::consumer::Consumer;
 use std::net::SocketAddr;
-use tips_audit::{
+use tips_audit_lib::{
     KafkaAuditArchiver, KafkaAuditLogReader, S3EventReaderWriter, create_kafka_consumer,
 };
 use tips_core::logger::init_logger_with_format;

crates/audit/src/bin/main.rs bin/tips-audit/src/main.rscrates/audit/src/bin/main.rs renamed to bin/tips-audit/src/main.rs

@@ -0,0 +1,23 @@
+[package]
+name = "tips-ingress-rpc"
+version.workspace = true
+rust-version.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+edition.workspace = true
+
+[dependencies]
+tips-core.workspace = true
+tips-audit-lib.workspace = true
+tips-ingress-rpc-lib.workspace = true
+account-abstraction-core.workspace = true
+clap.workspace = true
+tokio.workspace = true
+anyhow.workspace = true
+tracing.workspace = true
+dotenvy.workspace = true
+rdkafka.workspace = true
+jsonrpsee.workspace = true
+op-alloy-network.workspace = true
+alloy-provider.workspace = true

bin/tips-ingress-rpc/Cargo.toml

@@ -5,16 +5,16 @@ use jsonrpsee::server::Server;
 use op_alloy_network::Optimism;
 use rdkafka::ClientConfig;
 use rdkafka::producer::FutureProducer;
-use tips_audit::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher};
+use tips_audit_lib::{BundleEvent, KafkaBundleEventPublisher, connect_audit_to_publisher};
 use tips_core::kafka::load_kafka_config_from_file;
 use tips_core::logger::init_logger_with_format;
 use tips_core::metrics::init_prometheus_exporter;
 use tips_core::{AcceptedBundle, MeterBundleResponse};
-use tips_ingress_rpc::Config;
-use tips_ingress_rpc::connect_ingress_to_builder;
-use tips_ingress_rpc::health::bind_health_server;
-use tips_ingress_rpc::queue::KafkaMessageQueue;
-use tips_ingress_rpc::service::{IngressApiServer, IngressService, Providers};
+use tips_ingress_rpc_lib::Config;
+use tips_ingress_rpc_lib::connect_ingress_to_builder;
+use tips_ingress_rpc_lib::health::bind_health_server;
+use tips_ingress_rpc_lib::queue::KafkaMessageQueue;
+use tips_ingress_rpc_lib::service::{IngressApiServer, IngressService, Providers};
 use tokio::sync::{broadcast, mpsc};
 use tracing::info;
 
@@ -23,7 +23,6 @@ async fn main() -> anyhow::Result<()> {
     dotenvy::dotenv().ok();
 
     let config = Config::parse();
-    // clone once instead of cloning each field before passing to `IngressService::new`
     let cfg = config.clone();
 
     init_logger_with_format(&config.log_level, config.log_format);

crates/ingress-rpc/src/bin/main.rs bin/tips-ingress-rpc/src/main.rscrates/ingress-rpc/src/bin/main.rs renamed to bin/tips-ingress-rpc/src/main.rs

@@ -9,21 +9,21 @@ edition.workspace = true
 
 [dependencies]
 tips-core.workspace = true
+alloy-serde.workspace = true
+async-trait.workspace = true
+alloy-sol-types.workspace = true
+op-alloy-network.workspace = true
+reth-rpc-eth-types.workspace = true
 serde = { workspace = true, features = ["std", "derive"] }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true, features = ["std"] }
 anyhow = { workspace = true, features = ["std"] }
-rdkafka = { workspace = true, features = ["tokio", "libz"] }
-jsonrpsee = { workspace = true, features = ["server", "macros"] }
 serde_json = { workspace = true, features = ["std"] }
-async-trait.workspace = true
-alloy-serde.workspace = true
-alloy-sol-types.workspace = true
-alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] }
+rdkafka = { workspace = true, features = ["tokio", "libz"] }
 alloy-rpc-types = { workspace = true, features = ["eth"] }
+jsonrpsee = { workspace = true, features = ["server", "macros"] }
 alloy-provider = { workspace = true, features = ["reqwest"] }
-op-alloy-network.workspace = true
-reth-rpc-eth-types.workspace = true
+alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] }
 
 [dev-dependencies]
 wiremock.workspace = true

crates/account-abstraction-core/Cargo.toml

@@ -1,40 +1,36 @@
 [package]
-name = "tips-audit"
+name = "tips-audit-lib"
 version.workspace = true
 rust-version.workspace = true
 license.workspace = true
 homepage.workspace = true
 repository.workspace = true
 edition.workspace = true
 
-[[bin]]
-name = "tips-audit"
-path = "src/bin/main.rs"
-
 [dependencies]
-tips-core = { workspace = true, features = ["test-utils"] }
 bytes.workspace = true
 metrics.workspace = true
 dotenvy.workspace = true
 async-trait.workspace = true
 metrics-derive.workspace = true
-alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] }
-tokio = { workspace = true, features = ["full"] }
+aws-credential-types.workspace = true
+tips-core = { workspace = true, features = ["test-utils"] }
 serde = { workspace = true, features = ["std", "derive"] }
+tokio = { workspace = true, features = ["full"] }
 uuid = { workspace = true, features = ["v4", "serde"] }
 tracing = { workspace = true, features = ["std"] }
 anyhow = { workspace = true, features = ["std"] }
 serde_json = { workspace = true, features = ["std"] }
 rdkafka = { workspace = true, features = ["tokio", "libz"] }
 alloy-consensus = { workspace = true, features = ["std"] }
 alloy-provider = { workspace = true, features = ["reqwest"] }
-op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] }
 clap = { version = "4.5.47", features = ["std", "derive", "env"] }
+op-alloy-consensus = { workspace = true, features = ["std", "k256", "serde"] }
+alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] }
 tracing-subscriber = { workspace = true, features = ["std", "fmt", "env-filter", "json"] }
 aws-config = { workspace = true, features = ["default-https-client", "rt-tokio"] }
 aws-sdk-s3 = { workspace = true, features = ["rustls", "default-https-client", "rt-tokio"] }
-aws-credential-types.workspace = true
 
 [dev-dependencies]
 testcontainers = { workspace = true, features = ["blocking"] }
-testcontainers-modules = { workspace = true, features = ["postgres", "kafka", "minio"] }
+testcontainers-modules = { workspace = true, features = ["postgres", "kafka", "minio"] }