From bb0f42c15cde839e44ca9799b04d0659b9b311fb Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 16 May 2024 22:23:09 +0300 Subject: [PATCH] fix grandine --- ansible/inventories/devnet-0/inventory.ini | 16 +++++++--------- kubernetes/devnet-0/checkpointz/values.yaml | 6 +++--- kubernetes/devnet-0/dora/values.yaml | 6 +++--- kubernetes/devnet-0/dugtrio/values.yaml | 4 ++-- kubernetes/devnet-0/forkmon/values.yaml | 4 ++-- kubernetes/devnet-0/forky/values.yaml | 12 ++++++------ terraform/devnet-0/nodes.tf | 2 +- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/ansible/inventories/devnet-0/inventory.ini b/ansible/inventories/devnet-0/inventory.ini index 60613c3..2556274 100755 --- a/ansible/inventories/devnet-0/inventory.ini +++ b/ansible/inventories/devnet-0/inventory.ini @@ -4,7 +4,10 @@ localhost ethereum_network_name=peerdas-devnet-0 [bootnode] -bootnode-1 ansible_host=143.198.166.9 ipv6=2604:a880:400:d0::10b3:3001 cloud=digitalocean cloud_region=nyc1 +bootnode-1 ansible_host=143.198.166.9 ipv6=2604:a880:400:d0::10b3:3001 cloud=digitalocean cloud_region=nyc1 + +[grandine_geth] +grandine-geth-1 ansible_host=67.205.150.97 ipv6=2604:a880:400:d0::2343:9001 cloud=digitalocean cloud_region=nyc1 validator_start=1600 validator_end=1700 [lighthouse_geth] lighthouse-geth-1 ansible_host=174.138.42.26 ipv6=2604:a880:400:d0::214e:7001 cloud=digitalocean cloud_region=nyc1 validator_start=0 validator_end=100 @@ -19,9 +22,6 @@ lighthouse-nethermind-3 ansible_host=144.126.200.175 ipv6=2a03:b0c0:1:d0::fa2:b0 [nimbus_geth] nimbus-geth-1 ansible_host=157.230.82.146 ipv6=2604:a880:400:d0::2157:8001 cloud=digitalocean cloud_region=nyc1 validator_start=1400 validator_end=1500 -[nimbus_nethermind] -nimbus-nethermind-1 ansible_host=159.65.224.180 ipv6=2604:a880:400:d0::e2b:e001 cloud=digitalocean cloud_region=nyc1 validator_start=1600 validator_end=1700 - [prysm_geth] prysm-geth-1 ansible_host=67.205.186.80 ipv6=2604:a880:400:d0::1dfb:a001 cloud=digitalocean cloud_region=nyc1 validator_start=600 validator_end=700 prysm-geth-2 ansible_host=152.42.196.210 ipv6=2400:6180:0:d0::a43:5001 cloud=digitalocean cloud_region=sgp1 validator_start=700 validator_end=800 @@ -47,7 +47,6 @@ lighthouse_nethermind [lodestar:children] [nimbus:children] nimbus_geth -nimbus_nethermind [teku:children] teku_geth teku_nethermind @@ -55,19 +54,20 @@ teku_nethermind prysm_geth prysm_nethermind [grandine:children] +grandine_geth # Execution client groups [besu:children] [ethereumjs:children] [geth:children] +grandine_geth lighthouse_geth nimbus_geth prysm_geth teku_geth [nethermind:children] lighthouse_nethermind -nimbus_nethermind prysm_nethermind teku_nethermind [erigon:children] @@ -76,6 +76,7 @@ teku_nethermind # Global groups [consensus_node:children] +grandine lighthouse nimbus prysm @@ -88,6 +89,3 @@ nethermind [ethereum_node:children] consensus_node execution_node - -[tx_fuzz_blobs] -bootnode-1 \ No newline at end of file diff --git a/kubernetes/devnet-0/checkpointz/values.yaml b/kubernetes/devnet-0/checkpointz/values.yaml index 5702828..f26a4b7 100644 --- a/kubernetes/devnet-0/checkpointz/values.yaml +++ b/kubernetes/devnet-0/checkpointz/values.yaml @@ -51,6 +51,9 @@ checkpointz: - name: bootnode-1 address: https://@bn.bootnode-1.peerdas-devnet-0.ethpandaops.io dataProvider: true + - name: grandine-geth-1 + address: https://@bn.grandine-geth-1.peerdas-devnet-0.ethpandaops.io + dataProvider: true - name: lighthouse-geth-1 address: https://@bn.lighthouse-geth-1.peerdas-devnet-0.ethpandaops.io dataProvider: true @@ -72,9 +75,6 @@ checkpointz: - name: nimbus-geth-1 address: https://@bn.nimbus-geth-1.peerdas-devnet-0.ethpandaops.io dataProvider: true - - name: nimbus-nethermind-1 - address: https://@bn.nimbus-nethermind-1.peerdas-devnet-0.ethpandaops.io - dataProvider: true - name: prysm-geth-1 address: https://@bn.prysm-geth-1.peerdas-devnet-0.ethpandaops.io dataProvider: true diff --git a/kubernetes/devnet-0/dora/values.yaml b/kubernetes/devnet-0/dora/values.yaml index 70b356e..ac16b7c 100644 --- a/kubernetes/devnet-0/dora/values.yaml +++ b/kubernetes/devnet-0/dora/values.yaml @@ -43,6 +43,9 @@ dora: - url: https://@bn.bootnode-1.peerdas-devnet-0.ethpandaops.io name: bootnode-1 priority: -1 + - url: https://@bn.grandine-geth-1.peerdas-devnet-0.ethpandaops.io + name: grandine-geth-1 + priority: -1 - url: https://@bn.lighthouse-geth-1.peerdas-devnet-0.ethpandaops.io name: lighthouse-geth-1 priority: -1 @@ -70,9 +73,6 @@ dora: - url: https://@bn.nimbus-geth-1.peerdas-devnet-0.ethpandaops.io name: nimbus-geth-1 priority: -1 - - url: https://@bn.nimbus-nethermind-1.peerdas-devnet-0.ethpandaops.io - name: nimbus-nethermind-1 - priority: -1 - url: https://@bn.prysm-geth-1.peerdas-devnet-0.ethpandaops.io name: prysm-geth-1 priority: -1 diff --git a/kubernetes/devnet-0/dugtrio/values.yaml b/kubernetes/devnet-0/dugtrio/values.yaml index 185a8a7..6b21e2c 100644 --- a/kubernetes/devnet-0/dugtrio/values.yaml +++ b/kubernetes/devnet-0/dugtrio/values.yaml @@ -33,6 +33,8 @@ dugtrio: name: rpc-teku-geth-001 - url: https://@bn.bootnode-1.peerdas-devnet-0.ethpandaops.io name: bootnode-1 + - url: https://@bn.grandine-geth-1.peerdas-devnet-0.ethpandaops.io + name: grandine-geth-1 - url: https://@bn.lighthouse-geth-1.peerdas-devnet-0.ethpandaops.io name: lighthouse-geth-1 - url: https://@bn.lighthouse-geth-2.peerdas-devnet-0.ethpandaops.io @@ -47,8 +49,6 @@ dugtrio: name: lighthouse-nethermind-3 - url: https://@bn.nimbus-geth-1.peerdas-devnet-0.ethpandaops.io name: nimbus-geth-1 - - url: https://@bn.nimbus-nethermind-1.peerdas-devnet-0.ethpandaops.io - name: nimbus-nethermind-1 - url: https://@bn.prysm-geth-1.peerdas-devnet-0.ethpandaops.io name: prysm-geth-1 - url: https://@bn.prysm-geth-2.peerdas-devnet-0.ethpandaops.io diff --git a/kubernetes/devnet-0/forkmon/values.yaml b/kubernetes/devnet-0/forkmon/values.yaml index 0464a51..74506c3 100644 --- a/kubernetes/devnet-0/forkmon/values.yaml +++ b/kubernetes/devnet-0/forkmon/values.yaml @@ -21,6 +21,8 @@ forkmon: name: rpc-teku-geth-001 - addr: https://@rpc.bootnode-1.peerdas-devnet-0.ethpandaops.io name: bootnode-1 + - addr: https://@rpc.grandine-geth-1.peerdas-devnet-0.ethpandaops.io + name: grandine-geth-1 - addr: https://@rpc.lighthouse-geth-1.peerdas-devnet-0.ethpandaops.io name: lighthouse-geth-1 - addr: https://@rpc.lighthouse-geth-2.peerdas-devnet-0.ethpandaops.io @@ -35,8 +37,6 @@ forkmon: name: lighthouse-nethermind-3 - addr: https://@rpc.nimbus-geth-1.peerdas-devnet-0.ethpandaops.io name: nimbus-geth-1 - - addr: https://@rpc.nimbus-nethermind-1.peerdas-devnet-0.ethpandaops.io - name: nimbus-nethermind-1 - addr: https://@rpc.prysm-geth-1.peerdas-devnet-0.ethpandaops.io name: prysm-geth-1 - addr: https://@rpc.prysm-geth-2.peerdas-devnet-0.ethpandaops.io diff --git a/kubernetes/devnet-0/forky/values.yaml b/kubernetes/devnet-0/forky/values.yaml index 81192fa..1e7018f 100644 --- a/kubernetes/devnet-0/forky/values.yaml +++ b/kubernetes/devnet-0/forky/values.yaml @@ -39,13 +39,18 @@ forky: spec: seconds_per_slot: 12 slots_per_epoch: 32 - genesis_time: 1715888986 + genesis_time: 1715890114 sources: - name: bootnode-1 type: "beacon_node" config: address: https://@bn.bootnode-1.peerdas-devnet-0.ethpandaops.io polling_interval: "12s" + - name: grandine-geth-1 + type: "beacon_node" + config: + address: https://@bn.grandine-geth-1.peerdas-devnet-0.ethpandaops.io + polling_interval: "12s" - name: lighthouse-geth-1 type: "beacon_node" config: @@ -61,11 +66,6 @@ forky: config: address: https://@bn.nimbus-geth-1.peerdas-devnet-0.ethpandaops.io polling_interval: "12s" - - name: nimbus-nethermind-1 - type: "beacon_node" - config: - address: https://@bn.nimbus-nethermind-1.peerdas-devnet-0.ethpandaops.io - polling_interval: "12s" - name: prysm-geth-1 type: "beacon_node" config: diff --git a/terraform/devnet-0/nodes.tf b/terraform/devnet-0/nodes.tf index 7e0c545..dfceeab 100644 --- a/terraform/devnet-0/nodes.tf +++ b/terraform/devnet-0/nodes.tf @@ -75,7 +75,7 @@ variable "nimbus_geth" { variable "grandine_geth" { default = { - name = "nimbus-nethermind" + name = "grandine-geth" count = 1 validator_start = 1600 validator_end = 1700