diff --git a/.tool-versions b/.tool-versions index 35db714..2f8c687 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,9 +1,9 @@ age 1.1.1 helm 3.12.1 -shellcheck 0.9.0 sops 3.7.3 terraform 1.6.4 -python 3.12.3 +shellcheck 0.10.0 +python 3.12.4 ansible-lint 6.17.2 awscli 2.13.7 -yq 4.35.2 \ No newline at end of file +yq 4.35.2 diff --git a/ansible/cleanup_ethereum.yaml b/ansible/cleanup_ethereum.yaml index a3b4586..074ae48 100644 --- a/ansible/cleanup_ethereum.yaml +++ b/ansible/cleanup_ethereum.yaml @@ -34,6 +34,7 @@ - "nethermind" - "reth" - "execution" + - "execution-init" - "reth" # Consensus layer clients - "lighthouse-validator" diff --git a/ansible/inventories/devnet-0/group_vars/all/all.yaml b/ansible/inventories/devnet-0/group_vars/all/all.yaml index 5fc6909..f041c1e 100644 --- a/ansible/inventories/devnet-0/group_vars/all/all.yaml +++ b/ansible/inventories/devnet-0/group_vars/all/all.yaml @@ -56,7 +56,7 @@ ethereum_genesis_generator_config_files: export NUMBER_OF_VALIDATORS=200 export DENEB_FORK_VERSION="0x50{{ ethereum_genesis_fork_version_suffix }}" export ELECTRA_FORK_VERSION="0x60{{ ethereum_genesis_fork_version_suffix }}" - export ELECTRA_FORK_EPOCH="5" + export ELECTRA_FORK_EPOCH="999999" export EIP7594_FORK_VERSION="0x70{{ ethereum_genesis_fork_version_suffix }}" export EIP7594_FORK_EPOCH="999999" export GENESIS_TIMESTAMP={{ ethereum_genesis_timestamp }} @@ -127,9 +127,9 @@ xatu_sentry_config_network_name_override: "{{ ethereum_network_name }}" ethereum_metrics_exporter_container_image: "{{ default_tooling_images.ethereum_metrics_exporter }}" # role: eth_testnet_config -eth_testnet_config_dir: /data/ethereum-network-config +eth_testnet_config_dir: /data/ethereum-network-config/metadata eth_testnet_config_local_dir_enabled: true -eth_testnet_config_local_dir_src: "{{ ethereum_genesis_generator_output_dir }}/" +eth_testnet_config_local_dir_src: "{{ ethereum_genesis_generator_output_dir }}/metadata/" # role: gen_basic_auth_nginx gen_basic_auth_nginx_name: "{{ secret_nginx_shared_basic_auth.name }}" diff --git a/ansible/inventories/devnet-0/group_vars/all/images.yaml b/ansible/inventories/devnet-0/group_vars/all/images.yaml index 2d998cf..10ec4dd 100644 --- a/ansible/inventories/devnet-0/group_vars/all/images.yaml +++ b/ansible/inventories/devnet-0/group_vars/all/images.yaml @@ -34,7 +34,7 @@ default_tooling_images: blobscan_indexer: blossomlabs/blobscan-indexer:latest dora: ethpandaops/dora:master dugtrio: ethpandaops/dugtrio:latest - ethereum_genesis_generator: ethpandaops/ethereum-genesis-generator:3.2.1 + ethereum_genesis_generator: ethpandaops/ethereum-genesis-generator:3.3.3 mev_boost: flashbots/mev-boost:latest mev_relay: flashbots/mev-boost-relay:latest mev_builder: flashbots/mev-builder:latest \ No newline at end of file diff --git a/ansible/inventories/devnet-0/group_vars/lighthouse.yaml b/ansible/inventories/devnet-0/group_vars/lighthouse.yaml index 00156d7..e90915a 100644 --- a/ansible/inventories/devnet-0/group_vars/lighthouse.yaml +++ b/ansible/inventories/devnet-0/group_vars/lighthouse.yaml @@ -46,6 +46,5 @@ lighthouse_validator_container_volumes: lighthouse_validator_container_command_extra_args: - --testnet-dir=/network-config - --graffiti={{ ansible_hostname }} - - --produce-block-v3 lighthouse_validator_datadir: /data/lighthouse-validator lighthouse_container_pull: true diff --git a/ansible/inventories/devnet-0/group_vars/lodestar.yaml b/ansible/inventories/devnet-0/group_vars/lodestar.yaml index 9e75075..6c62121 100644 --- a/ansible/inventories/devnet-0/group_vars/lodestar.yaml +++ b/ansible/inventories/devnet-0/group_vars/lodestar.yaml @@ -47,6 +47,5 @@ lodestar_validator_container_volumes: lodestar_validator_container_command_extra_args: - --paramsFile=/network-config/config.yaml - --graffiti={{ ansible_hostname }} - - --useProduceBlockV3 lodestar_validator_datadir: /data/lodestar-validator lodestar_container_pull: true diff --git a/requirements.txt b/requirements.txt index 082c29c..89faaf0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ -ansible-lint==6.17.2 -ansible==8.2.0 -netaddr==0.8.0 -pip==23.3.1 -PyYAML==6.0.1 -passlib==1.7.4 +ansible-lint==24.6.0 +ansible==10.1.0 +molecule-containers==2.0.0 +molecule==24.6.0 +netaddr==1.3.0 +pip==24.0 +requests==2.31 # Fix for not being able to run 'molecule test' using docker on mac. Issue: https://github.com/docker/docker-py/issues/3256 \ No newline at end of file