Merge pull request #34 from ethpandaops/bbusa/grandine

feat: update missing grandine and v6 flags
ethpandaops · Mar 22, 2024 · b33b55f · b33b55f
2 parents a7059fa + e9a1213
commit b33b55f
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 31 deletions.
diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml
@@ -3,7 +3,7 @@ ansible_python_interpreter: /usr/bin/python3
 devnet_name: template
 
 # IPv6 Specific configuration
-global_ipv6_enabled: false
+global_ipv6_enabled: true
 global_ipv6_subnet_ranges:
   hetzner: "64"
   digitalocean: "124"
@@ -37,8 +37,8 @@ fail2ban_ignoreips:
 docker_network_name: shared
 docker_network_enable_ipv6: "{{ global_ipv6_enabled }}"
 docker_network_ipam_config: >-
-  {{ ipv6_enabled ? ternary(
-    [ { subnet: "{{ ansible_default_ipv6.address | ansible.utils.ipsubnet(global_ipv6_subnet_ranges[ hostvars['cloud'] ] ) }}" } ]
+  {{ global_ipv6_enabled | ternary(
+    [ { 'subnet': ansible_default_ipv6.address | ansible.utils.ipsubnet(global_ipv6_subnet_ranges[hostvars[inventory_hostname]['cloud']]) } ]
     , [])
   }}
 

diff --git a/ansible/inventories/devnet-0/group_vars/all/all.yaml b/ansible/inventories/devnet-0/group_vars/all/all.yaml
@@ -5,7 +5,8 @@
 #  ╚██████╔╝███████╗╚█████╔╝██████╦╝██║░░██║███████╗  ░░╚██╔╝░░██║░░██║██║░░██║██████╔╝
 #  ░╚═════╝░╚══════╝░╚════╝░╚═════╝░╚═╝░░╚═╝╚══════╝  ░░░╚═╝░░░╚═╝░░╚═╝╚═╝░░╚═╝╚═════╝░
 
-network_subdomain: "{{ ethereum_network_name }}.ethpandaops.io"
+domain: ethpandaops.io
+network_subdomain: "{{ ethereum_network_name }}.{{ domain }}"
 server_fqdn: "{{ inventory_hostname }}.{{ network_subdomain }}"
 
 ethereum_network_id: >-
@@ -18,14 +19,14 @@ ethereum_network_deposit_contract_block: >-
 ethereum_node_rcp_hostname: "rpc.{{ server_fqdn }}"
 ethereum_node_beacon_hostname: "bn.{{ server_fqdn }}"
 
-ethstats_url: "ethstats.{{ ethereum_network_name }}.ethpandaops.io"
+ethstats_url: "ethstats.{{ ethereum_network_name }}.{{ domain }}"
 ethstats_secret: "{{ secret_ethstats }}"
 
 ### Checkpoint sync specific for Ansible & Kubernetes
 checkpoint_sync_node: bootnode-1
 ethereum_node_cl_checkpoint_sync_enabled: false
-checkpoint_sync_url: https://{{ secret_nginx_shared_basic_auth.name }}:{{ secret_nginx_shared_basic_auth.password }}@bn.{{ checkpoint_sync_node }}.srv.{{ ethereum_network_name }}.ethpandaops.io
-checkpoint_sync_url_kube: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@bn.{{ checkpoint_sync_node }}.srv.{{ ethereum_network_name }}.ethpandaops.io
+checkpoint_sync_url: https://{{ secret_nginx_shared_basic_auth.name }}:{{ secret_nginx_shared_basic_auth.password }}@bn.{{ checkpoint_sync_node }}.srv.{{ ethereum_network_name }}.{{ domain }}
+checkpoint_sync_url_kube: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@bn.{{ checkpoint_sync_node }}.srv.{{ ethereum_network_name }}.{{ domain }}
 #  ██████╗░░█████╗░██╗░░░░░███████╗  ██╗░░░██╗░█████╗░██████╗░░██████╗
 #  ██╔══██╗██╔══██╗██║░░░░░██╔════╝  ██║░░░██║██╔══██╗██╔══██╗██╔════╝
 #  ██████╔╝██║░░██║██║░░░░░█████╗░░  ╚██╗░██╔╝███████║██████╔╝╚█████╗░
@@ -34,11 +35,11 @@ checkpoint_sync_url_kube: https://<path:/secrets/services/services.enc.yaml#ethe
 #  ╚═╝░░╚═╝░╚════╝░╚══════╝╚══════╝  ░░░╚═╝░░░╚═╝░░╚═╝╚═╝░░╚═╝╚═════╝░
 
 # role: ethpandaops.general.ethereum_genesis
-ethereum_genesis_generator_container_image: "ethpandaops/ethereum-genesis-generator:2.0.12"
+ethereum_genesis_generator_container_image: "{{ default_tooling_images.ethereum_genesis_generator }}"
 ethereum_genesis_generator_version: "{{ ethereum_genesis_generator_container_image.split(':')[-1] }}"
 ethereum_genesis_network_seed: "{{ ansible_inventory_sources[0] }}"
 ethereum_genesis_chain_id: "70{{ 99999999 | random(start=10000000, seed=ethereum_genesis_network_seed) }}"
-ethereum_genesis_generator_output_dir: "../network-configs/{{ ethereum_network_name | replace('4844-', '') }}"
+ethereum_genesis_generator_output_dir: "../network-configs/{{ ethereum_network_name | replace('template-', '') }}"
 ethereum_genesis_timestamp: "{{ lookup('ansible.builtin.pipe', '{{ ethereum_genesis_timestamp_relative_cmd[ansible_system] }}') }}"
 ethereum_genesis_timedelay: 60
 ethereum_genesis_timestamp_relative_cmd:
@@ -61,7 +62,8 @@ ethereum_genesis_generator_config_files:
     export BELLATRIX_FORK_VERSION="0x30{{ ethereum_genesis_fork_version_suffix }}"
     export CAPELLA_FORK_VERSION="0x40{{ ethereum_genesis_fork_version_suffix }}"
     export DENEB_FORK_VERSION="0x50{{ ethereum_genesis_fork_version_suffix }}"
-    export DENEB_FORK_EPOCH="2"
+    export ELECTRA_FORK_VERSION="0x60{{ ethereum_genesis_fork_version_suffix }}"
+    export ELECTRA_FORK_EPOCH="5"
     export WITHDRAWAL_TYPE="0x00"
     export WITHDRAWAL_ADDRESS={{ ethereum_genesis_validator_bls_change_execution_address }}
     export BEACON_STATIC_ENR=""
@@ -120,7 +122,6 @@ ethereum_node_el_ports_http_rpc: 8545
 ethereum_node_el_ports_ws_rpc: 8546
 ethereum_node_el_ports_engine: 8551
 ethereum_node_el_ports_metrics: 6060
-ethereum_node_ipv6_enabled: true
 
 ethereum_node_json_rpc_snooper_engine_enabled: true
 ethereum_node_json_rpc_snooper_engine_port: 8561
@@ -148,7 +149,7 @@ gen_basic_auth_nginx_password: "{{ secret_nginx_shared_basic_auth.password }}"
 
 # role: ethpandaops.general.docker_nginx_proxy
 docker_nginx_proxy_container_name: nginx-proxy
-docker_nginx_proxy_default_email: "certs@ethpandaops.io"
+docker_nginx_proxy_default_email: "certs@{{ domain }}"
 docker_nginx_proxy_docker_gen_container_name: nginx-proxy-gen
 docker_nginx_proxy_docker_gen_container_env:
   RESOLVERS: "1.1.1.1"

diff --git a/ansible/inventories/devnet-0/group_vars/all/images.yaml b/ansible/inventories/devnet-0/group_vars/all/images.yaml
@@ -6,6 +6,7 @@ default_ethereum_client_images:
   prysm: gcr.io/prysmaticlabs/prysm/beacon-chain:latest
   prysm_validator: gcr.io/prysmaticlabs/prysm/validator:latest
   teku: consensys/teku:latest
+  grandine: ethpandaops/grandine:develop
 ### Execution layer clients
   besu: hyperledger/besu:latest
   geth: ethereum/client-go:stable
@@ -33,3 +34,4 @@ 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.0.0
diff --git a/ansible/inventories/devnet-0/group_vars/grandine.yaml b/ansible/inventories/devnet-0/group_vars/grandine.yaml
@@ -30,8 +30,8 @@ grandine_container_volumes:
   - "{{ eth_testnet_config_dir }}:/network-config:ro"
 grandine_container_command_extra_args:
   - --configuration-directory=/network-config/
-  - --boot-nodes=={{ ethereum_cl_bootnodes | join(',') }}
-  - --graffiti={{ ethereum_node_cl }}/{{ ethereum_node_el }}
+  - --boot-nodes={{ ethereum_cl_bootnodes | join(',') }}
+  - --graffiti={{ ansible_hostname }}
 
 grandine_validator_container_volumes:
   - "{{ grandine_validator_datadir }}:/validator-data"

diff --git a/ansible/inventories/devnet-0/group_vars/lighthouse.yaml b/ansible/inventories/devnet-0/group_vars/lighthouse.yaml
@@ -47,7 +47,7 @@ lighthouse_validator_container_volumes:
   - "{{ eth_testnet_config_dir }}:/network-config:ro"
 lighthouse_validator_container_command_extra_args:
   - --testnet-dir=/network-config
-  - --graffiti={{ ethereum_node_cl }}/{{ ethereum_node_el }}
+  - --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
@@ -47,7 +47,7 @@ lodestar_validator_container_volumes:
   - "{{ eth_testnet_config_dir }}:/network-config:ro"
 lodestar_validator_container_command_extra_args:
   - --paramsFile=/network-config/config.yaml
-  - --graffiti={{ ethereum_node_cl }}/{{ ethereum_node_el }}
+  - --graffiti={{ ansible_hostname }}
   - --useProduceBlockV3
 lodestar_validator_datadir: /data/lodestar-validator
 lodestar_container_pull: true
diff --git a/ansible/inventories/devnet-0/group_vars/nimbus.yaml b/ansible/inventories/devnet-0/group_vars/nimbus.yaml
@@ -43,7 +43,7 @@ nimbus_container_command_extra_simple_args:
   - --doppelganger-detection=off
   - --log-level=INFO
   - --light-client-data-serve=false
-  - --graffiti={{ ethereum_node_cl }}/{{ ethereum_node_el }}
+  - --graffiti={{ ansible_hostname }}
 nimbus_container_command_extra_bootnode_args: >-
   {{ ethereum_cl_bootnodes | map('regex_replace', '^', '--bootstrap-node=') | list }}
 

diff --git a/ansible/inventories/devnet-0/group_vars/prysm.yaml b/ansible/inventories/devnet-0/group_vars/prysm.yaml
@@ -60,5 +60,5 @@ prysm_validator_container_entrypoint:
   - /app/cmd/validator/validator
 prysm_validator_container_command_extra_args:
   - --chain-config-file=/network-config/config.yaml
-  - --graffiti={{ ethereum_node_cl }}/{{ ethereum_node_el }}
+  - --graffiti={{ ansible_hostname }}
 prysm_validator_datadir: /data/prysm-validator
diff --git a/ansible/inventories/devnet-0/group_vars/teku.yaml b/ansible/inventories/devnet-0/group_vars/teku.yaml
@@ -41,7 +41,7 @@ teku_container_command_extra_args:
   - --p2p-peer-upper-bound=100
   - --data-storage-non-canonical-blocks-enabled=true
   - --data-storage-mode=PRUNE
-  - --validators-graffiti={{ ethereum_node_cl }}/{{ ethereum_node_el }}
+  - --validators-graffiti={{ ansible_hostname }}
   - --logging=info
   - --Xlog-include-p2p-warnings-enabled
   - --metrics-block-timing-tracking-enabled

diff --git a/ansible/requirements.yaml b/ansible/requirements.yaml
@@ -7,8 +7,6 @@ roles:
     version: "2.5.0"
   - src: geerlingguy.pip
     version: "2.2.0"
-  - name: robertdebock.bootstrap
-    version: 5.2.5 # Don't update this. Newer versions contain a bug.
   - name: robertdebock.fail2ban
     version: "4.2.3"
 

diff --git a/terraform/devnet-0/ansible_inventory.tmpl b/terraform/devnet-0/ansible_inventory.tmpl
@@ -15,7 +15,7 @@ ${host.hostname} ansible_host=${host.ip} ipv6=${host.ipv6} cloud=${host.cloud} c
 
 # Consensus client groups
 
-%{ for cl in ["lighthouse", "lodestar", "nimbus", "teku", "prysm"] ~}
+%{ for cl in ["lighthouse", "lodestar", "nimbus", "teku", "prysm", "grandine"] ~}
 [${cl}:children]
 %{ for gid, group in groups ~}
 %{ if split("-", gid)[0] == "${cl}" ~}
@@ -52,6 +52,3 @@ ${x}
 [ethereum_node:children]
 consensus_node
 execution_node
-
-#[beaconchain_explorer:children]
-#lighthouse_erigon
diff --git a/terraform/devnet-0/digitalocean.tf b/terraform/devnet-0/digitalocean.tf
@@ -3,7 +3,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 variable "digitalocean_project_name" {
   type    = string
-  default = "ProjectName"
+  default = "Template"
 }
 
 variable "digitalocean_ssh_key_name" {

diff --git a/terraform/devnet-0/nodes.tf b/terraform/devnet-0/nodes.tf
@@ -21,7 +21,7 @@ variable "lighthouse_geth" {
 variable "lighthouse_besu" {
   default = {
     name            = "lighthouse-besu"
-    count           = 1
+    count           = 0
     validator_start = 0
     validator_end   = 0
   }
@@ -30,7 +30,7 @@ variable "lighthouse_besu" {
 variable "lighthouse_nethermind" {
   default = {
     name            = "lighthouse-nethermind"
-    count           = 1
+    count           = 0
     validator_start = 0
     validator_end   = 0
   }
@@ -39,7 +39,7 @@ variable "lighthouse_nethermind" {
 variable "lighthouse_ethereumjs" {
   default = {
     name            = "lighthouse-ethereumjs"
-    count           = 1
+    count           = 0
     validator_start = 0
     validator_end   = 0
   }
@@ -48,7 +48,7 @@ variable "lighthouse_ethereumjs" {
 variable "lighthouse_erigon" {
   default = {
     name            = "lighthouse-erigon"
-    count           = 1
+    count           = 0
     validator_start = 0
     validator_end   = 0
   }
@@ -57,7 +57,7 @@ variable "lighthouse_erigon" {
 variable "lighthouse_reth" {
   default = {
     name            = "lighthouse-reth"
-    count           = 1
+    count           = 0
     validator_start = 0
     validator_end   = 0
   }