update everything

ansible/cleanup_ethereum.yaml

@@ -1,4 +1,4 @@
-- hosts: all
+- hosts: all,!localhost
   serial: "{{ batch_count | default('100%') }}"
   become: true
   tasks:

ansible/inventories/devnet-8/group_vars/all/all.yaml

@@ -30,12 +30,12 @@ ethstats_secret: "{{ secret_ethstats }}"
 #  ╚═╝░░╚═╝░╚════╝░╚══════╝╚══════╝  ░░░╚═╝░░░╚═╝░░╚═╝╚═╝░░╚═╝╚═════╝░
 
 # role: ethpandaops.general.ethereum_genesis
-ethereum_genesis_generator_container_image: "ethpandaops/ethereum-genesis-generator:1.3.3"
+ethereum_genesis_generator_container_image: "ethpandaops/ethereum-genesis-generator:1.3.4"
 ethereum_genesis_generator_version: "{{ ethereum_genesis_generator_container_image.split(':')[-1] }}"
 ethereum_genesis_network_seed: "{{ ansible_inventory_sources[0] }}"
 ethereum_genesis_chain_id: 7011893058
 ethereum_genesis_generator_output_dir: "../network-configs/{{ ethereum_network_name | replace('dencun-', '') }}"
-ethereum_genesis_timestamp: 1692095400
+ethereum_genesis_timestamp: 1692099000
 ethereum_genesis_timedelay: 60
 ethereum_genesis_timestamp_relative_cmd:
   Linux: "date +%s -d '+45 minutes'"

ansible/inventories/devnet-8/group_vars/besu.yaml

@@ -14,6 +14,7 @@ bootstrap_default_user_authorized_keys_github_team_el:
 ethereum_node_el: besu
 
 # role: ethpandaops.general.besu
+besu_container_name: execution
 besu_container_image: "{{ default_ethereum_client_images.besu }}"
 besu_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_rcp_hostname }}"

ansible/inventories/devnet-8/group_vars/bootnode.yaml

@@ -38,6 +38,7 @@ bootstrap_default_user_authorized_keys_github_team_el:
 ethereum_node_el: geth
 
 # role: ethpandaops.general.geth
+geth_container_name: execution
 geth_container_image: "{{ default_ethereum_client_images.geth }}"
 geth_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_rcp_hostname }}"
@@ -48,7 +49,6 @@ geth_container_command_extra_args:
   - --http.vhosts=*
   - --networkid={{ ethereum_network_id }}
   - --syncmode=full
-  - --bootnodes={{ ethereum_el_bootnodes | join(',') }}
   - --ethstats={{ inventory_hostname }}:{{ ethstats_secret }}@{{ ethstats_url }}
 geth_init_custom_network: true
 geth_init_custom_network_genesis_file: "{{ eth_testnet_config_dir }}/genesis.json"
@@ -78,6 +78,7 @@ validator_bls_sync_files:
 ethereum_node_cl: teku
 
 # role: ethpandaops.general.teku
+teku_container_name: beacon
 teku_container_image: "{{ default_ethereum_client_images.teku }}"
 teku_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_beacon_hostname }}"
@@ -91,11 +92,10 @@ teku_container_volumes:
 teku_container_command_extra_args:
   - --network=/network-config/config.yaml
   - --initial-state=/network-config/genesis.ssz
-  - --p2p-discovery-bootnodes={{ ethereum_cl_bootnodes | join(',') }}
   - --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=bootnode-{{ ethereum_node_cl }}/{{ ethereum_node_el }}
   - --logging=info
   - --Xlog-include-p2p-warnings-enabled
   - --metrics-block-timing-tracking-enabled

ansible/inventories/devnet-8/group_vars/erigon.yaml

@@ -7,6 +7,7 @@ bootstrap_default_user_authorized_keys_github_team_el:
 ethereum_node_el: erigon
 
 # role: ethpandaops.general.erigon
+erigon_container_name: execution
 erigon_container_image: "{{ default_ethereum_client_images.erigon }}"
 erigon_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_rcp_hostname }}"

ansible/inventories/devnet-8/group_vars/ethereumjs.yaml

@@ -9,6 +9,9 @@ bootstrap_default_user_authorized_keys_github_team_el:
 ethereum_node_el: ethereumjs
 
 # role: ethpandaops.general.ethereumjs
+ethereum_node_fact_discovery_el_enode_cmd:
+  ethereumjs: cat /data/ethereumjs/genesis/rlpx
+ethereumjs_container_name: execution
 ethereumjs_container_image: "{{ default_ethereum_client_images.ethereumjs }}"
 ethereumjs_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_rcp_hostname }}"
@@ -25,4 +28,6 @@ ethereumjs_container_command_extra_args:
   - --maxPeers=75
   - --isSingleNode=true
   - --logLevel=debug
+
+
   #- --trustedSetup=/network-config/trusted_setup.txt

ansible/inventories/devnet-8/group_vars/geth.yaml

@@ -9,6 +9,7 @@ bootstrap_default_user_authorized_keys_github_team_el:
 ethereum_node_el: geth
 
 # role: ethpandaops.general.geth
+geth_container_name: execution
 geth_container_image: "{{ default_ethereum_client_images.geth }}"
 geth_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_rcp_hostname }}"

ansible/inventories/devnet-8/group_vars/lighthouse.yaml

@@ -28,6 +28,7 @@ validator_bls_sync_files:
 ethereum_node_cl: lighthouse
 
 # role: ethpandaops.general.lighthouse
+lighthouse_container_name: beacon
 lighthouse_container_image: "{{ default_ethereum_client_images.lighthouse }}"
 lighthouse_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_beacon_hostname }}"
@@ -43,6 +44,7 @@ lighthouse_container_command_extra_args:
   - --self-limiter=blob_sidecars_by_range:512/10
   - --debug-level=debug
   #- --checkpoint-sync-url=https://{{secret_nginx_shared_basic_auth.name}}:{{secret_nginx_shared_basic_auth.password}}@bn.teku-nethermind-1.srv.dencun-devnet-7.ethpandaops.io
+lightouse_validator_container_name: validator
 lighthouse_validator_container_volumes:
   - "{{ lighthouse_validator_datadir }}:/validator-data"
   - "{{ eth_testnet_config_dir }}:/network-config:ro"

ansible/inventories/devnet-8/group_vars/lodestar.yaml

@@ -24,6 +24,7 @@ validator_bls_sync_files:
 ethereum_node_cl: lodestar
 
 # role: ethpandaops.general.lodestar
+lodestar_container_name: beacon
 lodestar_container_image: "{{ default_ethereum_client_images.lodestar }}"
 lodestar_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_beacon_hostname }}"
@@ -42,6 +43,8 @@ lodestar_container_command_extra_args:
   - --nat=true
   #- --chain.trustedSetup=/network-config/trusted_setup.txt
   #- --checkpointSyncUrl=https://{{secret_nginx_shared_basic_auth.name}}:{{secret_nginx_shared_basic_auth.password}}@bn.teku-nethermind-1.srv.dencun-devnet-7.ethpandaops.io
+
+lodestar_validator_container_name: validator
 lodestar_validator_container_volumes:
   - "{{ lodestar_validator_datadir }}:/validator-data"
   - "{{ eth_testnet_config_dir }}:/network-config:ro"

ansible/inventories/devnet-8/group_vars/nethermind.yaml

@@ -17,6 +17,7 @@ bootstrap_default_user_authorized_keys_github_team_el:
 ethereum_node_el: nethermind
 
 # role: ethpandaops.general.nethermind
+nethermind_container_name: execution
 nethermind_container_image: "{{ default_ethereum_client_images.nethermind }}"
 nethermind_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_rcp_hostname }}"

ansible/inventories/devnet-8/group_vars/nimbus.yaml

@@ -21,7 +21,7 @@ validator_bls_sync_files:
 
 # role: ethpandaops.general.ethereum_node
 ethereum_node_cl: nimbus
-
+nimbus_container_name: beacon
 # role: ethpandaops.general.nimbus
 # Checkpointsync
 nimbus_checkpoint_sync_enabled: false

ansible/inventories/devnet-8/group_vars/prysm.yaml

@@ -24,6 +24,7 @@ validator_bls_sync_files:
 ethereum_node_cl: prysm
 
 # role: ethpandaops.general.prysm
+prysm_container_name: beacon
 prysm_container_image: "{{ default_ethereum_client_images.prysm }}"
 prysm_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_beacon_hostname }}"
@@ -52,6 +53,7 @@ prysm_container_command_extra_simple_args:
 prysm_container_command_extra_bootnode_args: >-
   {{ ethereum_cl_bootnodes | map('regex_replace', '^', '--bootstrap-node=') | list }}
 
+prysm_validator_container_name: validator
 prysm_validator_container_image: "{{ prysm_container_image }}"
 prysm_validator_container_volumes:
   - "{{ prysm_validator_datadir }}:/validator-data"

ansible/inventories/devnet-8/group_vars/reth.yaml

@@ -6,6 +6,7 @@ bootstrap_default_user_authorized_keys_github_team_el:
 ethereum_node_el: reth
 
 # role: ethpandaops.general.reth
+reth_container_name: execution
 reth_container_image: "{{ default_ethereum_client_images.reth }}"
 reth_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_rcp_hostname }}"

ansible/inventories/devnet-8/group_vars/teku.yaml

@@ -22,6 +22,7 @@ validator_bls_sync_files:
 ethereum_node_cl: teku
 
 # role: ethpandaops.general.teku
+teku_container_name: beacon
 teku_container_image: "{{ default_ethereum_client_images.teku }}"
 teku_container_env:
   VIRTUAL_HOST: "{{ ethereum_node_beacon_hostname }}"

ansible/playbook.yaml

@@ -3,34 +3,34 @@
     - role: ethpandaops.general.ethereum_genesis
       tags: [ethereum_genesis]
 
-- import_playbook: ethpandaops.general.bootstrap_server
-  vars:
-    target: "all:!localhost"
-  tags: [init-server, bootstrap]
+# - import_playbook: ethpandaops.general.bootstrap_server
+#   vars:
+#     target: "all:!localhost"
+#   tags: [init-server, bootstrap]
 
-- hosts: all:!localhost
-  serial: "{{ batch_count | default('100%') }}"
-  become: true
-  roles:
-    # - role: robertdebock.fail2ban
-    #   tags: [init-server, fail2ban]
-    - role: geerlingguy.docker
-      tags: [init-server, docker]
-    - role: geerlingguy.pip
-      pip_install_packages:
-        - name: docker
-        - name: docker-compose
-      tags: [init-server, pip]
-    - role: ethpandaops.general.docker_cleanup
-      tags: [init-server, docker_cleanup]
-    - role: ethpandaops.general.docker_network
-      tags: [init-server, docker_network]
-    - role: ethpandaops.general.node_exporter
-      tags: [init-server, node_exporter]
-    - role: ethpandaops.general.prometheus
-      tags: [init-server, prometheus]
-    - role: ethpandaops.general.vector
-      tags: [init-server, vector]
+# - hosts: all:!localhost
+#   serial: "{{ batch_count | default('100%') }}"
+#   become: true
+#   roles:
+#     # - role: robertdebock.fail2ban
+#     #   tags: [init-server, fail2ban]
+#     - role: geerlingguy.docker
+#       tags: [init-server, docker]
+#     - role: geerlingguy.pip
+#       pip_install_packages:
+#         - name: docker
+#         - name: docker-compose
+#       tags: [init-server, pip]
+#     - role: ethpandaops.general.docker_cleanup
+#       tags: [init-server, docker_cleanup]
+#     - role: ethpandaops.general.docker_network
+#       tags: [init-server, docker_network]
+#     - role: ethpandaops.general.node_exporter
+#       tags: [init-server, node_exporter]
+#     - role: ethpandaops.general.prometheus
+#       tags: [init-server, prometheus]
+#     - role: ethpandaops.general.vector
+#       tags: [init-server, vector]
 
 - hosts: bootnode
   become: true

kubernetes/devnet-8/beacon-metrics-gazer/values.yaml

@@ -3,7 +3,7 @@
 beacon-metrics-gazer:
   image:
     repository: dapplion/beacon-metrics-gazer
-    tag: v0.1.3
+    tag: latest
   fullnameOverride: beacon-metrics-gazer
   resources:
     requests:

kubernetes/devnet-8/blockscout/values.yaml

@@ -1,4 +1,4 @@
-# Ansible managed. Don't change this file manually. Template info: /roles/gen_kubernetes_config/templates/blockscout.yaml.j2,869182d 2023/07/19 10:13
+# Ansible managed. Don't change this file manually. Template info: /roles/gen_kubernetes_config/templates/blockscout.yaml.j2,3217385 2023/07/21 12:26
 
 blockscout:
   fullnameOverride: blockscout
@@ -26,6 +26,7 @@ blockscout:
 
   config:
     COIN: ETH
+    DATABASE_URL: postgres://postgres:postgres@blockscout-postgresql:5432/blockscout?ssl=false
     DISABLE_EXCHANGE_RATES: "true"
     DISABLE_KNOWN_TOKENS: "true"
     SHOW_PRICE_CHART: "false"
@@ -74,3 +75,6 @@ blockscout:
 
   serviceMonitor:
     enabled: true
+
+  postgresql:
+    fullnameOverride: blockscout-postgresql