feat(agg-mode): separate payment poller from the HTTP server (#2193)

Co-authored-by: JuArce <[email protected]>

Author: maximopalopoli

.github/workflows/build-and-test-rust.yml

@@ -124,4 +124,5 @@ jobs:
       - name: Run AggregationMode tests
         run: |
           cd aggregation_mode/proof_aggregator && cargo test
-          cd ../batcher && cargo test
+          cd ../gateway && cargo test
+          cd ../payments_poller && cargo test

Makefile

@@ -317,19 +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 agg_mode_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 agg_mode_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_payments_poller_start_local: agg_mode_run_migrations
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin payments_poller -- config-files/config-agg-mode-gateway.yaml
+
+agg_mode_payments_poller_start_ethereum_package: agg_mode_run_migrations
+	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin 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:
 	@cargo run --manifest-path aggregation_mode/cli/Cargo.toml -- submit sp1 \
 		--proof scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof \
 		--vk scripts/test_files/sp1/sp1_fibonacci_5_0_0_vk.bin \

aggregation_mode/Cargo.lock

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

aggregation_mode/Cargo.toml

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

aggregation_mode/batcher/src/server/mod.rs

@@ -6,8 +6,6 @@ use serde::{Deserialize, Serialize};
 pub struct Config {
     pub port: u16,
     pub db_connection_url: String,
-    pub eth_rpc_url: String,
-    pub payment_service_address: String,
     pub network: String,
     pub max_daily_proofs_per_user: i64,
 }

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

@@ -138,29 +138,6 @@ impl Db {
         .await
     }
 
-    pub async fn insert_payment_event(
-        &self,
-        address: &str,
-        started_at: &BigDecimal,
-        amount: &BigDecimal,
-        valid_until: &BigDecimal,
-        tx_hash: &str,
-    ) -> Result<(), sqlx::Error> {
-        sqlx::query(
-            "INSERT INTO payment_events (address, started_at, amount, valid_until, tx_hash)
-            VALUES ($1, $2, $3, $4, $5)
-            ON CONFLICT (tx_hash) DO NOTHING",
-        )
-        .bind(address.to_lowercase())
-        .bind(started_at)
-        .bind(amount)
-        .bind(valid_until)
-        .bind(tx_hash)
-        .execute(&self.pool)
-        .await
-        .map(|_| ())
-    }
-
     pub async fn has_active_payment_event(
         &self,
         address: &str,

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

@@ -22,18 +22,18 @@ use super::{
 use crate::{
     config::Config,
     db::Db,
-    server::types::{GetReceiptsResponse, SubmitProofRequestRisc0, SubmitProofRequestSP1},
+    types::{GetReceiptsResponse, SubmitProofRequestRisc0, SubmitProofRequestSP1},
     verifiers::{verify_sp1_proof, VerificationError},
 };
 
 #[derive(Clone, Debug)]
-pub struct BatcherServer {
+pub struct GatewayServer {
     db: Db,
     config: Config,
     network: Network,
 }
 
-impl BatcherServer {
+impl GatewayServer {
     pub fn new(db: Db, config: Config) -> Self {
         let network = Network::from_str(&config.network).expect("A valid network in config file");
         Self {
@@ -44,7 +44,7 @@ impl BatcherServer {
     }
 
     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();
 
@@ -79,7 +79,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));
         };
@@ -96,12 +96,12 @@ 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 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));
         };
@@ -235,7 +235,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>,
@@ -249,7 +249,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,