Merge pull request #4 from ethpandaops/bbusa/metadata

chore: bump tools, update images
ethpandaops · Jun 21, 2024 · 3b9db01 · 3b9db01
2 parents fdf41eb + d19aad0
commit 3b9db01
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 11 deletions.
diff --git 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.11.4
+shellcheck 0.10.0
+python 3.12.4
 ansible-lint 6.17.2
 awscli 2.13.7
 yq 4.35.2
diff --git a/ansible/cleanup_ethereum.yaml b/ansible/cleanup_ethereum.yaml
@@ -33,6 +33,8 @@
             - "geth"
             - "nethermind"
             - "execution"
+            - "execution-init"
+            - "reth"
             # Consensus layer clients
             - "lighthouse-validator"
             - "lighthouse"
@@ -43,6 +45,7 @@
             - "prysm"
             - "teku-validator"
             - "teku"
+            - "grandine"
             - "beacon"
             - "validator"
             # Others
@@ -61,6 +64,7 @@
             - /data/ethereumjs
             - /data/geth
             - /data/nethermind
+            - /data/reth
             # Consensus layer data
             - /data/lighthouse
             - /data/lighthouse-validator
@@ -72,6 +76,8 @@
             - /data/prysm-validator
             - /data/teku
             - /data/teku-validator
+            - /data/grandine
+            - /data/grandine-validator
             # Config files
             - /data/ethereum-network-config
             - /data/execution-auth.secret

diff --git a/ansible/inventories/devnet-0/group_vars/all/all.yaml b/ansible/inventories/devnet-0/group_vars/all/all.yaml
@@ -148,9 +148,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
@@ -34,4 +34,4 @@ default_tooling_images:
   blobscan_indexer: blossomlabs/blobscan-indexer:latest
   dora: ethpandaops/dora:peer-das-latest
   dugtrio: ethpandaops/dugtrio:latest
-  ethereum_genesis_generator: ethpandaops/ethereum-genesis-generator:3.1.6
+  ethereum_genesis_generator: ethpandaops/ethereum-genesis-generator:3.3.3
diff --git a/network-configs/devnet-0/besu.json → network-configs/devnet-0/metadata/besu.json b/network-configs/devnet-0/besu.json → network-configs/devnet-0/metadata/besu.json
diff --git a/network-configs/devnet-0/boot_enr.txt → ...rk-configs/devnet-0/metadata/boot_enr.txt b/network-configs/devnet-0/boot_enr.txt → ...rk-configs/devnet-0/metadata/boot_enr.txt
diff --git a/network-configs/devnet-0/boot_enr.yaml → ...k-configs/devnet-0/metadata/boot_enr.yaml b/network-configs/devnet-0/boot_enr.yaml → ...k-configs/devnet-0/metadata/boot_enr.yaml
diff --git a/network-configs/devnet-0/bootnode.txt → ...rk-configs/devnet-0/metadata/bootnode.txt b/network-configs/devnet-0/bootnode.txt → ...rk-configs/devnet-0/metadata/bootnode.txt
diff --git a/network-configs/devnet-0/bootstrap_nodes.txt → ...igs/devnet-0/metadata/bootstrap_nodes.txt b/network-configs/devnet-0/bootstrap_nodes.txt → ...igs/devnet-0/metadata/bootstrap_nodes.txt
diff --git a/network-configs/devnet-0/chainspec.json → ...-configs/devnet-0/metadata/chainspec.json b/network-configs/devnet-0/chainspec.json → ...-configs/devnet-0/metadata/chainspec.json
diff --git a/network-configs/devnet-0/config.yaml → ...ork-configs/devnet-0/metadata/config.yaml b/network-configs/devnet-0/config.yaml → ...ork-configs/devnet-0/metadata/config.yaml
diff --git a/network-configs/devnet-0/deploy_block.txt → ...onfigs/devnet-0/metadata/deploy_block.txt b/network-configs/devnet-0/deploy_block.txt → ...onfigs/devnet-0/metadata/deploy_block.txt
diff --git a/...ork-configs/devnet-0/deposit_contract.txt → ...gs/devnet-0/metadata/deposit_contract.txt b/...ork-configs/devnet-0/deposit_contract.txt → ...gs/devnet-0/metadata/deposit_contract.txt
diff --git a/...nfigs/devnet-0/deposit_contract_block.txt → ...net-0/metadata/deposit_contract_block.txt b/...nfigs/devnet-0/deposit_contract_block.txt → ...net-0/metadata/deposit_contract_block.txt
diff --git a/.../devnet-0/deposit_contract_block_hash.txt → .../metadata/deposit_contract_block_hash.txt b/.../devnet-0/deposit_contract_block_hash.txt → .../metadata/deposit_contract_block_hash.txt
diff --git a/network-configs/devnet-0/genesis.json → ...rk-configs/devnet-0/metadata/genesis.json b/network-configs/devnet-0/genesis.json → ...rk-configs/devnet-0/metadata/genesis.json
diff --git a/network-configs/devnet-0/genesis.ssz → ...ork-configs/devnet-0/metadata/genesis.ssz b/network-configs/devnet-0/genesis.ssz → ...ork-configs/devnet-0/metadata/genesis.ssz
diff --git a/...figs/devnet-0/genesis_validators_root.txt → ...et-0/metadata/genesis_validators_root.txt b/...figs/devnet-0/genesis_validators_root.txt → ...et-0/metadata/genesis_validators_root.txt
diff --git a/...onfigs/devnet-0/tranches/tranche_0000.txt → ...vnet-0/metadata/tranches/tranche_0000.txt b/...onfigs/devnet-0/tranches/tranche_0000.txt → ...vnet-0/metadata/tranches/tranche_0000.txt
diff --git a/...k-configs/devnet-0/parsedBeaconState.json → ...vnet-0/parsed/parsedConsensusGenesis.json b/...k-configs/devnet-0/parsedBeaconState.json → ...vnet-0/parsed/parsedConsensusGenesis.json
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,7 @@
-ansible-lint==6.17.2
-ansible==8.2.0
-netaddr==0.10.1
-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