use new exec layer variables for beacon nodes

Role changes:
- https://github.com/status-im/infra-role-beacon-node-linux/commit/99a445d1
- https://github.com/status-im/infra-role-beacon-node-macos/commit/eecf9fea
- https://github.com/status-im/infra-role-beacon-node-windows/commit/dba21b36

Signed-off-by: Jakub Sokołowski <jakub@status.im>

ansible/group_vars/nimbus.mainnet.yml

@@ -66,13 +66,13 @@ beacon_node_subscribe_all: true
 beacon_node_light_client_data_enabled: '{{ (node.public_api is defined and node.public_api) }}'
 beacon_node_light_client_data_serve: true
 beacon_node_light_client_data_import_mode: 'full'
-# Web3 Auth RPC
-beacon_node_web3_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
-beacon_node_web3_urls: |-
+# Execution layer Enginer API
+beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
+beacon_node_exec_layer_urls: |-
   {{ (data_center == "he-eu-hel1")
     | ternary(
         ["http://localhost:"+(geth_authrpc_port|string)],
-        beacon_node_web3_urls_all
+        beacon_node_exec_layer_urls_all
     ) }}
 # Periodic resync to save space
 beacon_node_resync_enabled: true

ansible/group_vars/nimbus.prater.yml

@@ -50,7 +50,7 @@ beacon_node_rest_max_headers_size: 1024
 beacon_node_firewall_libp2p_open: '{{ node.get("open_libp2p_ports", true) }}'
 # Tuning
 beacon_node_max_peers: 300
-beacon_node_cores_per_node: '{{ (ansible_processor_vcpus / nodes_layout[hostname]|length) | round(0, "ceil") | int }}'
+beacon_node_cores_per_node: '{{ (ansible_processor_vcpus|int / nodes_layout[hostname]|length) | round(0, "ceil") | int }}'
 beacon_node_threads: '{{ (node.branch == "libp2p") | ternary(1, beacon_node_cores_per_node) }}'
 beacon_node_history_retention: '{{ "archive" if node.get("public_api") else node.get("history", "prune") }}'
 # Monitoring
@@ -84,9 +84,9 @@ prater_mev_boost_urls:
 beacon_node_light_client_data_enabled: '{{ (node.public_api is defined and node.public_api) }}'
 beacon_node_light_client_data_serve: true
 beacon_node_light_client_data_import_mode: 'full'
-# Web3 Auth RPC
-beacon_node_web3_urls: ['http://localhost:{{ geth_authrpc_port }}']
-beacon_node_web3_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
+# Execution layer Enginer API
+beacon_node_exec_layer_urls: ['http://localhost:{{ geth_authrpc_port }}']
+beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
 # Periodic resync to save space
 beacon_node_resync_enabled: true
 beacon_node_resync_timer_enabled: '{{ (idx % 2 == 1) and not node.get("public_api") }}'

ansible/group_vars/nimbus.sepolia.yml

@@ -36,9 +36,9 @@ beacon_node_build_frequency: 'daily'
 # Monitoring
 beacon_node_validator_monitor_auto: true
 beacon_node_validator_monitor_totals: true
-# Eth1 Sync
-beacon_node_web3_urls: ['http://localhost:{{ geth_authrpc_port }}']
-beacon_node_web3_jwt_secret: '{{ geth_authrpc_jwtsecret | mandatory }}'
+# Execution layer Enginer API
+beacon_node_exec_layer_urls: ['http://localhost:{{ geth_authrpc_port }}']
+beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret | mandatory }}'
 # Suggests it to the Execution Layer client.
 beacon_node_suggested_fee_recipient: '{{lookup("bitwarden", "nimbus/wallet/testnets", field="address")}}'
 # Validators from nimbus-private repo¬

ansible/host_vars/macos-01.ms-eu-dublin.nimbus.prater.yml

@@ -6,9 +6,9 @@ bootstrap__consul_data_center: 'he-eu-hel1'
 # https://github.com/status-im/nimbus-eth2/issues/2984
 beacon_node_max_peers: 200
 
-# HTTP RPC support is unstable
-beacon_node_web3_urls: ['http://goerli-02.he-eu-hel1.nimbus.geth.wg:{{ geth_authrpc_port }}']
-beacon_node_web3_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
+# Execution layer Enginer API
+beacon_node_exec_layer_urls: ['http://goerli-02.he-eu-hel1.nimbus.geth.wg:{{ geth_authrpc_port }}']
+beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
 
 # ERA Files Generation
 nimbus_era_files_timer_enabled: true

ansible/host_vars/stable-large-01.aws-eu-central-1a.nimbus.prater.yml

@@ -9,6 +9,6 @@ beacon_node_listening_port: 9100
 # Bootnodes should subscribe to all subnets
 beacon_node_subscribe_all: true
 
-# HTTP RPC support is unstable
-beacon_node_web3_urls: ['http://goerli-01.he-eu-hel1.nimbus.geth.wg:8551']
-beacon_node_web3_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
+# Execution layer Enginer API
+beacon_node_exec_layer_urls: ['http://goerli-01.he-eu-hel1.nimbus.geth.wg:8551']
+beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'

ansible/host_vars/testing-large-01.aws-eu-central-1a.nimbus.prater.yml

@@ -9,6 +9,6 @@ beacon_node_listening_port: 9100
 # Bootnodes should subscribe to all subnets
 beacon_node_subscribe_all: true
 
-# HTTP RPC support is unstable
-beacon_node_web3_urls: ['http://goerli-01.he-eu-hel1.nimbus.geth.wg:8552']
-beacon_node_web3_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
+# Execution layer Enginer API
+beacon_node_exec_layer_urls: ['http://goerli-01.he-eu-hel1.nimbus.geth.wg:8552']
+beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'

ansible/host_vars/unstable-large-01.aws-eu-central-1a.nimbus.prater.yml

@@ -1,4 +1,4 @@
 ---
-# HTTP RPC support is unstable
-beacon_node_web3_urls: ['http://goerli-01.he-eu-hel1.nimbus.geth.wg:8553']
-beacon_node_web3_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
+# Execution layer Enginer API
+beacon_node_exec_layer_urls: ['http://goerli-01.he-eu-hel1.nimbus.geth.wg:8553']
+beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'

ansible/host_vars/windows-01.he-eu-hel1.nimbus.prater.yml

@@ -2,6 +2,6 @@
 # Scans affect disk I/O performance.
 bootstrap__defender_enabled: false
 
-# HTTP RPC support is unstable
-beacon_node_web3_urls: ['http://goerli-03.he-eu-hel1.nimbus.geth.wg:{{ geth_authrpc_port }}']
-beacon_node_web3_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
+# Execution layer Enginer API
+beacon_node_exec_layer_urls: ['http://goerli-03.he-eu-hel1.nimbus.geth.wg:{{ geth_authrpc_port }}']
+beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'

ansible/requirements.yml

@@ -45,17 +45,17 @@
 
 - name: infra-role-beacon-node-linux
   src: git@github.com:status-im/infra-role-beacon-node-linux.git
-  version: 339998be51d970da18b5dd2d70b8a5f06b98e1b1
+  version: 99a445d1ee3fa8d437088e72df6e9f88edf148d9
   scm: git
 
 - name: infra-role-beacon-node-windows
   src: git@github.com:status-im/infra-role-beacon-node-windows.git
-  version: 53dc3b1724bc2e98fedbda1e4c21e47775f5246a
+  version: dba21b36df6f9a3282f59fd71efe45c010c1b10f
   scm: git
 
 - name: infra-role-beacon-node-macos
   src: git@github.com:status-im/infra-role-beacon-node-macos.git
-  version: ec5b0601526fa2ba053e197d66b132056606cac9
+  version: eecf9feaa02f2ddd9c5e35b00c6d0e897a1a11af
   scm: git
 
 - name: infra-role-validator-client
@@ -115,7 +115,7 @@
 
 - name: infra-role-geth
   src: git@github.com:status-im/infra-role-geth.git
-  version: 432a93f7250d7e9c5fc2b303f7c7efa38d4e4bba
+  version: 8f7b6ffd8803bceda38a8869e03dfbbad40f26a0
   scm: git
 
 - name: infra-role-geth-exporter

ansible/roles/get-geth-api-urls/tasks/consul/posix.yml

@@ -13,7 +13,7 @@
 # On Windows json attribute is missing when it's [].
 - name: Extract Geth websocket IP and port
   set_fact:
-    beacon_node_web3_urls_all: |
+    beacon_node_exec_layer_urls_all: |
       {{ geth_rpc_services.results
       | sum(attribute="json", start=[])
       | map(attribute="ServiceMeta.url")

ansible/roles/get-geth-api-urls/tasks/consul/windows.yml

@@ -17,7 +17,7 @@
 # On Windows json attribute is missing when it's [].
 - name: Extract Geth websocket IP and port
   set_fact:
-    beacon_node_web3_urls_all: |
+    beacon_node_exec_layer_urls_all: |
       {{ geth_rpc_services.results
       | selectattr("json", "defined")
       | sum(attribute="json", start=[])

ansible/vars/nimbus-sepolia-trial.yml

@@ -28,9 +28,9 @@ beacon_node_build_frequency: 'daily'
 # Monitoring
 beacon_node_validator_monitor_auto: true
 beacon_node_validator_monitor_totals: true
-#Eth1 Sync
-beacon_node_web3_urls: ['ws://localhost:{{ nimbus_eth1_engine_ws_port }}']
-beacon_node_web3_jwt_secret: '{{ nimbus_eth1_jwt_secret }}'
+# Execution layer Enginer API
+beacon_node_exec_layer_urls: ['ws://localhost:{{ nimbus_eth1_engine_ws_port }}']
+beacon_node_exec_layer_jwt_secret: '{{ nimbus_eth1_jwt_secret }}'
 # Validators from nimbus-private repo¬
 beacon_node_dist_validators_enabled: '{{ node.start is defined and node.end is defined }}'
 beacon_node_dist_validators_start: '{{ node.start | mandatory }}'