fix(ethereum_package): fix localnet/devnet on Ethereum package (#1937)

Author: JuArce

Makefile

@@ -178,9 +178,19 @@ start_proof_aggregator_dev: is_aggregator_set reset_last_aggregated_block ## Sta
 start_proof_aggregator: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated
 	AGGREGATOR=$(AGGREGATOR) cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove --bin proof_aggregator -- config-files/config-proof-aggregator.yaml
 
+start_proof_aggregator_dev_ethereum_package: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with mock proofs (DEV mode) in ethereum package
+	AGGREGATOR=$(AGGREGATOR) RISC0_DEV_MODE=1 cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --bin proof_aggregator -- config-files/config-proof-aggregator-mock-ethereum-package.yaml
+
+start_proof_aggregator_ethereum_package: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving activated in ethereum package
+	AGGREGATOR=$(AGGREGATOR) cargo run --manifest-path ./aggregation_mode/Cargo.toml --release --features prove --bin proof_aggregator -- config-files/config-proof-aggregator-ethereum-package.yaml
+
 start_proof_aggregator_gpu: is_aggregator_set reset_last_aggregated_block ## Starts proof aggregator with proving + GPU acceleration (CUDA)
 	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.yaml
 
+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/ && \
@@ -1319,6 +1329,7 @@ ethereum_package_inspect: ## Prints detailed information about the net
 
 ethereum_package_rm: ## Stops and removes the ethereum_package environment and used resources
 	kurtosis enclave rm aligned -f
+	kurtosis engine stop
 
 batcher_start_ethereum_package: user_fund_payment_service
 	@echo "Starting Batcher..."
@@ -1329,11 +1340,11 @@ aggregator_start_ethereum_package:
 	$(MAKE) aggregator_start AGG_CONFIG_FILE=config-files/config-aggregator-ethereum-package.yaml
 
 operator_start_ethereum_package:
-	$(MAKE) operator_start OPERATOR_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8 CONFIG_FILE=config-files/config-operator-1-ethereum-package.yaml
+	$(MAKE) operator_start ENVIRONMENT=devnet OPERATOR_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8 CONFIG_FILE=config-files/config-operator-1-ethereum-package.yaml
 
 operator_register_start_ethereum_package:
-	$(MAKE) operator_full_registration OPERATOR_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8 CONFIG_FILE=config-files/config-operator-1-ethereum-package.yaml \
-	$(MAKE) operator_start OPERATOR_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8 CONFIG_FILE=config-files/config-operator-1-ethereum-package.yaml
+	$(MAKE) operator_full_registration OPERATOR_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8 CONFIG_FILE=config-files/config-operator-1-ethereum-package.yaml
+	$(MAKE) operator_start ENVIRONMENT=devnet OPERATOR_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8 CONFIG_FILE=config-files/config-operator-1-ethereum-package.yaml
 
 
 install_spamoor: ## Instal spamoor to spam transactions

config-files/config-aggregator-ethereum-package.yaml

@@ -4,9 +4,9 @@ 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_rpc_url_fallback: "http://localhost:8550"
+eth_rpc_url_fallback: "http://localhost:8552"
 eth_ws_url: "ws://localhost:8546"
-eth_ws_url_fallback: "ws://localhost:8551"
+eth_ws_url_fallback: "ws://localhost:8553"
 eigen_metrics_ip_port_address: "localhost:9090"
 
 ## ECDSA Configurations
@@ -27,9 +27,9 @@ aggregator:
   enable_metrics: true
   metrics_ip_port_address: localhost:9091
   telemetry_ip_port_address: localhost:4001
-  garbage_collector_period: 2m #The period of the GC process. Suggested value for Prod: '168h' (7 days)
-  garbage_collector_tasks_age: 20 #The age of tasks that will be removed by the GC, in blocks. Suggested value for prod: '216000' (30 days)
-  garbage_collector_tasks_interval: 10 #The interval of queried blocks to get an old batch. Suggested value for prod: '900' (3 hours)
+  garbage_collector_period: 30m #The period of the GC process. Suggested value for Prod: '168h' (7 days)
+  garbage_collector_tasks_age: 300 #The age of tasks that will be removed by the GC, in blocks. Suggested value for prod: '216000' (30 days)
+  garbage_collector_tasks_interval: 300 #The interval of queried blocks to get an old batch. Suggested value for prod: '900' (3 hours)
   bls_service_task_timeout: 168h # The timeout of bls aggregation service tasks. Suggested value for prod '168h' (7 days)
   gas_base_bump_percentage: 10 # How much to bump gas price when responding to task. Suggested value 10%
   gas_bump_incremental_percentage: 2 # An extra percentage to bump every retry i*2 when responding to task. Suggested value 2%

config-files/config-batcher-ethereum-package.yaml

@@ -4,9 +4,9 @@ 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_rpc_url_fallback: "http://localhost:8550"
+eth_rpc_url_fallback: "http://localhost:8552"
 eth_ws_url: "ws://localhost:8546"
-eth_ws_url_fallback: "ws://localhost:8551"
+eth_ws_url_fallback: "ws://localhost:8553"
 eigen_metrics_ip_port_address: "localhost:9090"
 
 ## ECDSA Configurations

config-files/config-operator-1-ethereum-package.yaml

@@ -3,10 +3,10 @@
 environment: 'development'
 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_rpc_url_fallback: 'http://localhost:8550'
-eth_ws_url: 'ws://localhost:8546'
-eth_ws_url_fallback: 'ws://localhost:8551'
+eth_rpc_url: "http://localhost:8545"
+eth_rpc_url_fallback: "http://localhost:8552"
+eth_ws_url: "ws://localhost:8546"
+eth_ws_url_fallback: "ws://localhost:8553"
 eigen_metrics_ip_port_address: 'localhost:9090'
 
 ## ECDSA Configurations

config-files/config-proof-aggregator-ethereum-package.yaml

@@ -0,0 +1,10 @@
+aligned_service_manager_address: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
+proof_aggregation_service_address: "0xFD471836031dc5108809D173A067e8486B9047A3"
+eth_rpc_url: "http://localhost:8545"
+eth_ws_url: "ws://localhost:8546"
+max_proofs_in_queue: 1000
+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"
+  private_key_store_password: ""

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

@@ -0,0 +1,10 @@
+aligned_service_manager_address: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
+proof_aggregation_service_address: "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f"
+eth_rpc_url: "http://localhost:8545"
+eth_ws_url: "ws://localhost:8546"
+max_proofs_in_queue: 1000
+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"
+  private_key_store_password: ""

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

@@ -1,9 +1,10 @@
-eth_rpc_url: http://localhost:8545
-eth_ws_url: ws://localhost:8545
+aligned_service_manager_address: "0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8"
+proof_aggregation_service_address: "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f"
+eth_rpc_url: "http://localhost:8545"
+eth_ws_url: "ws://localhost:8545"
 max_proofs_in_queue: 1000
-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
-  private_key_store_password: ''
+  private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"
+  private_key_store_password: ""

config-files/config-proof-aggregator.yaml

@@ -6,5 +6,5 @@ max_proofs_in_queue: 1000
 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"
-    private_key_store_password: ""
+  private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"
+  private_key_store_password: ""

explorer/.env.dev

@@ -16,7 +16,7 @@ DB_HOST=localhost
 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>"
+BEACON_CLIENT="http://127.0.0.1:58801"
 
 # Debug
 DEBUG_ERRORS=true

explorer/mix.lock

@@ -24,7 +24,7 @@
   "floki": {:hex, :floki, "0.36.2", "a7da0193538c93f937714a6704369711998a51a6164a222d710ebd54020aa7a3", [:mix], [], "hexpm", "a8766c0bc92f074e5cb36c4f9961982eda84c5d2b8e979ca67f5c268ec8ed580"},
   "gettext": {:hex, :gettext, "0.24.0", "6f4d90ac5f3111673cbefc4ebee96fe5f37a114861ab8c7b7d5b30a1108ce6d8", [:mix], [{:expo, "~> 0.5.1", [hex: :expo, repo: "hexpm", optional: false]}], "hexpm", "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b"},
   "hackney": {:hex, :hackney, "1.20.1", "8d97aec62ddddd757d128bfd1df6c5861093419f8f7a4223823537bad5d064e2", [:rebar3], [{:certifi, "~> 2.12.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~> 6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~> 1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~> 1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~> 1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"},
-  "heroicons": {:git, "https://github.com/tailwindlabs/heroicons.git", "88ab3a0d790e6a47404cba02800a6b25d2afae50", [tag: "v2.1.1", sparse: "optimized", depth: 1]},
+  "heroicons": {:git, "https://github.com/tailwindlabs/heroicons.git", "88ab3a0d790e6a47404cba02800a6b25d2afae50", [tag: "v2.1.1", sparse: "optimized"]},
   "hpax": {:hex, :hpax, "0.2.0", "5a58219adcb75977b2edce5eb22051de9362f08236220c9e859a47111c194ff5", [:mix], [], "hexpm", "bea06558cdae85bed075e6c036993d43cd54d447f76d8190a8db0dc5893fa2f1"},
   "httpoison": {:hex, :httpoison, "2.2.1", "87b7ed6d95db0389f7df02779644171d7319d319178f6680438167d7b69b1f3d", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "51364e6d2f429d80e14fe4b5f8e39719cacd03eb3f9a9286e61e216feac2d2df"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},