devnet-6 mev setup (#60)

ethpandaops · Feb 6, 2025 · 83b165c · 83b165c
1 parent 96ff260
commit 83b165c
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 16 deletions.
diff --git a/ansible/inventories/devnet-6/group_vars/all/all.yaml b/ansible/inventories/devnet-6/group_vars/all/all.yaml
@@ -42,6 +42,7 @@ ethereum_genesis_chain_id: "70{{ 99999999 | random(start=10000000, seed=ethereum
 ethereum_genesis_generator_output_dir: "../network-configs/{{ ethereum_network_name | replace('pectra-', '') }}"
 ethereum_genesis_timestamp: "1738603800"
 ethereum_genesis_timedelay: 60
+ethereum_genesis_fork_version_suffix: "{{ 999999 | random(start=100000, seed=ethereum_genesis_network_seed) }}"
 ethereum_genesis_timestamp_relative_cmd:
   Linux: "date +%s -d '+45 minutes'"
   Darwin: "date -v +45M +%s"
@@ -254,4 +255,4 @@ vector_config: |
     endpoint = "{{ secret_loki.endpoint }}"
     auth.strategy = "basic"
     auth.user = "{{ secret_loki.username }}"
-    auth.password = "{{ secret_loki.password }}"
+    auth.password = "{{ secret_loki.password }}"
diff --git a/ansible/inventories/devnet-6/group_vars/mev_boost.yaml b/ansible/inventories/devnet-6/group_vars/mev_boost.yaml
@@ -0,0 +1,13 @@
+# role: ethpandaops.general.ethereum_node
+ethereum_node_external_builder_enabled: true
+ethereum_node_external_builder_type: mev_boost
+ethereum_node_external_builder_container_name: external-block-builder
+ethereum_node_external_builder_server_port: 18550
+ethereum_node_external_builder_endpoint: "http://{{ ethereum_node_external_builder_container_name }}:{{ ethereum_node_external_builder_server_port }}"
+
+# role: ethpandaops.general.mev_boost
+mev_boost_container_image: ethpandaops/mev-boost:electra
+mev_boost_container_command:
+  - --addr=0.0.0.0:{{ mev_boost_server_port }}
+  - --genesis-fork-version=0x10{{ ethereum_genesis_fork_version_suffix }}
+  - --relay={{ mev_boost_relay_url }}
diff --git a/ansible/inventories/devnet-6/group_vars/mev_boost_bloxroute.yaml b/ansible/inventories/devnet-6/group_vars/mev_boost_bloxroute.yaml
@@ -0,0 +1 @@
+mev_boost_relay_url: "http://0x821f2a65afb70e7f2e820a925a9b4c80a159620582c1766b1b09729fec178b11ea22abb3a51f07b288be815a1a2ff516@54.147.158.197:18550" # bloxroute
diff --git a/ansible/inventories/devnet-6/inventory.ini b/ansible/inventories/devnet-6/inventory.ini
@@ -4,7 +4,7 @@ localhost
 ethereum_network_name=pectra-devnet-6
 
 [bootnode]
-bootnode-1 ansible_host=188.166.165.223 ipv6=2a03:b0c0:3:f0::6f56:9000 cloud=digitalocean cloud_region=fra1 
+bootnode-1 ansible_host=188.166.165.223 ipv6=2a03:b0c0:3:f0::6f56:9000 cloud=digitalocean cloud_region=fra1
 
 [grandine_besu]
 grandine-besu-1 ansible_host=206.81.20.152 ipv6=2a03:b0c0:3:f0::6f58:2000 cloud=digitalocean cloud_region=fra1 validator_start=68880 validator_end=69440
@@ -95,6 +95,9 @@ lodestar-nimbusel-1 ansible_host=134.122.82.48 ipv6=2a03:b0c0:3:f0::6f55:8000 cl
 [lodestar_reth]
 lodestar-reth-1 ansible_host=164.90.185.128 ipv6=2a03:b0c0:3:f0::6f54:e000 cloud=digitalocean cloud_region=fra1 validator_start=54320 validator_end=54880
 
+[mevrelay]
+mevrelay-1 ansible_host=139.59.137.149 ipv6=2a03:b0c0:3:f0::71b5:4000 cloud=digitalocean cloud_region=fra1
+
 [nimbus_besu]
 nimbus-besu-1 ansible_host=138.68.96.61 ipv6=2a03:b0c0:3:f0::6f57:9000 cloud=digitalocean cloud_region=fra1 validator_start=61880 validator_end=62440
 
@@ -189,7 +192,7 @@ teku-reth-1 ansible_host=164.92.238.61 ipv6=2a03:b0c0:3:f0::6f58:9000 cloud=digi
 teku-reth-2 ansible_host=209.38.110.210 ipv6=2a03:b0c0:2:f0::43bc:1 cloud=digitalocean cloud_region=ams3 validator_start=46200 validator_end=46760
 
 [xatu]
-xatu-1 ansible_host=134.122.79.241 ipv6=2a03:b0c0:3:f0::6f54:d000 cloud=digitalocean cloud_region=fra1 
+xatu-1 ansible_host=134.122.79.241 ipv6=2a03:b0c0:3:f0::6f54:d000 cloud=digitalocean cloud_region=fra1
 
 
 # Consensus client groups
@@ -244,7 +247,6 @@ grandine_nethermind
 grandine_nimbusel
 grandine_reth
 
-
 # Execution client groups
 
 [besu:children]
@@ -275,15 +277,15 @@ lodestar_nethermind
 nimbus_nethermind
 prysm_nethermind
 teku_nethermind
-[erigonTwo:children]
-lighthouse_erigonTwo
 [erigon:children]
 grandine_erigon
 lighthouse_erigon
 lodestar_erigon
 nimbus_erigon
 prysm_erigon
 teku_erigon
+[erigonTwo:children]
+lighthouse_erigonTwo
 [reth:children]
 grandine_reth
 lighthouse_reth
@@ -330,4 +332,14 @@ bootnode
 bootnode
 
 [goomy:children]
-bootnode
+bootnode
+
+[mev_boost:children]
+mev_boost_bloxroute
+
+[mev_boost_bloxroute]
+prysm-geth-1
+lighthouse-geth-1
+nimbus-besu-1
+lodestar-erigon-1
+teku-reth-1
diff --git a/terraform/devnet-6/ansible_inventory.tmpl b/terraform/devnet-6/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", "grandine", "caplin"] ~}
+%{ for cl in ["lighthouse", "lodestar", "nimbus", "teku", "prysm", "grandine"] ~}
 [${cl}:children]
 %{ for gid, group in groups ~}
 %{ if split("-", gid)[0] == "${cl}" ~}
@@ -26,10 +26,10 @@ ${replace(gid, "-", "_")}
 
 # Execution client groups
 
-%{ for el in ["besu", "ethereumjs", "geth", "nethermind", "erigon", "reth", "nimbusel"] ~}
+%{ for el in ["besu", "ethereumjs", "geth", "nethermind", "erigon", "erigonTwo", "reth", "nimbusel"] ~}
 [${el}:children]
 %{ for gid, group in groups ~}
-%{ if split("-", gid)[0] != "bootnode" && split("-", gid)[0] != "xatu" ~}
+%{ if split("-", gid)[0] != "bootnode" && split("-", gid)[0] != "xatu" && split("-", gid)[0] != "mevrelay" ~}
 %{ if split("-", gid)[1] == "${el}" ~}
 ${replace(gid, "-", "_")}
 %{ endif ~}
@@ -40,12 +40,12 @@ ${replace(gid, "-", "_")}
 # Global groups
 
 [consensus_node:children]
-%{ for x,y in merge( { for gid, group in groups : split("-", gid)[0] => true... if split("-", gid)[0] != "bootnode" && split("-", gid)[0] != "xatu" } )   ~}
+%{ for x,y in merge( { for gid, group in groups : split("-", gid)[0] => true... if split("-", gid)[0] != "bootnode" && split("-", gid)[0] != "xatu" && split("-", gid)[0] != "mevrelay" } )   ~}
 ${x}
 %{ endfor ~}
 
 [execution_node:children]
-%{ for x,y in merge( { for gid, group in groups : split("-", gid)[1] => true... if split("-", gid)[0] != "bootnode" && split("-", gid)[0] != "xatu" } )   ~}
+%{ for x,y in merge( { for gid, group in groups : split("-", gid)[1] => true... if split("-", gid)[0] != "bootnode" && split("-", gid)[0] != "xatu" && split("-", gid)[0] != "mevrelay" } )   ~}
 ${x}
 %{ endfor ~}
 
@@ -60,4 +60,14 @@ bootnode
 bootnode
 
 [goomy:children]
-bootnode
+bootnode
+
+[mev_boost:children]
+mev_boost_bloxroute
+
+[mev_boost_bloxroute]
+prysm-geth-1
+lighthouse-geth-1
+nimbus-besu-1
+lodestar-erigon-1
+teku-reth-1
diff --git a/terraform/devnet-6/nodes.tf b/terraform/devnet-6/nodes.tf
@@ -11,10 +11,11 @@ variable "bootnode" {
 # mev-relay
 variable "mev_relay" {
   default = {
-    name            = "mev-relay"
-    count           = 0
+    name            = "mevrelay"
+    count           = 1
     validator_start = 0
     validator_end   = 0
+    size            = "s-4vcpu-16gb-320gb-intel"
   }
 }
 
@@ -415,4 +416,3 @@ variable "lighthouse_erigonTwo" {
     validator_end   = 70500
   }
 }
-
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		mev_boost_relay_url: "http://0x821f2a65afb70e7f2e820a925a9b4c80a159620582c1766b1b09729fec178b11ea22abb3a51f07b288be815a1a2ff516@54.147.158.197:18550" # bloxroute