Merge 6831ab4 into 43a1084

Author: MarcosNicolau

aggregation_mode/readme.md

@@ -0,0 +1,57 @@
+
+# Aligned aggregation mode
+
+## How to run it locally
+
+1. Deploy aligned contracts on anvil:
+
+```shell
+make deploy_aligned_contracts
+```
+
+2. Start anvil:
+
+```shell
+make anvil_start_with_block_time
+```
+
+3. Start batcher
+
+```shell
+make start_batcher_local
+```
+
+4. Send SP1 proofs:
+
+```shell
+make batcher_send_sp1_burst
+```
+
+5. Start proof aggregator:
+
+```shell
+# This will not run a real prover but a mocked one see below to run a real prover
+make start_proof_aggregator_local
+```
+
+or
+
+```shell
+make start_proof_aggregator_local_with_proving
+```
+
+Note: Proving can be quite slow without GPUs
+
+### Check the logs
+
+1. Get latest aggregated proof:
+
+```shell
+cast call 0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc "currentAggregatedProofNumber()" --rpc-url http://localhost:8545
+```
+
+2. Get aggregated proof info:
+
+```shell
+cast call 0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc "getAggregatedProof(uint64)(uint8,bytes32,bytes32)" <AGG_PROOF_NUMBER>  --rpc-url http://localhost:8545
+```

aggregation_mode/src/backend/fetcher.rs

@@ -5,7 +5,8 @@ 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::{
@@ -88,7 +89,10 @@ 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/src/backend/mod.rs

@@ -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/s3.rs

@@ -6,7 +6,7 @@ pub enum GetBatchProofsError {
     Deserialization,
     EmptyBody,
     StatusFailed,
-    ReqwestClientFailed
+    ReqwestClientFailed,
 }
 
 // needed to make S3 bucket work
@@ -16,11 +16,13 @@ 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() {

contracts/remappings.txt

@@ -5,3 +5,4 @@ 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/ 

contracts/src/core/AlignedProofAggregationService.sol

@@ -49,15 +49,17 @@ 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/src/core/IAlignedProofAggregationService.sol

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

explorer/.env.dev

@@ -14,6 +14,9 @@ DB_HOST=localhost
 
 # Config file
 ALIGNED_CONFIG_FILE="../contracts/script/output/devnet/alignedlayer_deployment_output.json"
+ALIGNED_PROOF_AGG_CONFIG_FILE="../contracts/script/output/devnet/proof_aggregation_service_deployment_output.json"
+## Don't use public nodes as blob data can be retrieved from them
+BEACON_CLIENT="<beacon_client_url>"
 
 # Debug
 DEBUG_ERRORS=true

explorer/.env.example

@@ -14,6 +14,9 @@ DB_HOST=<db_host>
 
 # Config file
 ALIGNED_CONFIG_FILE="<aligned_config_file>"
+ALIGNED_PROOF_AGG_CONFIG_FILE="<proof_aggregation_config_file>"
+## Don't use public nodes as blob data can be retrieved from them
+BEACON_CLIENT="<beacon_client_url>"
 
 # Debug
 DEBUG_ERRORS=<true|false>

explorer/ecto_setup_db.sh

@@ -10,6 +10,8 @@ export DB_USER=$DB_USER
 export DB_PASS=$DB_PASS
 export DB_HOST=$DB_HOST
 export ALIGNED_CONFIG_FILE=$ALIGNED_CONFIG_FILE
+export ALIGNED_PROOF_AGG_CONFIG_FILE=$ALIGNED_PROOF_AGG_CONFIG_FILE
+export BEACON_CLIENT=$BEACON_CLIENT
 
 mix deps.get