Merge branch 'refs/heads/main' into 480-chore-implement-pausable-in-servicemanager

# Conflicts:
#	contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
#	contracts/src/core/AlignedLayerServiceManager.sol

Author: JuArce

.github/workflows/build.yml

@@ -6,7 +6,8 @@ on:
     branches: [main]
   pull_request:
     branches: ["*"]
-
+env:
+  FFI_FOR_RELEASE: false
 jobs:
   build:
     runs-on: ubuntu-latest

Makefile

@@ -3,6 +3,7 @@
 OS := $(shell uname -s)
 
 CONFIG_FILE?=config-files/config.yaml
+AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
 
 OPERATOR_VERSION=v0.1.6
 
@@ -14,6 +15,17 @@ ifeq ($(OS),Darwin)
 	BUILD_ALL_FFI = $(MAKE) build_all_ffi_macos
 endif
 
+
+FFI_FOR_RELEASE ?= true
+
+ifeq ($(FFI_FOR_RELEASE),true)
+	RELEASE_FLAG=--release
+	TARGET_REL_PATH=release
+else
+	RELEASE_FLAG=
+	TARGET_REL_PATH=debug
+endif
+
 help:
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
@@ -68,10 +80,9 @@ anvil_start_with_block_time:
 	@echo "Starting Anvil..."
 	anvil --load-state contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json --block-time 3
 
-# TODO: Allow enviroment variables / different configuration files
 aggregator_start:
 	@echo "Starting Aggregator..."
-	@go run aggregator/cmd/main.go --config $(CONFIG_FILE) \
+	@go run aggregator/cmd/main.go --config $(AGG_CONFIG_FILE) \
 	2>&1 | zap-pretty
 
 aggregator_send_dummy_responses:
@@ -164,10 +175,13 @@ __BATCHER__:
 
 BURST_SIZE=5
 
+batcher_fund_service_manager_balance:
+	@. ./scripts/fund_batcher_balance_in_aligned_devnet.sh
+
 ./batcher/aligned-batcher/.env:
 	@echo "To start the Batcher ./batcher/aligned-batcher/.env needs to be manually set"; false;
 
-batcher_start: ./batcher/aligned-batcher/.env
+batcher_start: ./batcher/aligned-batcher/.env batcher_fund_service_manager_balance
 	@echo "Starting Batcher..."
 	@cargo +nightly-2024-04-17 run --manifest-path ./batcher/aligned-batcher/Cargo.toml --release -- --config ./config-files/config.yaml --env-file ./batcher/aligned-batcher/.env
 
@@ -534,12 +548,12 @@ build_binaries:
 
 __SP1_FFI__: ##
 build_sp1_macos:
-	@cd operator/sp1/lib && cargo build --release
-	@cp operator/sp1/lib/target/release/libsp1_verifier_ffi.dylib operator/sp1/lib/libsp1_verifier.dylib
+	@cd operator/sp1/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.dylib operator/sp1/lib/libsp1_verifier.dylib
 
 build_sp1_linux:
-	@cd operator/sp1/lib && cargo build --release
-	@cp operator/sp1/lib/target/release/libsp1_verifier_ffi.so operator/sp1/lib/libsp1_verifier.so
+	@cd operator/sp1/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.so operator/sp1/lib/libsp1_verifier.so
 
 test_sp1_rust_ffi:
 	@echo "Testing SP1 Rust FFI source code..."
@@ -562,12 +576,12 @@ generate_sp1_fibonacci_proof:
 
 __RISC_ZERO_FFI__: ##
 build_risc_zero_macos:
-	@cd operator/risc_zero/lib && cargo build --release
-	@cp operator/risc_zero/lib/target/release/librisc_zero_verifier_ffi.dylib operator/risc_zero/lib/librisc_zero_verifier_ffi.dylib
+	@cd operator/risc_zero/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/risc_zero/lib/target/$(TARGET_REL_PATH)/librisc_zero_verifier_ffi.dylib operator/risc_zero/lib/librisc_zero_verifier_ffi.dylib
 
 build_risc_zero_linux:
-	@cd operator/risc_zero/lib && cargo build --release
-	@cp operator/risc_zero/lib/target/release/librisc_zero_verifier_ffi.so operator/risc_zero/lib/librisc_zero_verifier_ffi.so
+	@cd operator/risc_zero/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/risc_zero/lib/target/$(TARGET_REL_PATH)/librisc_zero_verifier_ffi.so operator/risc_zero/lib/librisc_zero_verifier_ffi.so
 
 test_risc_zero_rust_ffi:
 	@echo "Testing RISC Zero Rust FFI source code..."
@@ -588,14 +602,14 @@ generate_risc_zero_fibonacci_proof:
 
 __MERKLE_TREE_FFI__: ##
 build_merkle_tree_macos:
-	@cd operator/merkle_tree/lib && cargo build --release
-	@cp operator/merkle_tree/lib/target/release/libmerkle_tree.dylib operator/merkle_tree/lib/libmerkle_tree.dylib
-	@cp operator/merkle_tree/lib/target/release/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
+	@cd operator/merkle_tree/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.dylib operator/merkle_tree/lib/libmerkle_tree.dylib
+	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
 
 build_merkle_tree_linux:
-	@cd operator/merkle_tree/lib && cargo build --release
-	@cp operator/merkle_tree/lib/target/release/libmerkle_tree.so operator/merkle_tree/lib/libmerkle_tree.so
-	@cp operator/merkle_tree/lib/target/release/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
+	@cd operator/merkle_tree/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.so operator/merkle_tree/lib/libmerkle_tree.so
+	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
 
 test_merkle_tree_rust_ffi:
 	@echo "Testing Merkle Tree Rust FFI source code..."
@@ -611,14 +625,14 @@ test_merkle_tree_go_bindings_linux: build_merkle_tree_linux
 
 __HALO2_KZG_FFI__: ##
 build_halo2_kzg_macos:
-	@cd operator/halo2kzg/lib && cargo build --release
-	@cp operator/halo2kzg/lib/target/release/libhalo2kzg_verifier_ffi.dylib operator/halo2kzg/lib/libhalo2kzg_verifier.dylib
-	@cp operator/halo2kzg/lib/target/release/libhalo2kzg_verifier_ffi.a operator/halo2kzg/lib/libhalo2kzg_verifier.a
+	@cd operator/halo2kzg/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/halo2kzg/lib/target/$(TARGET_REL_PATH)/libhalo2kzg_verifier_ffi.dylib operator/halo2kzg/lib/libhalo2kzg_verifier.dylib
+	@cp operator/halo2kzg/lib/target/$(TARGET_REL_PATH)/libhalo2kzg_verifier_ffi.a operator/halo2kzg/lib/libhalo2kzg_verifier.a
 
 build_halo2_kzg_linux:
-	@cd operator/halo2kzg/lib && cargo build --release
-	@cp operator/halo2kzg/lib/target/release/libhalo2kzg_verifier_ffi.so operator/halo2kzg/lib/libhalo2kzg_verifier.so
-	@cp operator/halo2kzg/lib/target/release/libhalo2kzg_verifier_ffi.a operator/halo2kzg/lib/libhalo2kzg_verifier.a
+	@cd operator/halo2kzg/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/halo2kzg/lib/target/$(TARGET_REL_PATH)/libhalo2kzg_verifier_ffi.so operator/halo2kzg/lib/libhalo2kzg_verifier.so
+	@cp operator/halo2kzg/lib/target/$(TARGET_REL_PATH)/libhalo2kzg_verifier_ffi.a operator/halo2kzg/lib/libhalo2kzg_verifier.a
 
 test_halo2_kzg_rust_ffi:
 	@echo "Testing Halo2-KZG Rust FFI source code..."
@@ -642,14 +656,14 @@ generate_halo2_kzg_proof:
 
 __HALO2_IPA_FFI__: ##
 build_halo2_ipa_macos:
-	@cd operator/halo2ipa/lib && cargo build --release
-	@cp operator/halo2ipa/lib/target/release/libhalo2ipa_verifier_ffi.dylib operator/halo2ipa/lib/libhalo2ipa_verifier.dylib
-	@cp operator/halo2ipa/lib/target/release/libhalo2ipa_verifier_ffi.a operator/halo2ipa/lib/libhalo2ipa_verifier.a
+	@cd operator/halo2ipa/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/halo2ipa/lib/target/$(TARGET_REL_PATH)/libhalo2ipa_verifier_ffi.dylib operator/halo2ipa/lib/libhalo2ipa_verifier.dylib
+	@cp operator/halo2ipa/lib/target/$(TARGET_REL_PATH)/libhalo2ipa_verifier_ffi.a operator/halo2ipa/lib/libhalo2ipa_verifier.a
 
 build_halo2_ipa_linux:
-	@cd operator/halo2ipa/lib && cargo build --release
-	@cp operator/halo2ipa/lib/target/release/libhalo2ipa_verifier_ffi.so operator/halo2ipa/lib/libhalo2ipa_verifier.so
-	@cp operator/halo2ipa/lib/target/release/libhalo2ipa_verifier_ffi.a operator/halo2ipa/lib/libhalo2ipa_verifier.a
+	@cd operator/halo2ipa/lib && cargo build $(RELEASE_FLAG)
+	@cp operator/halo2ipa/lib/target/$(TARGET_REL_PATH)/libhalo2ipa_verifier_ffi.so operator/halo2ipa/lib/libhalo2ipa_verifier.so
+	@cp operator/halo2ipa/lib/target/$(TARGET_REL_PATH)/libhalo2ipa_verifier_ffi.a operator/halo2ipa/lib/libhalo2ipa_verifier.a
 
 test_halo2_ipa_rust_ffi:
 	@echo "Testing Halo2-KZG Rust FFI source code..."

batcher/aligned-batcher-lib/src/types/mod.rs

@@ -1,4 +1,3 @@
-use anyhow::anyhow;
 use ethers::types::Address;
 use lambdaworks_crypto::merkle_tree::{
     merkle::MerkleTree, proof::Proof, traits::IsMerkleTreeBackend,
@@ -130,19 +129,6 @@ impl BatchInclusionData {
     }
 }
 
-pub fn parse_proving_system(proving_system: &str) -> anyhow::Result<ProvingSystemId> {
-    match proving_system {
-        "GnarkPlonkBls12_381" => Ok(ProvingSystemId::GnarkPlonkBls12_381),
-        "GnarkPlonkBn254" => Ok(ProvingSystemId::GnarkPlonkBn254),
-        "Groth16Bn254" => Ok(ProvingSystemId::Groth16Bn254),
-        "SP1" => Ok(ProvingSystemId::SP1),
-        "Halo2IPA" => Ok(ProvingSystemId::Halo2IPA),
-        "Halo2KZG" => Ok(ProvingSystemId::Halo2KZG),
-        "Risc0" => Ok(ProvingSystemId::Risc0),
-        _ => Err(anyhow!("Invalid proving system: {}, Available proving systems are: [GnarkPlonkBls12_381, GnarkPlonkBn254, Groth16Bn254, SP1, Halo2KZG, Halo2IPA]", proving_system))
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

batcher/aligned/src/errors.rs

@@ -9,7 +9,6 @@ use ethers::signers::WalletError;
 pub enum BatcherClientError {
     MissingParameter(String),
     InvalidUrl(url::ParseError, String),
-    InvalidProvingSystem(String),
     ConnectionError(tokio_tungstenite::tungstenite::Error),
     IoError(PathBuf, io::Error),
     SerdeError(serde_json::Error),
@@ -57,9 +56,6 @@ impl fmt::Debug for BatcherClientError {
             BatcherClientError::InvalidUrl(err, url) => {
                 write!(f, "Invalid URL \"{}\", {}", url, err)
             }
-            BatcherClientError::InvalidProvingSystem(proving_system) => {
-                write!(f, "Invalid proving system: {}", proving_system)
-            }
             BatcherClientError::ConnectionError(e) => {
                 write!(f, "Web Socket Connection error: {}", e)
             }

batcher/aligned/src/main.rs

@@ -23,18 +23,16 @@ use tokio_tungstenite::connect_async;
 use tokio_tungstenite::tungstenite::Message;
 use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
 
-use aligned_batcher_lib::types::{
-    parse_proving_system, BatchInclusionData, ProvingSystemId, VerificationData,
-};
+use aligned_batcher_lib::types::{BatchInclusionData, ProvingSystemId, VerificationData};
 use clap::Subcommand;
 use ethers::utils::hex;
 use sha3::{Digest, Keccak256};
 
 use crate::errors::BatcherClientError;
 use crate::types::AlignedVerificationData;
+use crate::AlignedCommands::GetVerificationKeyCommitment;
 use crate::AlignedCommands::Submit;
 use crate::AlignedCommands::VerifyProofOnchain;
-use crate::AlignedCommands::GetVerificationKeyCommitment;
 
 use clap::{Parser, ValueEnum};
 
@@ -53,7 +51,10 @@ pub enum AlignedCommands {
     VerifyProofOnchain(VerifyProofOnchainArgs),
 
     // GetVericiationKey, command name is get-vk-commitment
-    #[clap(about = "Create verification key for proving system", name = "get-vk-commitment")]
+    #[clap(
+        about = "Create verification key for proving system",
+        name = "get-vk-commitment"
+    )]
     GetVerificationKeyCommitment(GetVerificationKeyCommitmentArgs),
 }
 
@@ -67,7 +68,7 @@ pub struct SubmitArgs {
     )]
     connect_addr: String,
     #[arg(name = "Proving system", long = "proving_system")]
-    proving_system_flag: String,
+    proving_system_flag: ProvingSystemArg,
     #[arg(name = "Proof file path", long = "proof")]
     proof_file_name: PathBuf,
     #[arg(name = "Public input file name", long = "public_input")]
@@ -130,6 +131,38 @@ pub enum Chain {
     Holesky,
 }
 
+#[derive(Debug, Clone, ValueEnum)]
+pub enum ProvingSystemArg {
+    #[clap(name = "GnarkPlonkBls12_381")]
+    GnarkPlonkBls12_381,
+    #[clap(name = "GnarkPlonkBn254")]
+    GnarkPlonkBn254,
+    #[clap(name = "Groth16Bn254")]
+    Groth16Bn254,
+    #[clap(name = "SP1")]
+    SP1,
+    #[clap(name = "Halo2KZG")]
+    Halo2KZG,
+    #[clap(name = "Halo2IPA")]
+    Halo2IPA,
+    #[clap(name = "Risc0")]
+    Risc0,
+}
+
+impl From<ProvingSystemArg> for ProvingSystemId {
+    fn from(proving_system: ProvingSystemArg) -> Self {
+        match proving_system {
+            ProvingSystemArg::GnarkPlonkBls12_381 => ProvingSystemId::GnarkPlonkBls12_381,
+            ProvingSystemArg::GnarkPlonkBn254 => ProvingSystemId::GnarkPlonkBn254,
+            ProvingSystemArg::Groth16Bn254 => ProvingSystemId::Groth16Bn254,
+            ProvingSystemArg::SP1 => ProvingSystemId::SP1,
+            ProvingSystemArg::Halo2KZG => ProvingSystemId::Halo2KZG,
+            ProvingSystemArg::Halo2IPA => ProvingSystemId::Halo2IPA,
+            ProvingSystemArg::Risc0 => ProvingSystemId::Risc0,
+        }
+    }
+}
+
 #[tokio::main]
 async fn main() -> Result<(), errors::BatcherClientError> {
     env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
@@ -324,8 +357,7 @@ async fn receive(
 }
 
 fn verification_data_from_args(args: SubmitArgs) -> Result<VerificationData, BatcherClientError> {
-    let proving_system = parse_proving_system(&args.proving_system_flag)
-        .map_err(|_| BatcherClientError::InvalidProvingSystem(args.proving_system_flag))?;
+    let proving_system = args.proving_system_flag.into();
 
     // Read proof file
     let proof = read_file(args.proof_file_name)?;

config-files/anvil.aggregator.bls.key.json

@@ -0,0 +1 @@
+{"pubKey":"E([2836088353050477845347925486470168020568465207212129112527815811278071168630,3160427639470623810295719163087493911148458124491004113623503371537041864385])","crypto":{"cipher":"aes-128-ctr","ciphertext":"208c421cf636f275a42ed905177703c5c33150a405dd9e1b2c7348976f85dcfe","cipherparams":{"iv":"ca35157d20418b2a5f3e08a6e36596fd"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"925af4285f14851f9d83eb7fc2c0ce7ca9f50aa77385519d994ee147f1410607"},"mac":"7e21f43562c4b4cd10b9fe5a149ce66ea17444167f788d6a02a67232d953c4e2"}}

config-files/anvil.aggregator.ecdsa.key.json

@@ -0,0 +1 @@
+{"address":"15d34aaf54267db7d7c367839aaf71a00a2c6a65","crypto":{"cipher":"aes-128-ctr","ciphertext":"c649f534580a3f0bf000b221afb0731052f7699298f618e79b2b99fd974c4b16","cipherparams":{"iv":"2fad203c48a2ae479673b17bf110a988"},"kdf":"scrypt","kdfparams":{"dklen":32,"n":262144,"p":1,"r":8,"salt":"72b1c2700f1cccebc468dafecf8de51f19c969389caae7e414c74d699a21c8c4"},"mac":"f093f9d47d3b9aa19be03f2bb9ae96b8c6da7ad0a7c7c0165bdbf84c54c9e26f"},"id":"f2925fb0-b209-4210-af6d-10c44b0e4a84","version":3}

config-files/config-aggregator.yaml

@@ -0,0 +1,51 @@
+# Common variables for all the services
+# 'production' only prints info and above. 'development' also prints debug
+environment: "production"
+aligned_layer_deployment_config_file_path: "./contracts/script/output/devnet/alignedlayer_deployment_output.json"
+eigen_layer_deployment_config_file_path: "./contracts/script/output/devnet/eigenlayer_deployment_output.json"
+eth_rpc_url: "http://localhost:8545"
+eth_ws_url: "ws://localhost:8545"
+eigen_metrics_ip_port_address: "localhost:9090"
+
+## ECDSA Configurations
+ecdsa:
+  private_key_store_path: "config-files/anvil.aggregator.ecdsa.key.json"
+  private_key_store_password: ""
+
+## BLS Configurations
+bls:
+  private_key_store_path: "config-files/anvil.aggregator.bls.key.json"
+  private_key_store_password: ""
+
+# ## Batcher configurations # batcher:
+#   block_interval: 3
+#   batch_size_interval: 10
+#   max_proof_size: 67108864 # 64 MiB
+#   max_batch_size: 268435456 # 256 MiB
+#   eth_ws_reconnects: 99999999999999
+#   pre_verification_is_enabled: true
+
+## Aggregator Configurations
+aggregator:
+  server_ip_port_address: localhost:8090
+  bls_public_key_compendium_address: 0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
+  avs_service_manager_address: 0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
+  enable_metrics: true
+  metrics_ip_port_address: localhost:9091
+## Operator Configurations
+# operator:
+#   aggregator_rpc_server_ip_port_address: localhost:8090
+#   address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+#   earnings_receiver_address: 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+#   delegation_approver_address: "0x0000000000000000000000000000000000000000"
+#   staker_opt_out_window_blocks: 0
+#   metadata_url: "https://yetanotherco.github.io/operator_metadata/metadata.json"
+#   enable_metrics: true
+#   metrics_ip_port_address: localhost:9092
+#   max_batch_size: 268435456 # 256 MiB
+# # Operators variables needed for register it in EigenLayer
+# el_delegation_manager_address: "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"
+# private_key_store_path: config-files/anvil.ecdsa.key.json
+# bls_private_key_store_path: config-files/anvil.bls.key.json
+# signer_type: local_keystore
+# chain_id: 31337

contracts/script/deploy/AlignedLayerDeployer.s.sol

@@ -119,7 +119,7 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
          * not yet deployed, we give these proxies an empty contract as the initial implementation, to act as if they have no code.
          */
         alignedLayerServiceManager = AlignedLayerServiceManager(
-            address(
+            payable(
                 new TransparentUpgradeableProxy(
                     address(emptyContract),
                     address(alignedLayerProxyAdmin),
@@ -355,7 +355,7 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
          * not yet deployed, we give these proxies an empty contract as the initial implementation, to act as if they have no code.
          */
         alignedLayerServiceManager = AlignedLayerServiceManager(
-            address(
+            payable(
                 new TransparentUpgradeableProxy(
                     address(emptyContract),
                     address(alignedLayerProxyAdmin),
@@ -720,7 +720,10 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
         );
     }
 
-    function _writeOutput(string memory config_data, string memory outputPath) internal {
+    function _writeOutput(
+        string memory config_data,
+        string memory outputPath
+    ) internal {
         string memory parent_object = "parent object";
 
         string memory deployed_addresses = "addresses";

contracts/script/upgrade/AlignedLayerUpgrader.s.sol

@@ -72,9 +72,11 @@ contract AlignedLayerUpgrader is Script {
 
         // alignedLayerServiceManager is the proxy
         AlignedLayerServiceManager alignedLayerServiceManager = AlignedLayerServiceManager(
-                stdJson.readAddress(
-                    aligned_deployment_file,
-                    ".addresses.alignedLayerServiceManager"
+                payable(
+                    stdJson.readAddress(
+                        aligned_deployment_file,
+                        ".addresses.alignedLayerServiceManager"
+                    )
                 )
             );