Merge branch 'staging' into feat/aggregate-proofs-in-chunks

Author: MarcosNicolau

Makefile

@@ -190,7 +190,6 @@ start_proof_aggregator_gpu: is_aggregator_set reset_last_aggregated_block ## Sta
 start_proof_aggregator_gpu_ethereum_package: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated in ethereum package
 	AGGREGATOR=$(AGGREGATOR) SP1_PROVER=cuda cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove,gpu --bin proof_aggregator -- config-files/config-proof-aggregator-ethereum-package.yaml
 
-
 verify_aggregated_proof_sp1_holesky_stage: 
 	@echo "Verifying SP1 in aggregated proofs on holesky..."
 	@cd batcher/aligned/ && \

aggregation_mode/src/backend/fetcher.rs

@@ -11,7 +11,7 @@ use crate::{
     },
     backend::s3::get_aligned_batch_from_s3,
 };
-use aligned_sdk::core::types::ProvingSystemId;
+use aligned_sdk::common::types::ProvingSystemId;
 use alloy::{
     primitives::Address,
     providers::{Provider, ProviderBuilder},

aggregation_mode/src/backend/s3.rs

@@ -1,4 +1,4 @@
-use aligned_sdk::core::types::VerificationData;
+use aligned_sdk::common::types::VerificationData;
 
 #[derive(Debug)]
 #[allow(dead_code)]

batcher/aligned-batcher/src/config/mod.rs

@@ -93,9 +93,9 @@ impl ContractDeploymentOutput {
 }
 
 fn default_aggregator_fee_percentage_multiplier() -> u128 {
-    aligned_sdk::core::constants::DEFAULT_AGGREGATOR_FEE_PERCENTAGE_MULTIPLIER
+    aligned_sdk::common::constants::DEFAULT_AGGREGATOR_FEE_PERCENTAGE_MULTIPLIER
 }
 
 fn default_aggregator_gas_cost() -> u128 {
-    aligned_sdk::core::constants::DEFAULT_AGGREGATOR_GAS_COST
+    aligned_sdk::common::constants::DEFAULT_AGGREGATOR_GAS_COST
 }

batcher/aligned-batcher/src/connection.rs

@@ -2,8 +2,8 @@ use std::sync::Arc;
 
 use crate::types::{batch_queue::BatchQueueEntry, errors::BatcherError};
 use aligned_sdk::{
+    common::types::{BatchInclusionData, SubmitProofResponseMessage, VerificationCommitmentBatch},
     communication::serialization::cbor_serialize,
-    core::types::{BatchInclusionData, SubmitProofResponseMessage, VerificationCommitmentBatch},
 };
 use futures_util::{stream::SplitSink, SinkExt};
 use lambdaworks_crypto::merkle_tree::merkle::MerkleTree;

batcher/aligned-batcher/src/eth/utils.rs

@@ -8,7 +8,7 @@ use crate::{
         retry_function,
     },
 };
-use aligned_sdk::core::constants::{
+use aligned_sdk::common::constants::{
     ETHEREUM_CALL_BACKOFF_FACTOR, ETHEREUM_CALL_MAX_RETRIES, ETHEREUM_CALL_MAX_RETRY_DELAY,
     ETHEREUM_CALL_MIN_RETRY_DELAY, GAS_PRICE_INCREMENT_PERCENTAGE_PER_ITERATION,
     OVERRIDE_GAS_PRICE_PERCENTAGE_MULTIPLIER, PERCENTAGE_DIVIDER,

batcher/aligned-batcher/src/gnark/mod.rs

@@ -1,4 +1,4 @@
-use aligned_sdk::core::types::ProvingSystemId;
+use aligned_sdk::common::types::ProvingSystemId;
 
 #[derive(Copy, Clone, Debug)]
 #[repr(C)]

batcher/aligned-batcher/src/lib.rs

@@ -23,15 +23,15 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use std::time::Duration;
 
-use aligned_sdk::core::constants::{
+use aligned_sdk::common::constants::{
     ADDITIONAL_SUBMISSION_GAS_COST_PER_PROOF, BATCHER_SUBMISSION_BASE_GAS_COST,
     BUMP_BACKOFF_FACTOR, BUMP_MAX_RETRIES, BUMP_MAX_RETRY_DELAY, BUMP_MIN_RETRY_DELAY,
     CBOR_ARRAY_MAX_OVERHEAD, CONNECTION_TIMEOUT, DEFAULT_MAX_FEE_PER_PROOF,
     ETHEREUM_CALL_BACKOFF_FACTOR, ETHEREUM_CALL_MAX_RETRIES, ETHEREUM_CALL_MAX_RETRY_DELAY,
     ETHEREUM_CALL_MIN_RETRY_DELAY, GAS_PRICE_PERCENTAGE_MULTIPLIER, PERCENTAGE_DIVIDER,
     RESPOND_TO_TASK_FEE_LIMIT_PERCENTAGE_MULTIPLIER,
 };
-use aligned_sdk::core::types::{
+use aligned_sdk::common::types::{
     ClientMessage, GetNonceResponseMessage, NoncedVerificationData, ProofInvalidReason,
     ProvingSystemId, SubmitProofMessage, SubmitProofResponseMessage, VerificationCommitmentBatch,
     VerificationData, VerificationDataCommitment,

batcher/aligned-batcher/src/types/batch_queue.rs

@@ -1,9 +1,9 @@
 use aligned_sdk::{
-    communication::serialization::cbor_serialize,
-    core::{
+    common::{
         constants::CBOR_ARRAY_MAX_OVERHEAD,
         types::{NoncedVerificationData, VerificationDataCommitment},
     },
+    communication::serialization::cbor_serialize,
 };
 use ethers::types::{Address, Signature, U256};
 use priority_queue::PriorityQueue;
@@ -214,9 +214,9 @@ fn calculate_fee_per_proof(batch_len: usize, gas_price: U256, constant_gas_cost:
 
 #[cfg(test)]
 mod test {
-    use aligned_sdk::core::constants::DEFAULT_CONSTANT_GAS_COST;
-    use aligned_sdk::core::types::ProvingSystemId;
-    use aligned_sdk::core::types::VerificationData;
+    use aligned_sdk::common::constants::DEFAULT_CONSTANT_GAS_COST;
+    use aligned_sdk::common::types::ProvingSystemId;
+    use aligned_sdk::common::types::VerificationData;
     use ethers::types::Address;
 
     use super::*;

batcher/aligned-batcher/src/zk_utils/mod.rs

@@ -1,7 +1,7 @@
 use crate::gnark::verify_gnark;
 use crate::risc_zero::verify_risc_zero_proof;
 use crate::sp1::verify_sp1_proof;
-use aligned_sdk::core::types::{ProvingSystemId, VerificationData};
+use aligned_sdk::common::types::{ProvingSystemId, VerificationData};
 use ethers::types::U256;
 use log::{debug, warn};
 
@@ -72,7 +72,7 @@ pub(crate) fn is_verifier_disabled(
 #[cfg(test)]
 mod test {
     use super::is_verifier_disabled;
-    use aligned_sdk::core::types::{ProvingSystemId, VerificationData};
+    use aligned_sdk::common::types::{ProvingSystemId, VerificationData};
     use ethers::types::Address;
 
     fn get_all_verifiers() -> Vec<ProvingSystemId> {