chore: update ethereum package config

Author: JuArce

Makefile

@@ -1319,6 +1319,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 +1330,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:8551"
 eth_ws_url: "ws://localhost:8546"
-eth_ws_url_fallback: "ws://localhost:8551"
+eth_ws_url_fallback: "ws://localhost:8552"
 eigen_metrics_ip_port_address: "localhost:9090"
 
 ## ECDSA Configurations

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:8551"
 eth_ws_url: "ws://localhost:8546"
-eth_ws_url_fallback: "ws://localhost:8551"
+eth_ws_url_fallback: "ws://localhost:8552"
 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:8551"
+eth_ws_url: "ws://localhost:8546"
+eth_ws_url_fallback: "ws://localhost:8552"
 eigen_metrics_ip_port_address: 'localhost:9090'
 
 ## ECDSA Configurations

network_params.yaml

@@ -1,24 +1,25 @@
 participants:
-  - el_type: geth
+  - el_type: reth
     cl_type: lighthouse
     count: 2
     validator_count: 32
 
 ethereum_metrics_exporter_enabled: true
 
 additional_services:
-  - assertoor
+  - blockscout
   - dora
+  - assertoor
   - prometheus_grafana
 
 port_publisher:
   el:
     enabled: true
-    public_port_start: 8543
+    public_port_start: 8542
 
 ethereum_genesis_generator_params:
   # The image to use for ethereum genesis generator
-  image: ethpandaops/ethereum-genesis-generator:4.1.0
+  image: ethpandaops/ethereum-genesis-generator:4.1.1
 
 # Default configuration parameters for the network
 network_params:
@@ -32,8 +33,9 @@ network_params:
 
   # How long you want the network to wait before starting up
   genesis_delay: 20
+
   # The gas limit of the network set at genesis
-  genesis_gaslimit: 30000000
+  genesis_gaslimit: 36000000
 
   # The number of data column sidecar subnets used in the gossipsub protocol
   data_column_sidecar_subnet_count: 128
@@ -43,7 +45,8 @@ network_params:
   custody_requirement: 4
   # Maximum number of blobs per block
   #  max_blobs_per_block: 6
-  preset: "mainnet"
+
+  preset: "minimal"
   devnet_repo: ethpandaops
 
   # Prefunded Accounts

scripts/fund_operator_devnet.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [[ -z "$RPC_URL" ]]; then
+  echo "RPC_URL is empty, using default value http://localhost:8545"
+  RPC_URL="http://localhost:8545"
+fi;
+
 # Check that OPERATOR_ADDRESS is not empty
 if [[ -z "$OPERATOR_ADDRESS" ]]; then
   echo "OPERATOR_ADDRESS is empty, using default value 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
@@ -22,6 +27,6 @@ amount_in_eth="1ether"
 cast send --from $sender_address \
     --value $amount_in_eth \
     --private-key $sender_private_key \
-    --rpc-url "http://localhost:8545" \
+    --rpc-url $RPC_URL \
     "$recipient_address" \
-    --gas-price $(cast gas-price --rpc-url "http://localhost:8545")
+    --gas-price $(cast gas-price --rpc-url "$RPC_URL")

scripts/mint_mock_token.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [[ -z "$RPC_URL" ]]; then
+  echo "RPC_URL is empty, using default value http://localhost:8545"
+  RPC_URL="http://localhost:8545"
+fi;
+
 # check that OPERATOR_ADDRESS is not empty
 if [[ -z "$OPERATOR_ADDRESS" ]]; then
   echo "OPERATOR_ADDRESS is empty, using default value 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
@@ -13,7 +18,7 @@ if [[ "$#" -ne 2 ]]; then
 fi;
 
 mock_strategy_address=$(cat "contracts/script/output/devnet/eigenlayer_deployment_output.json" | jq -r '.addresses.strategies.WETH')
-mock_token_address=$(cast call "$mock_strategy_address" "underlyingToken()")
+mock_token_address=$(cast call "$mock_strategy_address" "underlyingToken()" --rpc-url "$RPC_URL")
 
 operator_address=$(cat "$1" | yq -r '.operator.address')
 
@@ -49,4 +54,4 @@ cast send "$mock_token_address" \
     "transfer(address recipient, uint256 amount)(bool)" \
     "$operator_address" "$2" \
     --private-key $private_key \
-    --rpc-url "http://localhost:8545"
+    --rpc-url $RPC_URL

scripts/user_fund_payment_service_devnet.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [[ -z "$RPC_URL" ]]; then
+  echo "RPC_URL is empty, using default value http://localhost:8545"
+  RPC_URL="http://localhost:8545"
+fi;
+
 # Check that OPERATOR_ADDRESS is not empty
 if [[ -z "$USER_ADDRESS" ]]; then
   echo "USER_ADDRESS is empty, using default value 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
@@ -18,6 +23,6 @@ amount_in_eth="100ether"
 cast send --from $USER_ADDRESS \
     --value $amount_in_eth \
     --private-key $USER_PRIVATE_KEY \
-    --rpc-url "http://localhost:8545" \
+    --rpc-url $RPC_URL \
     "$batcher_payment_service_address" \
-    --gas-price $(cast gas-price --rpc-url "http://localhost:8545")
+    --gas-price $(cast gas-price --rpc-url "$RPC_URL")