Merge branch 'refs/heads/staging' into fix/tree-openzeppelin-compliant

# Conflicts:
#	contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

Author: JuArce

.gitmodules

@@ -37,3 +37,6 @@
 [submodule "contracts/lib/risc0-ethereum"]
 	path = contracts/lib/risc0-ethereum
 	url = https://github.com/risc0/risc0-ethereum
+[submodule "contracts/eigenlayer_contracts/eigenlayer-contracts"]
+	path = contracts/eigenlayer_contracts/eigenlayer-contracts
+	url = https://github.com/Layr-Labs/eigenlayer-contracts.git

Makefile

@@ -8,7 +8,7 @@ export OPERATOR_ADDRESS ?= $(shell yq -r '.operator.address' $(CONFIG_FILE))
 AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
 
 OPERATOR_VERSION=v0.15.2
-EIGEN_SDK_GO_VERSION_DEVNET=v0.1.13
+EIGEN_SDK_GO_VERSION_DEVNET=v0.2.0-beta.1
 EIGEN_SDK_GO_VERSION_TESTNET=v0.2.0-beta.1
 EIGEN_SDK_GO_VERSION_MAINNET=v0.2.0-beta.1
 
@@ -73,7 +73,9 @@ install_foundry:
 	curl -L https://foundry.paradigm.xyz | bash
 
 install_eigenlayer_cli_devnet: ## Install Eigenlayer CLI v0.11.3 (Devnet compatible)
-	curl -sSfL https://raw.githubusercontent.com/layr-labs/eigenlayer-cli/master/scripts/install.sh | sh -s -- v0.11.3
+	curl -sSfL https://raw.githubusercontent.com/layr-labs/eigenlayer-cli/master/scripts/install.sh | sh -s -- v0.13.0
+
+anvil_deploy_all_contracts: anvil_deploy_eigen_contracts anvil_deploy_risc0_contracts anvil_deploy_sp1_contracts anvil_deploy_aligned_contracts
 
 anvil_deploy_eigen_contracts:
 	@echo "Deploying Eigen Contracts..."
@@ -346,7 +348,7 @@ operator_remove_from_whitelist:
 
 operator_deposit_into_mock_strategy:
 	@echo "Depositing into mock strategy"
-	$(eval STRATEGY_ADDRESS = $(shell jq -r '.addresses.strategies.MOCK' contracts/script/output/devnet/eigenlayer_deployment_output.json))
+	$(eval STRATEGY_ADDRESS = $(shell jq -r '.addresses.strategies.WETH' contracts/script/output/devnet/eigenlayer_deployment_output.json))
 	@go run operator/cmd/main.go deposit-into-strategy \
 		--config $(CONFIG_FILE) \
 		--strategy-address $(STRATEGY_ADDRESS) \

aggregation_mode/README.md

@@ -61,11 +61,11 @@ make start_proof_aggregator_gpu AGGREGATOR="sp1|risc0"
 1. Get latest aggregated proof:
 
 ```shell
-cast call 0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc "currentAggregatedProofNumber()" --rpc-url http://localhost:8545
+cast call 0xc351628EB244ec633d5f21fBD6621e1a683B1181 "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
+cast call 0xc351628EB244ec633d5f21fBD6621e1a683B1181 "getAggregatedProof(uint64)(uint8,bytes32,bytes32)" <AGG_PROOF_NUMBER>  --rpc-url http://localhost:8545
 ```

batcher/aligned-sdk/src/core/constants.rs

@@ -52,7 +52,7 @@ pub const BUMP_MAX_RETRY_DELAY: u64 = 3600; // seconds
 /// NETWORK ADDRESSES ///
 /// BatcherPaymentService
 pub const BATCHER_PAYMENT_SERVICE_ADDRESS_DEVNET: &str =
-    "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650";
+    "0x7969c5eD335650692Bc04293B07F5BF2e7A673C0";
 pub const BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY: &str =
     "0x815aeCA64a974297942D2Bbf034ABEe22a38A003";
 pub const BATCHER_PAYMENT_SERVICE_ADDRESS_HOLESKY_STAGE: &str =
@@ -63,7 +63,7 @@ pub const BATCHER_PAYMENT_SERVICE_ADDRESS_MAINNET_STAGE: &str =
     "0x88ad27EfBeF16b6fC5b2E40c5155d61876f847c5";
 
 /// AlignedServiceManager
-pub const ALIGNED_SERVICE_MANAGER_DEVNET: &str = "0x851356ae760d987E095750cCeb3bC6014560891C";
+pub const ALIGNED_SERVICE_MANAGER_DEVNET: &str = "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8";
 pub const ALIGNED_SERVICE_MANAGER_HOLESKY: &str = "0x58F280BeBE9B34c9939C3C39e0890C81f163B623";
 pub const ALIGNED_SERVICE_MANAGER_HOLESKY_STAGE: &str =
     "0x9C5231FC88059C086Ea95712d105A2026048c39B";
@@ -79,7 +79,7 @@ pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_HOLESKY_STAGE: &str =
 pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_HOLESKY: &str =
     "0xe84CD4084d8131841CE6DC265361f81F4C59a1d4";
 pub const ALIGNED_PROOF_AGG_SERVICE_ADDRESS_DEVNET: &str =
-    "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc";
+    "0xFD471836031dc5108809D173A067e8486B9047A3";
 
 /// Batcher URL's
 pub const BATCHER_URL_DEVNET: &str = "ws://localhost:8080";

config-files/config-proof-aggregator-mock.yaml

@@ -1,8 +1,8 @@
 eth_rpc_url: http://localhost:8545
 eth_ws_url: ws://localhost:8545
 max_proofs_in_queue: 1000
-proof_aggregation_service_address: 0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07
-aligned_service_manager_address: 0x851356ae760d987E095750cCeb3bC6014560891C
+proof_aggregation_service_address: 0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f
+aligned_service_manager_address: 0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8
 last_aggregated_block_filepath: config-files/proof-aggregator.last_aggregated_block.json
 ecdsa:
   private_key_store_path: config-files/anvil.proof-aggregator.ecdsa.key.json

config-files/config-proof-aggregator.yaml

@@ -1,5 +1,5 @@
-aligned_service_manager_address: "0x851356ae760d987E095750cCeb3bC6014560891C"
-proof_aggregation_service_address: "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc"
+aligned_service_manager_address: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
+proof_aggregation_service_address: "0xFD471836031dc5108809D173A067e8486B9047A3"
 eth_rpc_url: "http://localhost:8545"
 eth_ws_url: "ws://localhost:8545"
 max_proofs_in_queue: 1000

contracts/deployments/31337.json

@@ -1,5 +1,5 @@
 {
   "CREATE2_SALT": "0x0000000000000000000000000000000000000000000000000000000000000009",
-  "SP1_VERIFIER_GATEWAY_GROTH16": "0xB146FbFdFeC2a5182b3Cef9becE03290224256D5",
-  "V4_0_0_RC3_SP1_VERIFIER_GROTH16": "0x93a993C79738eA5D8836e42C6c422259684639Dc"
+  "SP1_VERIFIER_GATEWAY_GROTH16": "0x06530DD13aFB697B81E2d602a279EBAEC8Ca2E31",
+  "V4_0_0_RC3_SP1_VERIFIER_GROTH16": "0x14C66A76b06A414e62048c50e4d21B295ad2Cb0C"
 }

contracts/eigenlayer_contracts/README.md

@@ -0,0 +1,7 @@
+# README
+
+This directory contains the Eigenlayer contracts, version `v1.4.2`.
+
+These contracts are used in our Anvil deployment.
+
+As of this writing, they align with the Eigenlayer contracts deployed on Mainnet and Holesky Testnet.

contracts/eigenlayer_contracts/eigenlayer-contracts

@@ -9,3 +9,12 @@ fs_permissions = [
     { access = "read", path = "./script/deploy" },
     { access = "read-write", path = "./deployments" },
 ]
+
+# Enables or disables the optimizer
+optimizer = true
+# The number of optimizer runs
+optimizer_runs = 200
+# Whether or not to use the Yul intermediate representation compilation pipeline
+via_ir = true
+# Override the Solidity version (this overrides `auto_detect_solc`)
+solc_version = '0.8.27'