Merge staging

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,27 +317,29 @@ 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:
-	@NONCE=$$(curl -s http://127.0.0.1:8089/nonce/0x70997970C51812dc3A010C7d01b50e0d17dc79C8 | jq -r '.data.nonce'); \
-	curl -X POST \
-		-H "Content-Type: multipart/form-data" \
-		-F "nonce=$${NONCE}" \
-		-F "proof=@scripts/test_files/sp1/sp1_fibonacci_5_0_0.proof" \
-		-F "program_vk=@scripts/test_files/sp1/sp1_fibonacci_5_0_0_vk.bin" \
-		-F "_signature_hex=0x0" \
-		http://127.0.0.1:8089/proof/sp1
+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 \
+		--private-key "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
 
 agg_mode_get_quotas:
 	curl -X GET http://127.0.0.1:8089/quotas/0x70997970C51812dc3A010C7d01b50e0d17dc79C8

aggregation_mode/Cargo.lock

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

aggregation_mode/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "agg_mode_cli"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde =  { workspace = true }
+tracing = { version = "0.1", features = ["log"] }
+tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
+bincode = "1.3.3"
+tokio = { version = "1", features = ["macros", "rt-multi-thread", "time"] }
+alloy = { workspace = true }
+agg_mode_sdk = { path = "../sdk"}
+sp1-sdk = "5.0.0"
+clap = { version = "4.5.4", features = ["derive"] }

aggregation_mode/batcher/abi/AggregationModePaymentService.json

@@ -0,0 +1 @@
+pub mod submit;

aggregation_mode/batcher/src/server/mod.rs

@@ -0,0 +1,70 @@
+use agg_mode_sdk::{gateway::provider::AggregationModeGatewayProvider, types::Network};
+use alloy::signers::local::LocalSigner;
+use clap::{command, Args, Subcommand};
+use sp1_sdk::{SP1ProofWithPublicValues, SP1VerifyingKey};
+use std::{path::PathBuf, str::FromStr};
+
+#[derive(Debug, Subcommand)]
+pub enum SubmitCommand {
+    #[command(name = "sp1")]
+    SP1(SubmitSP1Args),
+}
+
+#[derive(Debug, Clone, Args)]
+pub struct SubmitSP1Args {
+    #[arg(short = 'p', long = "proof")]
+    proof_path: PathBuf,
+    #[arg(long = "vk")]
+    verifying_key_path: PathBuf,
+    #[arg(long = "private-key")]
+    private_key: String,
+    #[arg(short = 'n', long = "network", default_value = "devnet", value_parser = parse_network)]
+    network: Network,
+}
+
+fn parse_network(value: &str) -> Result<Network, String> {
+    Network::from_str(value).map_err(|_| format!("unsupported network supplied: {value}"))
+}
+
+pub async fn run(args: SubmitSP1Args) {
+    tracing::info!("Submitting SP1 proof to {:?} ", args.network);
+
+    let proof = load_proof(&args.proof_path).expect("Valid proof");
+    let vk = load_vk(&args.verifying_key_path).expect("Valid vk");
+
+    let signer =
+        LocalSigner::from_str(args.private_key.trim()).expect("failed to parse private key: {e}");
+
+    let provider = AggregationModeGatewayProvider::new_with_signer(args.network.clone(), signer)
+        .expect("failed to initialize gateway client: {e:?}");
+
+    let response = provider
+        .submit_sp1_proof(&proof, &vk)
+        .await
+        .expect("failed to submit proof: {e:?}");
+
+    tracing::info!(
+        "Proof submitted successfully. Task ID: {}",
+        response.data.task_id
+    );
+}
+
+fn load_proof(path: &PathBuf) -> Result<SP1ProofWithPublicValues, String> {
+    let bytes = std::fs::read(path)
+        .map_err(|e| format!("failed to read proof from {}: {e}", path.display()))?;
+
+    bincode::deserialize(&bytes)
+        .map_err(|e| format!("failed to deserialize proof {}: {e}", path.display()))
+}
+
+fn load_vk(path: &PathBuf) -> Result<SP1VerifyingKey, String> {
+    let bytes = std::fs::read(path)
+        .map_err(|e| format!("failed to read verifying key from {}: {e}", path.display()))?;
+
+    bincode::deserialize(&bytes).map_err(|e| {
+        format!(
+            "failed to deserialize verifying key {}: {e}",
+            path.display()
+        )
+    })
+}

aggregation_mode/cli/Cargo.toml

@@ -0,0 +1 @@
+pub mod commands;