Rename batcher folder and package to gateway

Author: maximopalopoli

Makefile

@@ -317,25 +317,25 @@ agg_mode_docker_clean: agg_mode_docker_down
 agg_mode_run_migrations: agg_mode_docker_up
 	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin migrate -- postgres://postgres:postgres@localhost:5435/
 
-agg_mode_batcher_start_local: agg_mode_run_migrations
-	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin batcher -- config-files/config-agg-mode-batcher.yaml
+agg_mode_gateway_start_local: agg_mode_run_migrations
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin gateway -- config-files/config-agg-mode-gateway.yaml
 
-agg_mode_batcher_start_ethereum_package: agg_mode_run_migrations
-	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin batcher -- config-files/config-agg-mode-batcher-ethereum-package.yaml
+agg_mode_gateway_start_ethereum_package: agg_mode_run_migrations
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin gateway -- config-files/config-agg-mode-gateway-ethereum-package.yaml
 
-agg_mode_batcher_poller_start_local: agg_mode_run_migrations
-	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin agg_mode_batcher_poller -- config-files/config-agg-mode-batcher.yaml
+agg_mode_payments_poller_start_local: agg_mode_run_migrations
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin agg_mode_payments_poller -- config-files/config-agg-mode-gateway.yaml
 
-agg_mode_batcher_poller_start_ethereum_package: agg_mode_run_migrations
-	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin agg_mode_batcher_poller -- config-files/config-agg-mode-batcher-ethereum-package.yaml
+agg_mode_payments_poller_start_ethereum_package: agg_mode_run_migrations
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin agg_mode_payments_poller -- config-files/config-agg-mode-gateway-ethereum-package.yaml
 
 AGG_MODE_SENDER ?= 0x70997970C51812dc3A010C7d01b50e0d17dc79C8
-agg_mode_batcher_send_payment:
+agg_mode_gateway_send_payment:
 	@cast send --value 1ether \
 		0x922D6956C99E12DFeB3224DEA977D0939758A1Fe \
 		--private-key 0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
 
-agg_mode_batcher_send_sp1_proof:
+agg_mode_gateway_send_sp1_proof:
 	@NONCE=$$(curl -s http://127.0.0.1:8089/nonce/0x70997970C51812dc3A010C7d01b50e0d17dc79C8 | jq -r '.data.nonce'); \
 	curl -X POST \
 		-H "Content-Type: multipart/form-data" \

aggregation_mode/Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["./batcher", "./proof_aggregator", "./db", "./payments_poller"]
+members = ["./gateway", "./proof_aggregator", "./db", "./payments_poller"]
 
 [workspace.package]
 version = "0.1.0"

aggregation_mode/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "batcher"
+name = "gateway"
 version = "0.1.0"
 edition = "2021"
 

aggregation_mode/batcher/Cargo.toml aggregation_mode/gateway/Cargo.tomlaggregation_mode/batcher/Cargo.toml renamed to aggregation_mode/gateway/Cargo.toml

@@ -25,18 +25,18 @@ use crate::{
 };
 
 #[derive(Clone, Debug)]
-pub struct BatcherServer {
+pub struct GatewayServer {
     db: Db,
     config: Config,
 }
 
-impl BatcherServer {
+impl GatewayServer {
     pub fn new(db: Db, config: Config) -> Self {
         Self { db, config }
     }
 
     pub async fn start(&self) {
-        // Note: BatcherServer is thread safe so we can just clone it (no need to add mutexes)
+        // Note: GatewayServer is thread safe so we can just clone it (no need to add mutexes)
         let port = self.config.port;
         let state = self.clone();
 
@@ -71,7 +71,7 @@ impl BatcherServer {
 
         let address = address_raw.to_lowercase();
 
-        let Some(state) = req.app_data::<Data<BatcherServer>>() else {
+        let Some(state) = req.app_data::<Data<GatewayServer>>() else {
             return HttpResponse::InternalServerError()
                 .json(AppResponse::new_unsucessfull("Internal server error", 500));
         };
@@ -88,14 +88,14 @@ impl BatcherServer {
         }
     }
 
-    // Posts an SP1 proof to the batcher, recovering the address from the signature
+    // Posts an SP1 proof to the gateway, recovering the address from the signature
     async fn post_proof_sp1(
         req: HttpRequest,
         MultipartForm(data): MultipartForm<SubmitProofRequestSP1>,
     ) -> impl Responder {
         let recovered_address = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8".to_lowercase();
 
-        let Some(state) = req.app_data::<Data<BatcherServer>>() else {
+        let Some(state) = req.app_data::<Data<GatewayServer>>() else {
             return HttpResponse::InternalServerError()
                 .json(AppResponse::new_unsucessfull("Internal server error", 500));
         };
@@ -194,7 +194,7 @@ impl BatcherServer {
     }
 
     /// TODO: complete for risc0 (see `post_proof_sp1`)
-    // Posts a Risc0 proof to the batcher, recovering the address from the signature
+    // Posts a Risc0 proof to the gateway, recovering the address from the signature
     async fn post_proof_risc0(
         _req: HttpRequest,
         MultipartForm(_): MultipartForm<SubmitProofRequestRisc0>,
@@ -208,7 +208,7 @@ impl BatcherServer {
         req: HttpRequest,
         params: web::Query<GetReceiptsQueryParams>,
     ) -> impl Responder {
-        let Some(state) = req.app_data::<Data<BatcherServer>>() else {
+        let Some(state) = req.app_data::<Data<GatewayServer>>() else {
             return HttpResponse::InternalServerError().json(AppResponse::new_unsucessfull(
                 "Internal server error: Failed to get app data",
                 500,

aggregation_mode/batcher/src/config.rs aggregation_mode/gateway/src/config.rsaggregation_mode/batcher/src/config.rs renamed to aggregation_mode/gateway/src/config.rs

@@ -1,6 +1,6 @@
 use std::env;
 
-use batcher::{config::Config, db::Db, http::BatcherServer};
+use gateway::{config::Config, db::Db, http::GatewayServer};
 use tracing_subscriber::{EnvFilter, FmtSubscriber};
 
 fn read_config_filepath_from_args() -> String {
@@ -30,7 +30,7 @@ async fn main() {
         .await
         .expect("db to start");
 
-    let http_server = BatcherServer::new(db, config.clone());
+    let http_server = GatewayServer::new(db, config.clone());
 
     let http_server_handle = tokio::spawn(async move { http_server.start().await });