Merge branch 'refs/heads/feat/aggregation-mode' into integrate-sp1-into-aggregation-mode

# Conflicts:
#	Makefile

Author: JuArce

Makefile

@@ -154,11 +154,11 @@ anvil_start_with_block_time_with_more_prefunded_accounts:
 	@echo "Starting Anvil..."
 	anvil --load-state contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json --block-time 7 -a 2000
 
-__AGGREGATION_MODE__:
-start_proof_aggregator_local:
+__AGGREGATION_MODE__: ## ____
+start_proof_aggregator_local: ## Start the proof aggregator locally using Mock Verifier Contract
 	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release -- config-files/config-proof-aggregator-mock.yaml
 
-start_proof_aggregator_local_with_proving:
+start_proof_aggregator_local_with_proving: ## Start the proof aggregator locally using SP1 Verifier Contract
 	cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove -- config-files/config-proof-aggregator.yaml
 
 _AGGREGATOR_:

aggregation_mode/Cargo.lock

@@ -12,7 +12,7 @@ serde_json = "1.0.117"
 serde_yaml = "0.9"
 tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.3.0", features = ["env-filter"] }
-alloy = { version = "0.11", features = ["default", "signer-keystore"] }
+alloy = { version = "0.11", features = ["default", "signer-keystore", "kzg"] }
 c-kzg = "1.0.3"
 bincode = "1.3.3"
 tokio = { version = "1", features = ["time"]}
@@ -27,7 +27,6 @@ sp1-build = { version = "4.1.3" }
 
 [profile.release]
 opt-level = 3
-lto = true
 
 [features]
 prove = []

aggregation_mode/Cargo.toml

@@ -29,11 +29,11 @@ pub struct ProofsFetcher {
 
 impl ProofsFetcher {
     pub fn new(config: &Config) -> Self {
-        let rpc_url = config.eth_rpc_url.parse().expect("correct url");
+        let rpc_url = config.eth_rpc_url.parse().expect("RPC URL should be valid");
         let rpc_provider = ProviderBuilder::new().on_http(rpc_url);
         let aligned_service_manager = AlignedLayerServiceManager::new(
             Address::from_str(&config.aligned_service_manager_address)
-                .expect("Address to be correct"),
+                .expect("AlignedProofAggregationService address should be valid"),
             rpc_provider.clone(),
         );
 

aggregation_mode/readme.md aggregation_mode/README.mdaggregation_mode/readme.md renamed to aggregation_mode/README.md

@@ -11,11 +11,11 @@ use crate::aggregators::{
 };
 
 use alloy::{
-    consensus::{Blob, BlobTransactionSidecar},
+    consensus::{BlobTransactionSidecar},
     eips::eip4844::BYTES_PER_BLOB,
     hex,
     network::EthereumWallet,
-    primitives::{Address, FixedBytes},
+    primitives::{Address},
     providers::{PendingTransactionError, ProviderBuilder},
     rpc::types::TransactionReceipt,
     signers::local::LocalSigner,
@@ -47,17 +47,17 @@ pub struct ProofAggregator {
 
 impl ProofAggregator {
     pub fn new(config: &Config) -> Self {
-        let rpc_url = config.eth_rpc_url.parse().expect("correct url");
+        let rpc_url = config.eth_rpc_url.parse().expect("RPC URL should be valid");
         let signer = LocalSigner::decrypt_keystore(
             config.ecdsa.private_key_store_path.clone(),
             config.ecdsa.private_key_store_password.clone(),
         )
-        .expect("Correct keystore signer");
+        .expect("Keystore signer should be `cast wallet` compliant");
         let wallet = EthereumWallet::from(signer);
         let rpc_provider = ProviderBuilder::new().wallet(wallet).on_http(rpc_url);
-        let proof_aggregation_service: AlignedProofAggregationService::AlignedProofAggregationServiceInstance<(), alloy::providers::fillers::FillProvider<alloy::providers::fillers::JoinFill<alloy::providers::fillers::JoinFill<alloy::providers::Identity, alloy::providers::fillers::JoinFill<alloy::providers::fillers::GasFiller, alloy::providers::fillers::JoinFill<alloy::providers::fillers::BlobGasFiller, alloy::providers::fillers::JoinFill<alloy::providers::fillers::NonceFiller, alloy::providers::fillers::ChainIdFiller>>>>, alloy::providers::fillers::WalletFiller<EthereumWallet>>, alloy::providers::RootProvider>> = AlignedProofAggregationService::new(
+        let proof_aggregation_service = AlignedProofAggregationService::new(
             Address::from_str(&config.proof_aggregation_service_address)
-                .expect("Address to be correct"),
+                .expect("AlignedProofAggregationService address should be valid"),
             rpc_provider,
         );
         let fetcher = ProofsFetcher::new(config);
@@ -207,12 +207,11 @@ impl ProofAggregator {
             c_kzg::KzgProof::compute_blob_kzg_proof(&blob, &commitment.to_bytes(), settings)
                 .map_err(|_| AggregatedProofSubmissionError::BuildingBlobProof)?;
 
-        // convert to alloy types
-        let blob = Blob::from_slice(&blob_data);
-        let commitment: FixedBytes<48> = FixedBytes::from_slice(commitment.to_bytes().as_slice());
-        let proof: FixedBytes<48> = FixedBytes::from_slice(proof.to_bytes().as_slice());
-
-        let blob = BlobTransactionSidecar::new(vec![blob], vec![commitment], vec![proof]);
+        let blob = BlobTransactionSidecar::from_kzg(
+            vec![blob],
+            vec![commitment.to_bytes()],
+            vec![proof.to_bytes()],
+        );
         let blob_versioned_hash = blob
             .versioned_hash_for_blob(0)
             .ok_or(AggregatedProofSubmissionError::BuildingBlobVersionedHash)?