fix merge

Author: MarcosNicolau

aggregation_mode/README.md

@@ -5,8 +5,7 @@ use super::{
     types::{AlignedLayerServiceManager, AlignedLayerServiceManagerContract, RPCProvider},
 };
 use crate::{
-    aggregators::{sp1_aggregator::SP1ProofWithPubValuesAndElf, AlignedProof},
-    backend::s3::get_aligned_batch_from_s3,
+    aggregators::{sp1_aggregator::SP1ProofWithPubValuesAndElf, AlignedProof}, backend::s3::get_aligned_batch_from_s3
 };
 use aligned_sdk::core::types::ProvingSystemId;
 use alloy::{
@@ -89,10 +88,7 @@ impl ProofsFetcher {
                     ProvingSystemId::SP1 => {
                         let elf = p.vm_program_code?;
                         let proof_with_pub_values = bincode::deserialize(&p.proof).ok()?;
-                        let sp1_proof = SP1ProofWithPubValuesAndElf {
-                            proof_with_pub_values,
-                            elf,
-                        };
+                        let sp1_proof = SP1ProofWithPubValuesAndElf { proof_with_pub_values, elf };
 
                         Some(AlignedProof::SP1(sp1_proof))
                     }

aggregation_mode/readme.md

@@ -11,11 +11,11 @@ use crate::aggregators::{
 };
 
 use alloy::{
-    consensus::BlobTransactionSidecar,
+    consensus::{BlobTransactionSidecar},
     eips::eip4844::BYTES_PER_BLOB,
     hex,
     network::EthereumWallet,
-    primitives::Address,
+    primitives::{Address},
     providers::{PendingTransactionError, ProviderBuilder},
     rpc::types::TransactionReceipt,
     signers::local::LocalSigner,

aggregation_mode/src/backend/fetcher.rs

@@ -6,7 +6,7 @@ pub enum GetBatchProofsError {
     Deserialization,
     EmptyBody,
     StatusFailed,
-    ReqwestClientFailed,
+    ReqwestClientFailed
 }
 
 // needed to make S3 bucket work
@@ -16,13 +16,11 @@ pub async fn get_aligned_batch_from_s3(
     url: String,
 ) -> Result<Vec<VerificationData>, GetBatchProofsError> {
     let client = reqwest::Client::builder()
-        .user_agent(DEFAULT_USER_AGENT)
-        .build()
-        .map_err(|_| GetBatchProofsError::ReqwestClientFailed)?;
+    .user_agent(DEFAULT_USER_AGENT)
+    .build()
+    .map_err(|_| GetBatchProofsError::ReqwestClientFailed)?;
 
-    let response = client
-        .get(url)
-        .send()
+    let response = client.get(url).send()
         .await
         .map_err(|_| GetBatchProofsError::Fetching)?;
     if !response.status().is_success() {

aggregation_mode/src/backend/mod.rs

@@ -5,4 +5,3 @@ eigenlayer-scripts/=lib/eigenlayer-middleware/lib/eigenlayer-contracts/script/
 forge-std/=lib/forge-std/src/
 @openzeppelin/contracts/=lib/eigenlayer-middleware/lib/openzeppelin-contracts/contracts/
 @openzeppelin-upgrades/contracts/=lib/eigenlayer-middleware/lib/openzeppelin-contracts-upgradeable/contracts/
-@sp1-contracts/=lib/sp1-contracts/contracts/src/ 

aggregation_mode/src/backend/s3.rs

@@ -49,17 +49,15 @@ contract AlignedProofAggregationService is
         bytes32 blobVersionedHash,
         //bytes32 sp1ProgramVKey,
         bytes calldata sp1PublicValues
-    )
         //bytes calldata sp1ProofBytes
-        public
-        onlyAlignedAggregator
-    {
+    ) public onlyAlignedAggregator {
         // In dev mode, poofs are mocked, so we skip the verification part
         if (sp1VerifierAddress == VERIFIER_MOCK_ADDRESS) {
             (bytes32 merkleRoot) = abi.decode(sp1PublicValues, (bytes32));
             _newAggregatedProof(merkleRoot, blobVersionedHash);
             return;
         }
+
     }
 
     function markCurrentAggregatedProofAsMissed() public onlyAlignedAggregator {

contracts/remappings.txt

@@ -32,9 +32,8 @@ interface IAlignedProofAggregationService {
         bytes32 blobVersionedHash,
         //bytes32 sp1ProgramVKey,
         bytes calldata sp1PublicValues
-    )
         //bytes calldata sp1ProofBytes
-        external;
+    ) external;
 
     function getAggregatedProof(uint64 proofNumber)
         external