feat: send proof to aligned and wait for agg proof verification event

Author: MarcosNicolau

examples/L2/crates/l2/Cargo.toml

@@ -10,7 +10,7 @@ types = { workspace = true }
 lambdaworks-crypto = { workspace = true }
 primitive-types = { workspace = true}
 rand = "0.8"
-sp1-sdk = "4.1.3"
+sp1-sdk = "4.1.7"
 sp1_state_transition_program = { path = "./zkvm_programs/sp1/" }
 aligned-sdk = { path = "../../../../batcher/aligned-sdk" }
 bincode = "1.3.3"
@@ -19,7 +19,7 @@ tokio = "1.44"
 alloy = { version = "0.14", features = ["full", "providers"] }
 
 [build-dependencies]
-sp1-build = { version = "4.1.3" } 
+sp1-build = { version = "4.1.7" } 
 
 [profile.release]
 opt-level = 3

examples/L2/crates/l2/src/aligned.rs

@@ -1,8 +1,15 @@
-use aligned_sdk::core::{
-    constants::INSTANT_MAX_FEE_BATCH_SIZE,
-    types::{AlignedVerificationData, Signer, SigningKey, VerificationData, Wallet},
+use aligned_sdk::{
+    core::types::{AlignedVerificationData, Signer, SigningKey, VerificationData, Wallet},
+    sdk::estimate_fee,
 };
-use primitive_types::U256;
+use alloy::{
+    eips::BlockNumberOrTag,
+    primitives::Address,
+    providers::{Provider, ProviderBuilder, WsConnect},
+    rpc::types::Filter,
+};
+use futures_util::StreamExt;
+use sp1_sdk::{HashableKey, SP1VerifyingKey};
 
 pub async fn send_proof_to_be_verified_on_aligned(
     proof: &sp1_sdk::SP1ProofWithPublicValues,
@@ -25,41 +32,62 @@ pub async fn send_proof_to_be_verified_on_aligned(
         .await
         .expect("Retrieve nonce from aligned batcher");
 
-    let aligned_verification_data = aligned_sdk::sdk::submit(
-        network,
-        &verification_data,
-        U256::from(INSTANT_MAX_FEE_BATCH_SIZE as u64),
-        wallet,
-        nonce,
+    let max_fee = estimate_fee(
+        "https://ethereum-holesky-rpc.publicnode.com".into(),
+        aligned_sdk::core::types::FeeEstimationType::Instant,
     )
     .await
-    .expect("Proof to be sent");
+    .expect("Max fee to be retrieved");
+
+    let aligned_verification_data =
+        aligned_sdk::sdk::submit(network, &verification_data, max_fee, wallet, 0.into())
+            .await
+            .expect("Proof to be sent");
 
     aligned_verification_data
 }
 
-pub async fn wait_until_proof_is_aggregated() -> u64 {
-    // let rpc_url = "wss://eth-mainnet.g.alchemy.com/v2/your-api-key";
-    // let ws = WsConnect::new(rpc_url);
-    // let provider = ProviderBuilder::new().on_ws(ws).await.unwrap();
+pub async fn wait_until_proof_is_aggregated(
+    network: aligned_sdk::core::types::Network,
+    eth_rpc_url: String,
+    beacon_client_url: String,
+    proof: &sp1_sdk::SP1ProofWithPublicValues,
+    vk: &SP1VerifyingKey,
+) -> Option<Vec<[u8; 32]>> {
+    let rpc_url = "";
+    let ws = WsConnect::new(rpc_url);
+    let provider = ProviderBuilder::new().on_ws(ws).await.unwrap();
+
+    let aligned_proof_agg_address =
+        Address::from(network.get_aligned_proof_agg_service_address().0);
+
+    let filter = Filter::new()
+        .address(aligned_proof_agg_address)
+        .event("AggregatedProofVerified(bytes32,bytes32)")
+        .from_block(BlockNumberOrTag::Latest);
 
-    // let uniswap_token_address =
-    //     Address::from_str("1f9840a85d5aF5bf1D1762F925BDADdC4201F984").unwrap();
+    // Subscribe to logs.
+    let sub = provider.subscribe_logs(&filter).await.unwrap();
+    let mut stream = sub.into_stream();
 
-    // let filter = Filter::new()
-    //     .address(uniswap_token_address)
-    //     // By specifying an `event` or `event_signature` we listen for a specific event of the
-    //     // contract. In this case the `Transfer(address,address,uint256)` event.
-    //     .event("Transfer(address,address,uint256)")
-    //     .from_block(BlockNumberOrTag::Latest);
+    let verification_data = aligned_sdk::sdk::aggregation::AggregationModeVerificationData::SP1 {
+        vk: vk.hash_bytes(),
+        public_inputs: proof.public_values.to_vec(),
+    };
 
-    // // Subscribe to logs.
-    // let sub = provider.subscribe_logs(&filter).await.unwrap();
-    // let mut stream = sub.into_stream();
+    let mut merkle_path = None;
 
-    // while let Some(log) = stream.next().await {
-    //     println!("Uniswap token logs: {log:?}");
-    // }
+    while let Some(_) = stream.next().await {
+        merkle_path = aligned_sdk::sdk::aggregation::get_merkle_path_for_proof(
+            network.clone(),
+            eth_rpc_url.clone(),
+            beacon_client_url.clone(),
+            None,
+            &verification_data,
+        )
+        .await
+        .unwrap();
+    }
 
-    0
+    merkle_path
 }

examples/L2/crates/l2/src/lib.rs

@@ -1,5 +1,4 @@
 use aligned::{send_proof_to_be_verified_on_aligned, wait_until_proof_is_aggregated};
-use alloy::hex;
 use db::{generate_random_transfers, DB};
 use primitive_types::U256;
 use sp1_state_transition_program::ProgramOutput;
@@ -9,10 +8,10 @@ mod aligned;
 mod db;
 mod zk;
 
-async fn send_state_transition_to_chain() {}
-
 pub async fn start_l2(
     network: aligned_sdk::core::types::Network,
+    eth_rpc_url: String,
+    beacon_client_url: String,
     wallet: aligned_sdk::core::types::Wallet<aligned_sdk::core::types::SigningKey>,
 ) {
     // 0. Load merkle tree file, if not created, create initial state
@@ -22,7 +21,7 @@ pub async fn start_l2(
     let transfers = generate_random_transfers(&db, 10);
 
     // 2. Call zkvm and pass (MerkleTree, Updates to perform)
-    let (mut proof, _vk) = prove_state_transition(&db, transfers.clone());
+    let (mut proof, vk) = prove_state_transition(&db, transfers.clone());
     let ProgramOutput {
         initial_state_merkle_root,
         post_state_merkle_root,
@@ -58,10 +57,18 @@ pub async fn start_l2(
 
     // 4. Send the proof to aligned and wait for verification
     let _ =
-        send_proof_to_be_verified_on_aligned(&proof, PROGRAM_ELF.to_vec(), network, wallet).await;
+        send_proof_to_be_verified_on_aligned(&proof, PROGRAM_ELF.to_vec(), network.clone(), wallet)
+            .await;
 
     // 5. Wait until proof is aggregated
-    wait_until_proof_is_aggregated().await;
+    let merkle_path = wait_until_proof_is_aggregated(
+        network.clone(),
+        eth_rpc_url,
+        beacon_client_url,
+        &proof,
+        &vk,
+    )
+    .await;
 
     // 6. Send updateState transaction to Ethereum
     // let receipt = update_state_on_chain();

examples/L2/crates/l2/src/zk.rs

@@ -21,7 +21,7 @@ pub fn prove_state_transition(
     let (pk, vk) = prover.setup(PROGRAM_ELF);
     let proof = prover
         .prove(&pk, &stdin)
-        .groth16()
+        .compressed()
         .run()
         .expect("Prover to run fine");
 

examples/L2/crates/l2/zkvm_programs/sp1/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 resolver = "2"
 
 [dependencies]
-sp1-zkvm = { version = "4.1.3", features = ["verify"] }
+sp1-zkvm = { version = "4.1.7", features = ["verify"] }
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
 primitive-types = { version = "0.12.0", features = ["serde"] }