FIX: Lighthouse enr tag (#1912)

* ADD: Update Script to remove tags * Update Dashboard * REMOVE: Old tests, and adjust scripts * ADD: Conditional * REMOVE: Tests from Actions * FIX: Filter * FIX: Name and lookup * ADD: Adjustments for new Setups as well * ADD: Builder Tag * FIX: Indentation * FIX: Lighthouse enr tag
stereum-dev · Jun 13, 2024 · 603cb72 · 603cb72
1 parent 7c64450
commit 603cb72
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 1 deletion.
diff --git a/controls/roles/update-changes/molecule/215/prepare.yml b/controls/roles/update-changes/molecule/215/prepare.yml
@@ -347,6 +347,58 @@
             otherServices: []
       become: yes
 
+    - name: Create LighthouseBeaconService config
+      copy:
+        dest: "/etc/stereum/services/9f852a5c-2f52-c1a6-24ff-5256fed2cdb9.yaml"
+        owner: "root"
+        group: "root"
+        mode: 0644
+        content: |
+          service: LighthouseBeaconService
+          id: 9f852a5c-2f52-c1a6-24ff-5256fed2cdb9
+          configVersion: 1
+          command:
+            - lighthouse
+            - bn
+            - --debug-level=info
+            - --network=holesky
+            - --execution-endpoint=
+            - --execution-jwt=/engine.jwt
+            - --eth1-blocks-per-log-query=150
+            - --datadir=/opt/app/beacon
+            - --http
+            - --http-address=0.0.0.0
+            - --metrics
+            - --metrics-address=0.0.0.0
+            - --disable-upnp
+            - --validator-monitor-auto
+            - --slasher
+            - --slasher-dir=/opt/app/slasher
+            - --port=9000
+            - --enr-tcp-port=9000
+            - --enr-udp-port=9000
+            - --disable-enr-auto-update=false
+            - --allow-insecure-genesis-sync
+          entrypoint: []
+          env: {}
+          image: sigp/lighthouse:v5.2.0
+          ports:
+            - 0.0.0.0:9002:9000/tcp
+            - 0.0.0.0:9002:9000/udp
+            - 127.0.0.1:5054:5052/tcp
+          volumes:
+            - /opt/stereum/lighthouse-9f852a5c-2f52-c1a6-24ff-5256fed2cdb9/beacon:/opt/app/beacon
+            - /opt/stereum/lighthouse-9f852a5c-2f52-c1a6-24ff-5256fed2cdb9/slasher:/opt/app/slasher
+          user: "2000"
+          autoupdate: true
+          network: holesky
+          dependencies:
+            executionClients: []
+            consensusClients: []
+            mevboost: []
+            otherServices: []
+      become: yes
+
     - name: Create NimbusBeaconService config
       copy:
         dest: "/etc/stereum/services/4c8bcca8-5464-2790-11f5-07b3d326ca7c.yaml"

diff --git a/controls/roles/update-changes/molecule/215/verify.yml b/controls/roles/update-changes/molecule/215/verify.yml
@@ -45,6 +45,12 @@
         src: "/etc/stereum/services/314b878c-0589-f5b1-5a59-46b07066e53a.yaml"
       register: charon_service_configuration_raw
 
+    # Charon
+    - name: Read LighthouseBeacon file
+      slurp:
+        src: "/etc/stereum/services/9f852a5c-2f52-c1a6-24ff-5256fed2cdb9.yaml"
+      register: lh_beacon_service_configuration_raw
+
     - name: Parse Service configurations
       set_fact:
         Ejector_service_configuration: "{{ Ejector_service_configuration_raw['content'] | b64decode | from_yaml }}"
@@ -54,6 +60,7 @@
         Lighthouse_service_configuration: "{{ Lighthouse_service_configuration_raw['content'] | b64decode | from_yaml }}"
         Teku_Beacon_service_configuration: "{{ Teku_Beacon_service_configuration_raw['content'] | b64decode | from_yaml }}"
         charon_service_configuration: "{{ charon_service_configuration_raw['content'] | b64decode | from_yaml }}"
+        lh_beacon_service_configuration: "{{ lh_beacon_service_configuration_raw['content'] | b64decode | from_yaml }}"
 
     - debug:
         msg: "{{ Ejector_service_configuration }}"
@@ -80,6 +87,9 @@
     - debug:
         msg: "{{ charon_service_configuration }}"
 
+    - debug:
+        msg: "{{ lh_beacon_service_configuration }}"
+
     - assert:
         that:
           - Ejector_service_configuration.env.ORACLE_ADDRESSES_ALLOWLIST | from_yaml | length == 10
@@ -90,4 +100,5 @@
           - Teku_Beacon_service_configuration.command | select('match', '--validators-graffiti-client-append-format=DISABLED') | length == 1
           - charon_service_configuration.command | select('match', '--feature-set-enable=json_requests') | length == 1
           - charon_service_configuration.command | select('match', '--builder-api') | length == 1
+          - lh_beacon_service_configuration.command | select('match', '--disable-enr-auto-update=false') | length == 0
 # EOF
diff --git a/controls/roles/update-changes/tasks/2.1.5/lighthouse_changes.yaml b/controls/roles/update-changes/tasks/2.1.5/lighthouse_changes.yaml
@@ -0,0 +1,18 @@
+---
+- name: Read service file
+  slurp:
+    src: "{{ item.path }}"
+  register: service_configuration_raw
+
+- name: Parse service's configuration
+  set_fact:
+    service_configuration: "{{ service_configuration_raw['content'] | b64decode | from_yaml }}"
+    service_configuration_text: "{{ service_configuration_raw['content'] | b64decode }}"
+
+- name: Adjust Lighthouse Config
+  lineinfile:
+    path: "{{ item.path }}"
+    regexp: "--disable-enr-auto-update=false"
+    state: absent
+  when:
+    - service_configuration.service == "LighthouseBeaconService"
diff --git a/controls/roles/update-changes/tasks/2.1.5/updates-215.yaml b/controls/roles/update-changes/tasks/2.1.5/updates-215.yaml
@@ -57,3 +57,7 @@
 - name: Include Charon Teku Changes
   include_tasks: charon_teku_changes.yaml
   loop: "{{ service_config_files.files }}"
+
+- name: Include Lighthouse Changes
+  include_tasks: lighthouse_changes.yaml
+  loop: "{{ service_config_files.files }}"
diff --git a/launcher/src/backend/ethereum-services/LighthouseBeaconService.js b/launcher/src/backend/ethereum-services/LighthouseBeaconService.js
@@ -63,7 +63,6 @@ export class LighthouseBeaconService extends NodeService {
         "--port=9000",
         "--enr-tcp-port=9000",
         "--enr-udp-port=9000",
-        "--disable-enr-auto-update=false",
       ], //command
       null, //entrypoint
       null, //env