REMOVE: SSV Changes

stereum-dev · Oct 17, 2024 · 17783d0 · 17783d0
1 parent 82bb87d
commit 17783d0
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 145 deletions.
diff --git a/controls/roles/update-changes/molecule/223/prepare.yml b/controls/roles/update-changes/molecule/223/prepare.yml
@@ -209,68 +209,6 @@
             otherServices: []
       become: yes
 
-    - name: Create SSVNetworkService config
-      copy:
-        dest: "/etc/stereum/services/cb941f15-6eef-4e4d-fc81-4d524b627373.yaml"
-        owner: "root"
-        group: "root"
-        mode: 0644
-        content: |
-          service: SSVNetworkService
-          id: cb941f15-6eef-4e4d-fc81-4d524b627373
-          configVersion: 1
-          command: make BUILD_PATH=/go/bin/ssvnode start-node && docker logs ssv_node
-          entrypoint: []
-          env:
-            CONFIG_PATH: /data/config.yaml
-          image: bloxstaking/ssv-node:v1.3.8
-          ports:
-            - 0.0.0.0:12000:12000/udp
-            - 0.0.0.0:13000:13000/tcp
-          volumes:
-            - /opt/stereum/ssv_network-cb941f15-6eef-4e4d-fc81-4d524b627373/data:/data
-            - /opt/stereum/ssv_network-cb941f15-6eef-4e4d-fc81-4d524b627373/secrets:/secrets
-          user: "2000"
-          autoupdate: true
-          network: holesky
-          dependencies:
-            executionClients: []
-            consensusClients: []
-            mevboost: []
-            otherServices: []
-      become: yes
-
-    - name: Create SSVNetworkService config
-      copy:
-        dest: "/etc/stereum/services/611cf17d-adf7-433e-bc4e-2e38c0f502c3.yaml"
-        owner: "root"
-        group: "root"
-        mode: 0644
-        content: |
-          service: SSVNetworkService
-          id: 611cf17d-adf7-433e-bc4e-2e38c0f502c3
-          configVersion: 1
-          command: make BUILD_PATH=/go/bin/ssvnode start-node && docker logs ssv_node
-          entrypoint: []
-          env:
-            CONFIG_PATH: /data/config.yaml
-          image: ssvlabs/ssv-node:v1.3.8
-          ports:
-            - 0.0.0.0:12000:12000/udp
-            - 0.0.0.0:13000:13000/tcp
-          volumes:
-            - /opt/stereum/ssv_network-611cf17d-adf7-433e-bc4e-2e38c0f502c3/data:/data
-            - /opt/stereum/ssv_network-611cf17d-adf7-433e-bc4e-2e38c0f502c3/secrets:/secrets
-          user: "2000"
-          autoupdate: true
-          network: holesky
-          dependencies:
-            executionClients: []
-            consensusClients: []
-            mevboost: []
-            otherServices: []
-      become: yes
-
     - name: Create ValidatorEjectorService config
       copy:
         dest: "/etc/stereum/services/3911cf56-f350-5fc7-dded-1d08da1a9954.yaml"

diff --git a/controls/roles/update-changes/molecule/223/verify.yml b/controls/roles/update-changes/molecule/223/verify.yml
@@ -33,18 +33,6 @@
         src: "/etc/stereum/services/580c2c43-ad2a-405d-ab78-eb3678383f59.yaml"
       register: Erigon_service_configuration2_raw
 
-    # SSVNetworkService
-    - name: Read SSVNetworkService file
-      slurp:
-        src: "/etc/stereum/services/cb941f15-6eef-4e4d-fc81-4d524b627373.yaml"
-      register: SSVNetwork_service_configuration_raw
-
-    # SSVNetworkService2
-    - name: Read SSVNetworkService file
-      slurp:
-        src: "/etc/stereum/services/611cf17d-adf7-433e-bc4e-2e38c0f502c3.yaml"
-      register: SSVNetwork_service_configuration2_raw
-
     # FlashbotsMevBoostService
     - name: Read FlashbotsMevBoostService file
       slurp:
@@ -64,8 +52,6 @@
         Ejector_service_configuration3: "{{ Ejector_service_configuration3_raw['content'] | b64decode | from_yaml }}"
         Erigon_service_configuration: "{{ Erigon_service_configuration_raw['content'] | b64decode | from_yaml }}"
         Erigon_service_configuration2: "{{ Erigon_service_configuration2_raw['content'] | b64decode | from_yaml }}"
-        SSVNetwork_service_configuration: "{{ SSVNetwork_service_configuration_raw['content'] | b64decode | from_yaml }}"
-        SSVNetwork_service_configuration2: "{{ SSVNetwork_service_configuration2_raw['content'] | b64decode | from_yaml }}"
         Mev_service_configuration: "{{ Mev_service_configuration_raw['content'] | b64decode | from_yaml }}"
         Mev_service_configuration2: "{{ Mev_service_configuration2_raw['content'] | b64decode | from_yaml }}"
 
@@ -94,16 +80,6 @@
     - debug:
         msg: "{{ Erigon_service_configuration2_raw['content'] | b64decode }}"
 
-    - debug:
-        msg: "{{ SSVNetwork_service_configuration }}"
-    - debug:
-        msg: "{{ SSVNetwork_service_configuration_raw['content'] | b64decode }}"
-
-    - debug:
-        msg: "{{ SSVNetwork_service_configuration2 }}"
-    - debug:
-        msg: "{{ SSVNetwork_service_configuration2_raw['content'] | b64decode }}"
-
     - debug:
         msg: "{{ Mev_service_configuration }}"
     - debug:
@@ -124,8 +100,6 @@
           - Ejector_service_configuration3.env.ORACLE_ADDRESSES_ALLOWLIST | from_yaml | select('match', '0x3799bDA7B884D33F79CEC926af21160dc47fbe05') | length == 0
           - Erigon_service_configuration.image | split(':') | first == 'erigontech/erigon'
           - Erigon_service_configuration2.image == 'erigontech/erigon:v2.60.8'
-          - SSVNetwork_service_configuration.image | split(':') | first == 'ssvlabs/ssv-node'
-          - SSVNetwork_service_configuration2.image == 'ssvlabs/ssv-node:v1.3.8'
           - Mev_service_configuration.entrypoint | select('match', 'eden') | length == 0
           - Mev_service_configuration2.entrypoint | select('match', 'eden') | length == 0
 # EOF
diff --git a/controls/roles/update-changes/tasks/2.2.3/ssv_changes.yaml b/controls/roles/update-changes/tasks/2.2.3/ssv_changes.yaml
diff --git a/controls/roles/update-changes/tasks/2.2.3/updates-223.yaml b/controls/roles/update-changes/tasks/2.2.3/updates-223.yaml
@@ -16,12 +16,6 @@
   loop_control:
     loop_var: config_file
 
-- name: Include SSV Changes
-  include_tasks: ssv_changes.yaml
-  loop: "{{ service_config_files.files }}"
-  loop_control:
-    loop_var: config_file
-
 - name: Include MEV Changes
   include_tasks: mev_changes.yaml
   loop: "{{ service_config_files.files }}"

diff --git a/launcher/src/backend/ethereum-services/SSVNetworkService.js b/launcher/src/backend/ethereum-services/SSVNetworkService.js
@@ -51,7 +51,7 @@ MetricsAPIPort: 15000`;
     service.setId();
     const workingDir = service.buildWorkingDir(dir);
 
-    const image = "ssvlabs/ssv-node";
+    const image = "bloxstaking/ssv-node";
 
     const volumes = [new ServiceVolume(workingDir + "/data", "/data"), new ServiceVolume(workingDir + "/secrets", "/secrets")];
 

diff --git a/launcher/src/backend/tests/unit/SSVNetworkService.test.js b/launcher/src/backend/tests/unit/SSVNetworkService.test.js
@@ -56,7 +56,7 @@ test("buildConfiguration", () => {
   expect(ssvService.ports).toHaveLength(2);
   expect(ssvService.id).toHaveLength(36);
   expect(ssvService.user).toMatch(/2000/);
-  expect(ssvService.image).toMatch(/ssvlabs\/ssv-node/);
+  expect(ssvService.image).toMatch(/bloxstaking\/ssv-node/);
   expect(ssvService.configVersion).toBe(1);
 });
 

diff --git a/launcher/src/components/UI/services-modal/SsvModal.vue b/launcher/src/components/UI/services-modal/SsvModal.vue
@@ -384,7 +384,7 @@ export default {
       this.ssvTotalConfig = await ControlService.getSSVTotalConfig(this.ssvService.config.serviceID);
 
       // TODO: check image min version
-      // const imageTag = 'ssvlabs/ssv-node:v1.0.1-hotfix';
+      // const imageTag = 'bloxstaking/ssv-node:v1.0.1-hotfix';
       // const minimumVersion = '1.1.0';
       const imageTag = this.ssvTotalConfig.ssvServiceConfig.image;
       const minimumVersion = "v1.3.0";