Merge pull request #6 from lambdaclass/integrate_mina_operator

Integrate mina operator

Author: xqft

Makefile

@@ -331,6 +331,31 @@ batcher_send_halo2_kzg_task_burst_5: batcher/target/release/aligned
 		--repetitions 5 \
 		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
 
+batcher_send_mina_task:
+	@echo "Sending Mina state task to Batcher..."
+	@cd batcher/aligned/ && cargo run --release -- submit \
+		--proving_system Mina \
+		--proof test_files/mina/protocol_state_proof.proof \
+		--public_input test_files/mina/protocol_state_hash.pub \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+
+batcher_send_mina_task_bad:
+	@echo "Sending Mina state task to Batcher..."
+	@cd batcher/aligned/ && cargo run --release -- submit \
+		--proving_system Mina \
+		--proof test_files/mina/protocol_state_proof.proof \
+		--public_input test_files/mina/bad_protocol_state_hash.pub \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+
+batcher_send_mina_burst:
+	@echo "Sending Mina state task to Batcher..."
+	@cd batcher/aligned/ && cargo run --release -- submit \
+		--proving_system Mina \
+		--proof test_files/mina/protocol_state_proof.proof \
+		--public_input test_files/mina/protocol_state_hash.pub \
+		--repetitions 15 \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657
+
 __TASK_SENDERS__:
  # TODO add a default proving system
 
@@ -666,11 +691,11 @@ generate_halo2_ipa_proof:
 __MINA_FFI__: ##
 build_mina_macos:
 	@cd operator/mina/lib && cargo build --release
-	@cp operator/mina/lib/target/release/libkimchi_verifier_ffi.dylib operator/mina/lib/libkimchi_verifier.dylib
+	@cp operator/mina/lib/target/release/libmina_state_verifier_ffi.dylib operator/mina/lib/libmina_state_verifier.dylib
 
 build_mina_linux:
 	@cd operator/mina/lib && cargo build --release
-	@cp operator/mina/lib/target/release/libkimchi_verifier_ffi.so operator/mina/lib/libkimchi_verifier.so
+	@cp operator/mina/lib/target/release/libmina_state_verifier_ffi.so operator/mina/lib/libmina_state_verifier.so
 
 test_mina_rust_ffi:
 	@echo "Testing Mina Rust FFI source code..."

batcher/Cargo.lock

@@ -19,14 +19,19 @@ bytes = "1.6.0"
 hex = "0.4.3"
 dotenv = "0.15.0"
 anyhow = "1.0.83"
-ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
+ethers = { tag = "v2.0.15-fix-reconnections", features = [
+  "ws",
+  "rustls",
+], git = "https://github.com/yetanotherco/ethers-rs.git" }
 lambdaworks-crypto = { version = "0.7.0", features = ["serde"] }
 serde_yaml = "0.9.34"
 sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v1.0.5-testnet" }
-risc0-zkvm = { git = "https://github.com/risc0/risc0", tag="v1.0.1" }
+risc0-zkvm = { git = "https://github.com/risc0/risc0", tag = "v1.0.1" }
 halo2curves = { version = "0.6.0", default-features = false }
-halo2_backend = { git = "https://github.com/yetanotherco/yet-another-halo2-fork.git", branch = "feat/serde_constraint_system"}
+halo2_backend = { git = "https://github.com/yetanotherco/yet-another-halo2-fork.git", branch = "feat/serde_constraint_system" }
 halo2_proofs = { git = "https://github.com/yetanotherco/yet-another-halo2-fork.git", branch = "feat/serde_constraint_system" }
+aligned-batcher-lib = { path = "../aligned-batcher-lib" }
 lazy_static = "1.4.0"
 bincode = "1.3.3"
-aligned-batcher-lib = { path = "../aligned-batcher-lib"}
+base64 = "0.22.1"
+bs58 = "0.5.1"

batcher/aligned-batcher/Cargo.toml

@@ -34,14 +34,13 @@ mod config;
 mod eth;
 pub mod gnark;
 pub mod halo2;
+pub mod mina;
 pub mod risc_zero;
 pub mod s3;
 pub mod sp1;
 pub mod types;
 mod zk_utils;
 
-const S3_BUCKET_NAME: &str = "storage.alignedlayer.com";
-
 pub struct Batcher {
     s3_client: S3Client,
     eth_ws_provider: Provider<Ws>,
@@ -306,7 +305,7 @@ impl Batcher {
         {
             let mut last_uploaded_batch_block = self.last_uploaded_batch_block.lock().await;
             self.submit_batch(&batch_bytes, &batch_merkle_tree.root)
-                .await;
+                .await?;
             // update last uploaded batch block
             *last_uploaded_batch_block = block_number;
         }
@@ -341,26 +340,52 @@ impl Batcher {
     }
 
     /// Post batch to s3 and submit new task to Ethereum
-    async fn submit_batch(&self, batch_bytes: &[u8], batch_merkle_root: &[u8; 32]) {
+    async fn submit_batch(
+        &self,
+        batch_bytes: &[u8],
+        batch_merkle_root: &[u8; 32],
+    ) -> Result<(), BatcherError> {
+        let s3_bucket_name: String = std::env::var("AWS_BUCKET_NAME")
+            .map_err(|e| BatcherError::S3EnvVariableError("AWS_BUCKET_NAME".to_owned(), e))?;
+        let s3_bucket_name_is_domain = std::env::var("AWS_BUCKET_NAME_IS_DOMAIN").is_ok();
+
         let s3_client = self.s3_client.clone();
         let batch_merkle_root_hex = hex::encode(batch_merkle_root);
         info!("Batch merkle root: {}", batch_merkle_root_hex);
         let file_name = batch_merkle_root_hex.clone() + ".json";
 
         info!("Uploading batch to S3...");
-        s3::upload_object(&s3_client, S3_BUCKET_NAME, batch_bytes.to_vec(), &file_name)
-            .await
-            .expect("Failed to upload object to S3");
+        s3::upload_object(
+            &s3_client,
+            &s3_bucket_name,
+            batch_bytes.to_vec(),
+            &file_name,
+        )
+        .await
+        .expect("Failed to upload object to S3");
 
         info!("Batch sent to S3 with name: {}", file_name);
 
         info!("Uploading batch to contract");
         let service_manager = &self.service_manager;
-        let batch_data_pointer = "https://".to_owned() + S3_BUCKET_NAME + "/" + &file_name;
+
+        let batch_data_pointer = if s3_bucket_name_is_domain {
+            "https://".to_owned() + &s3_bucket_name + "/" + &file_name
+        } else {
+            let s3_region: String = std::env::var("AWS_REGION")
+                .map_err(|e| BatcherError::S3EnvVariableError("AWS_REGION".to_owned(), e))?;
+            "https://".to_owned()
+                + &s3_bucket_name
+                + ".s3."
+                + &s3_region
+                + ".amazonaws.com/"
+                + &file_name
+        };
         match eth::create_new_task(service_manager, *batch_merkle_root, batch_data_pointer).await {
             Ok(_) => info!("Batch verification task created on Aligned contract"),
             Err(e) => error!("Failed to create batch verification task: {}", e),
         }
+        Ok(())
     }
 }
 /// Await for the `BatchVerified` event emitted by the Aligned contract and then send responses.

batcher/aligned-batcher/src/lib.rs

@@ -0,0 +1,57 @@
+use base64::prelude::*;
+use log::{debug, warn};
+
+pub fn verify_protocol_state_proof_integrity(proof: &[u8], public_input: &[u8]) -> bool {
+    debug!("Reading Mina protocol state proof base64");
+    let protocol_state_proof_base64 =
+        if let Ok(protocol_state_proof_base64) = std::str::from_utf8(proof) {
+            protocol_state_proof_base64
+        } else {
+            return false;
+        };
+    debug!("Reading Mina protocol state hash base58");
+    let protocol_state_hash_base58 =
+        if let Ok(protocol_state_hash_base58) = std::str::from_utf8(public_input) {
+            protocol_state_hash_base58
+        } else {
+            return false;
+        };
+
+    debug!("Decoding Mina protocol state proof base64");
+    if BASE64_URL_SAFE
+        .decode(protocol_state_proof_base64.trim_end())
+        .is_err()
+    {
+        warn!("Failed to decode Mina protocol state proof base64");
+        return false;
+    }
+
+    debug!("Decoding Mina protocol state hash base58");
+    if bs58::decode(protocol_state_hash_base58.trim_end())
+        .into_vec()
+        .is_err()
+    {
+        warn!("Failed to decode Mina protocol state hash base58");
+        return false;
+    }
+
+    true
+}
+
+#[cfg(test)]
+mod test {
+    use super::verify_protocol_state_proof_integrity;
+
+    const PROTOCOL_STATE_PROOF_BYTES: &[u8] =
+        include_bytes!("../../../../batcher/aligned/test_files/mina/protocol_state_proof.proof");
+    const PROTOCOL_STATE_HASH_BYTES: &[u8] =
+        include_bytes!("../../../../batcher/aligned/test_files/mina/protocol_state_hash.pub");
+
+    #[test]
+    fn verify_protocol_state_proof_integrity_does_not_fail() {
+        assert!(verify_protocol_state_proof_integrity(
+            PROTOCOL_STATE_PROOF_BYTES,
+            PROTOCOL_STATE_HASH_BYTES,
+        ));
+    }
+}

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

@@ -1,11 +1,12 @@
-use std::fmt;
+use std::{env::VarError, fmt};
 
 use tokio_tungstenite::tungstenite;
 
 pub enum BatcherError {
     ConnectionError(tungstenite::Error),
     BatchVerifiedEventStreamError(String),
     EthereumSubscriptionError(String),
+    S3EnvVariableError(String, VarError),
 }
 
 impl From<tungstenite::Error> for BatcherError {
@@ -26,6 +27,9 @@ impl fmt::Debug for BatcherError {
             BatcherError::EthereumSubscriptionError(e) => {
                 write!(f, "Ethereum subscription was not successful: {}", e)
             }
+            BatcherError::S3EnvVariableError(v, e) => {
+                write!(f, "Error while fetching the {} env variable: {}", v, e)
+            }
         }
     }
 }

batcher/aligned-batcher/src/types/errors.rs

@@ -1,8 +1,8 @@
-use crate::gnark::verify_gnark;
 use crate::halo2::ipa::verify_halo2_ipa;
 use crate::halo2::kzg::verify_halo2_kzg;
 use crate::risc_zero::verify_risc_zero_proof;
 use crate::sp1::verify_sp1_proof;
+use crate::{gnark::verify_gnark, mina::verify_protocol_state_proof_integrity};
 use aligned_batcher_lib::types::{ProvingSystemId, VerificationData};
 use log::{debug, warn};
 
@@ -73,6 +73,15 @@ pub(crate) fn verify(verification_data: &VerificationData) -> bool {
             debug!("Gnark proof is valid: {}", is_valid);
             is_valid
         }
-        ProvingSystemId::Mina => todo!(),
+        ProvingSystemId::Mina => {
+            let pub_input = verification_data
+                .pub_input
+                .as_ref()
+                .expect("Public input is required");
+            verify_protocol_state_proof_integrity(&verification_data.proof, pub_input)
+            // TODO(xqft): add Pickles aggregator checks which are run alongside the Kimchi
+            // verifier. These checks are fast and if they aren't successful then the Pickles proof
+            // isn't valid.
+        }
     }
 }

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

@@ -387,7 +387,12 @@ fn verification_data_from_args(args: SubmitArgs) -> Result<VerificationData, Bat
                 args.pub_input_file_name,
             )?);
         }
-        ProvingSystemId::Mina => todo!(),
+        ProvingSystemId::Mina => {
+            pub_input = Some(read_file_option(
+                "--public_input",
+                args.pub_input_file_name,
+            )?)
+        }
     }
 
     let proof_generator_addr = Address::from_str(&args.proof_generator_addr).unwrap();

batcher/aligned/src/main.rs

@@ -0,0 +1 @@
+3NLAmT67BvsADswuJ6xpt3yNEVgmn5R8pkJTFvQtsZQD54aLhFmU

batcher/aligned/test_files/mina/bad_protocol_state_hash.pub

@@ -0,0 +1,2 @@
+cat mina_devnet_protocol_query.json | jq -r '.data.bestChain.[0].protocolState.previousStateHash' >protocol_state_hash.pub
+cat mina_devnet_protocol_query.json | jq -r '.data.block.protocolStateProof.base64' >protocol_state_proof.proof