refactor: update l2 example to use the new agg mode sdk

Author: MarcosNicolau

examples/l2/Cargo.lock

@@ -6,13 +6,12 @@ __CONFIG__:
 gen_devnet_owner_wallet:
 	rm -f ./contract-owner.keystore.json
 	cast wallet import -k . contract-owner.keystore.json --private-key 0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a --unsafe-password "<!w5Y%In94Vw"
-	@echo "Funding on Aligned" 
-	cd ../../crates/cli/ && \
-	cargo run --release -- deposit-to-batcher \
-	 --amount 0.01ether \
-	 --private_key 0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a \
+	@echo "Funding on Aligned"
+	cd ../../aggregation_mode/cli/ && \
+	cargo run --release -- deposit \
+	 --private-key 0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a \
 	 --network devnet \
-	 --rpc_url http://localhost:8545
+	 --rpc-url http://localhost:8545
 
 gen_env_l2_holesky:
 	@cp .env.holesky .env

examples/l2/Makefile

@@ -12,7 +12,7 @@ bincode = "1.3.3"
 tokio = "1.44"
 dotenv = "0.15"
 l2 = { path = "../crates/l2/" }
-aligned-sdk = { path = "../../../crates/sdk" }
+agg_mode_sdk = { path = "../../../aggregation_mode/sdk" }
 
 [lib]
 name = "l2_cmd"

examples/l2/cmd/Cargo.toml

@@ -1,18 +1,16 @@
 use std::env;
 
-use aligned_sdk::common::types::Network;
+use agg_mode_sdk::types::Network;
 use dotenv::dotenv;
 use l2::config::Config;
 
 pub fn load_config() -> Config {
     dotenv().ok();
 
     let network = match env::var("NETWORK").expect("NETWORK not set").as_str() {
-        "holesky" => Network::Holesky,
-        "holesky-stage" => Network::HoleskyStage,
         "devnet" => Network::Devnet,
         "hoodi" => Network::Hoodi,
-        _ => panic!("Invalid network, possible values are: holesky, holesky-stage, hoodi, devnet"),
+        _ => panic!("Invalid network, possible values are: hoodi, devnet"),
     };
 
     let config = Config {

examples/l2/cmd/utils.rs

@@ -14,7 +14,7 @@ tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
 rand = "0.8"
 sp1-sdk = "5.0.0"
 sp1_state_transition_program = { path = "./zkvm_programs/sp1" }
-aligned-sdk = { path = "../../../../crates/sdk" }
+agg_mode_sdk = { path = "../../../../aggregation_mode/sdk" }
 bincode = "1.3.3"
 futures-util = "0.3"
 tokio = "1.44"

examples/l2/crates/l2/Cargo.toml

@@ -1,5 +1,7 @@
+use agg_mode_sdk::types::Network;
+
 pub struct Config {
-    pub network: aligned_sdk::common::types::Network,
+    pub network: Network,
     pub eth_rpc_url: String,
     pub ws_eth_rpc_url: String,
     pub beacon_client_url: String,

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

@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use aligned_sdk::aggregation_layer::AggregationModeProvingSystem;
+use agg_mode_sdk::blockchain::AggregationModeProvingSystem;
 use alloy::{
     network::EthereumWallet, primitives::Address, providers::ProviderBuilder,
     rpc::types::TransactionReceipt, signers::local::LocalSigner, sol,

examples/l2/crates/l2/src/config.rs

@@ -1,25 +1,48 @@
-use crate::aligned::{check_proof_proof_aggregation_status, send_proof_to_be_verified_on_aligned};
 use crate::config::Config;
 use crate::db::{generate_random_transfers, DB};
 use crate::eth::send_state_transition_to_chain;
 use crate::prover::{self, prove_state_transition, PROGRAM_ELF};
+use agg_mode_sdk::blockchain::provider::ProofAggregationServiceProvider;
+use agg_mode_sdk::blockchain::{AggregationModeVerificationData, ProofStatus};
+use agg_mode_sdk::gateway::provider::AggregationModeGatewayProvider;
 use alloy::hex;
+use alloy::signers::k256::ecdsa::SigningKey;
+use alloy::signers::local::LocalSigner;
 use primitive_types::U256;
-use sp1_sdk::SP1ProofWithPublicValues;
+use sp1_sdk::{HashableKey, SP1ProofWithPublicValues};
 use sp1_state_transition_program::ProgramOutput;
 use tracing::info;
 
 pub struct L2 {
+    aligned_agg_mode_gateway_provider: AggregationModeGatewayProvider<LocalSigner<SigningKey>>,
+    aligned_proof_agg_service: ProofAggregationServiceProvider,
     config: Config,
     db: DB,
 }
 
 impl L2 {
     pub fn new(config: Config) -> Self {
         let db_path = config.db_path.clone().unwrap_or("./db".to_string());
+        let signer = LocalSigner::decrypt_keystore(
+            config.private_key_store_path.clone(),
+            config.private_key_store_password.clone(),
+        )
+        .expect("failed to parse private key: {e}");
+
+        let gatewat_provider =
+            AggregationModeGatewayProvider::new_with_signer(config.network.clone(), signer)
+                .expect("to build gateway provider");
+
+        let proof_agg_service = ProofAggregationServiceProvider::new(
+            config.network.clone(),
+            config.eth_rpc_url.clone(),
+            config.beacon_client_url.clone(),
+        );
 
         Self {
             config,
+            aligned_agg_mode_gateway_provider: gatewat_provider,
+            aligned_proof_agg_service: proof_agg_service,
             db: DB::new(db_path),
         }
     }
@@ -32,7 +55,7 @@ impl L2 {
 
         // 2. Call zkvm and transfer to perform and verify
         info!("Starting prover...");
-        let (mut proof, _vk) = prove_state_transition(&self.db, transfers.clone());
+        let (mut proof, vk) = prove_state_transition(&self.db, transfers.clone());
         let ProgramOutput {
             initial_state_merkle_root,
             post_state_merkle_root,
@@ -71,10 +94,13 @@ impl L2 {
         // Once aligned aggregates the proof we will be notified and we'll send the new state commitment on chain
 
         // 4. Send the proof to aligned and wait for verification
-        info!("Sending proof to aligned batcher...");
-        let _ =
-            send_proof_to_be_verified_on_aligned(&self.config, &proof, PROGRAM_ELF.to_vec()).await;
-        info!("Proof submitted");
+        info!("Sending proof to aligned gateway...");
+        let res = self
+            .aligned_agg_mode_gateway_provider
+            .submit_sp1_proof(&proof, &vk)
+            .await
+            .expect("Failed to send proof to aggregation mode gateway: {e}");
+        info!("Response from gateway: {:?}", res);
 
         self.db.save().unwrap();
 
@@ -85,9 +111,20 @@ impl L2 {
         let vk = prover::vk_from_elf(PROGRAM_ELF);
         // 5. Check if proof has been aggregated
         info!("Checking if proof has been aggregated in the last 24 hours...");
-        let proof_status = check_proof_proof_aggregation_status(&self.config, &proof, &vk).await;
+        let proof_status = self
+            .aligned_proof_agg_service
+            .check_proof_verification(
+                None,
+                AggregationModeVerificationData::SP1 {
+                    vk: vk.hash_bytes(),
+                    public_inputs: proof.public_values.to_vec(),
+                },
+            )
+            .await
+            .expect("To be able to check proof status {e}");
+
         let merkle_path = match proof_status {
-            aligned_sdk::aggregation_layer::ProofStatus::Verified {
+            ProofStatus::Verified {
                 merkle_root,
                 merkle_path,
             } => {
@@ -97,10 +134,10 @@ impl L2 {
                 );
                 merkle_path
             }
-            aligned_sdk::aggregation_layer::ProofStatus::Invalid => {
+            ProofStatus::Invalid => {
                 panic!("Proof did pass merkle root verification");
             }
-            aligned_sdk::aggregation_layer::ProofStatus::NotFound => {
+            ProofStatus::NotFound => {
                 panic!("Proof not found in the last 24 hours logs");
             }
         };

examples/l2/crates/l2/src/eth.rs

@@ -1,4 +1,3 @@
-mod aligned;
 pub mod config;
 mod db;
 mod eth;