FIX: SDVT Update Scripts (#1911)

* Update CharonService.js

* revert to failed when

* change reference command

* dont check for charon version

controls/roles/update-changes/tasks/2.1.5/charon_changes.yaml

@@ -12,16 +12,16 @@
 - name: Adjust Charon Config if connected to a NimbusBeaconService
   lineinfile:
     path: "{{ config_file_path }}"
-    insertafter: "--beacon-node-endpoints"
-    line: "{{ service_configuration_text | split('\n') | select('match', '^\\s*- --beacon-node-endpoints') | first | split('-') | first }}- --feature-set-enable=json_requests"
+    insertafter: "--validator-api-address"
+    line: "{{ service_configuration_text | split('\n') | select('match', '^\\s*- --validator-api-address') | first | split('-') | first }}- --feature-set-enable=json_requests"
   when:
     - service_configuration.dependencies.consensusClients | selectattr('service', 'equalto', 'NimbusBeaconService') | list | length > 0
     - service_configuration.command | select('match', '--feature-set-enable=json_requests') | length == 0
 
 - name: add builder tag if not present
   lineinfile:
     path: "{{ config_file_path }}"
-    insertafter: "--beacon-node-endpoints"
-    line: "{{ service_configuration_text | split('\n') | select('match', '^\\s*- --beacon-node-endpoints') | first | split('-') | first }}- --builder-api"
+    insertafter: "--validator-api-address"
+    line: "{{ service_configuration_text | split('\n') | select('match', '^\\s*- --validator-api-address') | first | split('-') | first }}- --builder-api"
   when:
     - service_configuration.command | select('match', '--builder-api') | length == 0

controls/roles/update-changes/tasks/2.1.5/charon_teku_changes.yaml

@@ -12,7 +12,7 @@
 - name: Check if service_configuration.id is in any of the filtered_files
   shell: "grep -lq '{{ service_configuration.id }}' {{ item }}"
   loop: "{{ filtered_files }}"
-  ignore_errors: true
+  failed_when: false
   register: grep_result
   changed_when: false
 

controls/roles/update-changes/tasks/2.1.5/updates-215.yaml

@@ -9,9 +9,9 @@
   loop: "{{ service_config_files.files }}"
 
 - name: Filter files that contain both regex patterns
-  shell: "grep -rlE 'service: CharonService' /etc/stereum/services | xargs grep -lE 'image: obolnetwork/charon:v1\\.[0-9]+\\.[0-9]+'"
+  shell: "grep -rlE '^service: CharonService' /etc/stereum/services"
   register: grep_result
-  ignore_errors: true
+  failed_when: false
   changed_when: false
 
 - name: Set fact for filtered files
@@ -26,7 +26,7 @@
   shell: "grep -lE '{{ uuids | join('|') }}' {{ item.path }}"
   with_items: "{{ service_config_files.files }}"
   register: uuid_grep_result
-  ignore_errors: true
+  failed_when: false
   changed_when: false
   when: uuids | length > 0
 

launcher/src/backend/ethereum-services/CharonService.js

@@ -33,6 +33,7 @@ export class CharonService extends NodeService {
         "--p2p-tcp-address=0.0.0.0:3610",
         "--validator-api-address=0.0.0.0:3600",
         "--monitoring-address=0.0.0.0:3620",
+        "--builder-api"
       ], // command
       ["/usr/local/bin/charon"], // entrypoint
       null, // env