feat: Require signatures for batcher to charge the users (yetanotherco#632)

Co-authored-by: Santos Rosati <rosatisantos@gmail.com>
Co-authored-by: Tatu <65305492+srosati@users.noreply.github.com>
Co-authored-by: Mariano Nicolini <mariano.nicolini.91@gmail.com>

Author: 3 people

Makefile

@@ -187,7 +187,7 @@ user_fund_payment_service:
 ./batcher/aligned-batcher/.env:
 	@echo "To start the Batcher ./batcher/aligned-batcher/.env needs to be manually set"; false;
 
-batcher_start: ./batcher/aligned-batcher/.env user_fund_payment_service 
+batcher_start: ./batcher/aligned-batcher/.env user_fund_payment_service
 	@echo "Starting Batcher..."
 	@cargo +nightly-2024-04-17 run --manifest-path ./batcher/aligned-batcher/Cargo.toml --release -- --config ./config-files/config-batcher.yaml --env-file ./batcher/aligned-batcher/.env
 
@@ -209,13 +209,19 @@ build_batcher_client:
 batcher/target/release/aligned:
 	@cd batcher/aligned && cargo b --release
 
+
+RPC_URL=http://localhost:8545
+BATCHER_CONTRACT_ADDRESS=0x7969c5eD335650692Bc04293B07F5BF2e7A673C0
+
 batcher_send_sp1_task:
 	@echo "Sending SP1 fibonacci task to Batcher..."
 	@cd batcher/aligned/ && cargo run --release -- submit \
 		--proving_system SP1 \
 		--proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
 		--vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_sp1_burst:
 	@echo "Sending SP1 fibonacci task to Batcher..."
@@ -224,7 +230,10 @@ batcher_send_sp1_burst:
 		--proof ../../scripts/test_files/sp1/sp1_fibonacci.proof \
 		--vm_program ../../scripts/test_files/sp1/sp1_fibonacci.elf \
 		--repetitions 15 \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
+
 
 batcher_send_infinite_sp1:
 	@echo "Sending infinite SP1 fibonacci task to Batcher..."
@@ -237,7 +246,9 @@ batcher_send_risc0_task:
 		--proof ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.proof \
         --vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
         --public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_risc0_burst:
 	@echo "Sending Risc0 fibonacci task to Batcher..."
@@ -247,7 +258,9 @@ batcher_send_risc0_burst:
         --vm_program ../../scripts/test_files/risc_zero/fibonacci_proof_generator/fibonacci_id.bin \
         --public_input ../../scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci.pub \
         --repetitions 15 \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_plonk_bn254_task: batcher/target/release/aligned
 	@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
@@ -256,7 +269,9 @@ batcher_send_plonk_bn254_task: batcher/target/release/aligned
 		--proof ../../scripts/test_files/gnark_plonk_bn254_script/plonk.proof \
 		--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
 		--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_plonk_bn254_burst: batcher/target/release/aligned
 	@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
@@ -266,7 +281,8 @@ batcher_send_plonk_bn254_burst: batcher/target/release/aligned
 		--public_input ../../scripts/test_files/gnark_plonk_bn254_script/plonk_pub_input.pub \
 		--vk ../../scripts/test_files/gnark_plonk_bn254_script/plonk.vk \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
-		--repetitions 15
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_plonk_bls12_381_task: batcher/target/release/aligned
 	@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
@@ -275,7 +291,9 @@ batcher_send_plonk_bls12_381_task: batcher/target/release/aligned
 		--proof ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.proof \
 		--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
 		--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_plonk_bls12_381_burst: batcher/target/release/aligned
 	@echo "Sending Groth16 BLS12-381 1!=0 task to Batcher..."
@@ -285,7 +303,9 @@ batcher_send_plonk_bls12_381_burst: batcher/target/release/aligned
 		--public_input ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk_pub_input.pub \
 		--vk ../../scripts/test_files/gnark_plonk_bls12_381_script/plonk.vk \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
-		--repetitions 15
+		--repetitions 15 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 
 batcher_send_groth16_bn254_task: batcher/target/release/aligned
@@ -295,7 +315,9 @@ batcher_send_groth16_bn254_task: batcher/target/release/aligned
 		--proof ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.proof \
 		--public_input ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.pub \
 		--vk ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.vk \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_groth16_burst: batcher/target/release/aligned
 	@echo "Sending Groth16Bn254 1!=0 task to Batcher..."
@@ -305,7 +327,9 @@ batcher_send_groth16_burst: batcher/target/release/aligned
 		--public_input ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.pub \
 		--vk ../../scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_1_groth16.vk \
 		--repetitions 15 \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_infinite_groth16: batcher/target/release/aligned ## Send a different Groth16 BN254 proof using the client every 3 seconds
 	@mkdir -p scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs
@@ -324,6 +348,8 @@ batcher_send_halo2_ipa_task: batcher/target/release/aligned
 		--proof ../../scripts/test_files/halo2_ipa/proof.bin \
 		--public_input ../../scripts/test_files/halo2_ipa/pub_input.bin \
 		--vk ../../scripts/test_files/halo2_ipa/params.bin \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_halo2_ipa_task_burst_5: batcher/target/release/aligned
 	@echo "Sending Halo2 IPA 1!=0 task to Batcher..."
@@ -332,7 +358,9 @@ batcher_send_halo2_ipa_task_burst_5: batcher/target/release/aligned
 		--proof ../../scripts/test_files/halo2_ipa/proof.bin \
 		--public_input ../../scripts/test_files/halo2_ipa/pub_input.bin \
 		--vk ../../scripts/test_files/halo2_ipa/params.bin \
-		--repetitions 5
+		--repetitions 5 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_halo2_kzg_task: batcher/target/release/aligned
 	@echo "Sending Halo2 KZG 1!=0 task to Batcher..."
@@ -341,7 +369,9 @@ batcher_send_halo2_kzg_task: batcher/target/release/aligned
 		--proof ../../scripts/test_files/halo2_kzg/proof.bin \
 		--public_input ../../scripts/test_files/halo2_kzg/pub_input.bin \
 		--vk ../../scripts/test_files/halo2_kzg/params.bin \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 batcher_send_halo2_kzg_task_burst_5: batcher/target/release/aligned
 	@echo "Sending Halo2 KZG 1!=0 task to Batcher..."
@@ -351,7 +381,9 @@ batcher_send_halo2_kzg_task_burst_5: batcher/target/release/aligned
 		--public_input ../../scripts/test_files/halo2_kzg/pub_input.bin \
 		--vk ../../scripts/test_files/halo2_kzg/params.bin \
 		--repetitions 5 \
-		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc $(RPC_URL) \
+		--batcher_addr $(BATCHER_CONTRACT_ADDRESS)
 
 __GENERATE_PROOFS__:
  # TODO add a default proving system

batcher/aligned-batcher/src/config/mod.rs

@@ -1,16 +1,59 @@
-use ethers::types::Address;
+use std::sync::Arc;
+
+use ethers::{
+    core::k256::ecdsa::SigningKey,
+    signers::{Signer, Wallet},
+    types::{Address, U256},
+};
 use serde::Deserialize;
+use tokio::sync::Mutex;
+
+use crate::eth::BatcherPaymentService;
 
 #[derive(Clone, Debug, Deserialize)]
 pub struct ECDSAConfig {
     pub private_key_store_path: String,
     pub private_key_store_password: String,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug)]
 pub struct NonPayingConfig {
     pub address: Address,
-    pub replacement: Address,
+    pub replacement: Wallet<SigningKey>,
+    pub nonce: Arc<Mutex<U256>>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct NonPayingConfigFromYaml {
+    pub address: Address,
+    pub replacement_private_key: String,
+}
+
+impl NonPayingConfig {
+    pub async fn from_yaml_config(
+        config: NonPayingConfigFromYaml,
+        batcher_payments_contract: &BatcherPaymentService,
+    ) -> Self {
+        let replacement = Wallet::from_bytes(
+            hex::decode(config.replacement_private_key)
+                .expect("Failed to decode replacement private key")
+                .as_slice(),
+        )
+        .expect("Failed to create replacement wallet");
+
+        let nonce = batcher_payments_contract
+            .user_nonces(replacement.address())
+            .await
+            .expect("Failed to get nonce");
+
+        let nonce = Arc::new(Mutex::new(nonce));
+
+        NonPayingConfig {
+            address: config.address,
+            replacement,
+            nonce,
+        }
+    }
 }
 
 #[derive(Debug, Deserialize)]
@@ -21,7 +64,7 @@ pub struct BatcherConfigFromYaml {
     pub max_batch_size: usize,
     pub eth_ws_reconnects: usize,
     pub pre_verification_is_enabled: bool,
-    pub non_paying: Option<NonPayingConfig>,
+    pub non_paying: Option<NonPayingConfigFromYaml>,
 }
 
 #[derive(Debug, Deserialize)]

batcher/aligned-batcher/src/eth/abi/AlignedLayerServiceManager.json

@@ -1,20 +1,18 @@
+use std::iter::repeat;
 use std::str::FromStr;
 use std::sync::Arc;
+use std::time::Duration;
 
+use aligned_sdk::eth::batcher_payment_service::{BatcherPaymentServiceContract, SignatureData};
 use ethers::prelude::k256::ecdsa::SigningKey;
 use ethers::prelude::*;
+use log::debug;
+use tokio::time::sleep;
 
-use crate::config::ECDSAConfig;
-
-abigen!(
-    AlignedLayerServiceManagerContract,
-    "./src/eth/abi/AlignedLayerServiceManager.json",
-);
+const CREATE_NEW_TASK_MAX_RETRIES: usize = 100;
+const CREATE_NEW_TASK_MILLISECS_BETWEEN_RETRIES: u64 = 100;
 
-abigen!(
-    BatcherPaymentServiceContract,
-    "./src/eth/abi/BatcherPaymentService.json",
-);
+use crate::config::ECDSAConfig;
 
 #[derive(Debug, Clone, EthEvent)]
 pub struct BatchVerified {
@@ -32,23 +30,48 @@ pub async fn create_new_task(
     payment_service: &BatcherPaymentService,
     batch_merkle_root: [u8; 32],
     batch_data_pointer: String,
-    proof_submitters: Vec<Address>,
+    leaves: Vec<[u8; 32]>,
+    signatures: Vec<SignatureData>,
     gas_for_aggregator: U256,
     gas_per_proof: U256,
 ) -> Result<TransactionReceipt, anyhow::Error> {
+    // pad leaves to next power of 2
+    let leaves_len = leaves.len();
+    let last_leaf = leaves[leaves_len - 1];
+    let leaves = leaves
+        .into_iter()
+        .chain(repeat(last_leaf).take(leaves_len.next_power_of_two() - leaves_len))
+        .collect::<Vec<[u8; 32]>>();
+
     let call = payment_service.create_new_task(
         batch_merkle_root,
         batch_data_pointer,
-        proof_submitters,
+        leaves,
+        signatures,
         gas_for_aggregator,
         gas_per_proof,
     );
-    let pending_tx = call.send().await?;
 
-    match pending_tx.await? {
-        Some(receipt) => Ok(receipt),
-        None => Err(anyhow::anyhow!("Receipt not found")),
+    // If there was a pending transaction from a previously sent batch, the `call.send()` will
+    // fail because of the nonce not being updated. We should retry sending and not returning an error
+    // immediatly.
+    for _ in 0..CREATE_NEW_TASK_MAX_RETRIES {
+        if let Ok(pending_tx) = call.send().await {
+            match pending_tx.await? {
+                Some(receipt) => return Ok(receipt),
+                None => return Err(anyhow::anyhow!("Receipt not found")),
+            }
+        }
+        debug!("createNewTask transaction not sent, retrying in {CREATE_NEW_TASK_MILLISECS_BETWEEN_RETRIES} milliseconds...");
+        sleep(Duration::from_millis(
+            CREATE_NEW_TASK_MILLISECS_BETWEEN_RETRIES,
+        ))
+        .await;
     }
+
+    Err(anyhow::anyhow!(
+        "Maximum tries reached. Could not send createNewTask call"
+    ))
 }
 
 pub async fn get_batcher_payment_service(