Merge branch 'staging' into feat/recover-address

Author: maximopalopoli

aggregation_mode/batcher/src/config.rs

@@ -9,6 +9,7 @@ pub struct Config {
     pub eth_rpc_url: String,
     pub payment_service_address: String,
     pub network: String,
+    pub max_daily_proofs_per_user: i64,
 }
 
 impl Config {

aggregation_mode/batcher/src/db.rs

@@ -96,6 +96,18 @@ impl Db {
         .await
     }
 
+    pub async fn get_daily_tasks_by_address(&self, address: &str) -> Result<i64, sqlx::Error> {
+        sqlx::query_scalar::<_, i64>(
+            "SELECT COUNT(*)
+            FROM tasks
+            WHERE address = $1
+            AND inserted_at::date = CURRENT_DATE",
+        )
+        .bind(address.to_lowercase())
+        .fetch_one(&self.pool)
+        .await
+    }
+
     pub async fn insert_task(
         &self,
         address: &str,

aggregation_mode/batcher/src/server/http.rs

@@ -136,6 +136,23 @@ impl BatcherServer {
         };
         let recovered_address = recovered_address.to_string().to_lowercase();
 
+        // Checking if this address has submited more proofs than the ones allowed per day
+        let Ok(daily_tasks_by_address) = state
+            .db
+            .get_daily_tasks_by_address(&recovered_address)
+            .await
+        else {
+            return HttpResponse::InternalServerError()
+                .json(AppResponse::new_unsucessfull("Internal server error", 500));
+        };
+
+        if daily_tasks_by_address >= state.config.max_daily_proofs_per_user {
+            return HttpResponse::InternalServerError().json(AppResponse::new_unsucessfull(
+                "Request denied: Query limit exceeded.",
+                400,
+            ));
+        }
+
         let Ok(count) = state.db.count_tasks_by_address(&recovered_address).await else {
             return HttpResponse::InternalServerError()
                 .json(AppResponse::new_unsucessfull("Internal server error", 500));

aggregation_mode/db/migrations/001_init.sql

@@ -8,7 +8,8 @@ CREATE TABLE tasks (
     program_commitment BYTEA,
     merkle_path BYTEA,
     status task_status DEFAULT 'pending',
-    nonce BIGINT NOT NULL
+    nonce BIGINT NOT NULL,
+    inserted_at TIMESTAMPTZ NOT NULL DEFAULT now()
 );
 
 CREATE TABLE payment_events (
@@ -17,5 +18,6 @@ CREATE TABLE payment_events (
     amount BIGINT,
     started_at BIGINT,
     valid_until BIGINT,
-    tx_hash CHAR(66) UNIQUE
+    tx_hash CHAR(66) UNIQUE,
+    inserted_at TIMESTAMPTZ NOT NULL DEFAULT now()
 );

aggregation_mode/proof_aggregator/src/backend/db.rs

@@ -61,7 +61,7 @@ impl Db {
 
         for (task_id, merkle_path) in updates {
             if let Err(e) = sqlx::query(
-                "UPDATE tasks SET merkle_path = $1, status = 'verified' WHERE task_id = $2",
+                "UPDATE tasks SET merkle_path = $1, status = 'verified', proof = NULL WHERE task_id = $2",
             )
             .bind(merkle_path)
             .bind(task_id)

config-files/config-agg-mode-batcher-ethereum-package.yaml

@@ -3,3 +3,4 @@ db_connection_url: "postgres://postgres:postgres@localhost:5435/"
 eth_rpc_url: "http://localhost:8545"
 payment_service_address: "0x922D6956C99E12DFeB3224DEA977D0939758A1Fe"
 network: "devnet"
+max_daily_proofs_per_user: 32

config-files/config-agg-mode-batcher.yaml

@@ -3,3 +3,4 @@ db_connection_url: "postgres://postgres:postgres@localhost:5435/"
 eth_rpc_url: "http://localhost:8545"
 payment_service_address: "0x922D6956C99E12DFeB3224DEA977D0939758A1Fe"
 network: "devnet"
+max_daily_proofs_per_user: 4