Fixed network switching

Author: SergeevDmitry

controls/roles/manage-service/tasks/main.yml

@@ -74,6 +74,23 @@
       with_items: "{{ stereum_service_configuration.ports }}"
       when: stereum.manage_service.state != "restarted" and stereum_service_configuration.ports is defined
 
+    - name: Get engine.jwt stat
+      stat:
+        path: "{{ stereum_service_configuration.volumes | select('search', ':/engine.jwt') | first | split(':') | first }}"
+      become: yes
+      register: jwt_file
+      when:
+        - stereum.manage_service.state == "started" or stereum.manage_service.state == "restarted"
+        - stereum_service_configuration.service in ['GethService', 'PrysmBeaconService']
+        - stereum_service_configuration.volumes | select('search', ':/engine.jwt') | length > 0
+
+    - name: Delete engine.jwt directory
+      file:
+        path: "{{ jwt_file.stat.path }}"
+        state: absent
+      become: yes
+      when: jwt_file.stat.isdir is defined and jwt_file.stat.isdir
+
     - name: Generate JWT (execution client only)
       copy:
         content: "ff{{ query('community.general.random_string', override_all=hex_chars, length=62) | first }}"

launcher/src/backend/ServiceManager.js

@@ -5,7 +5,7 @@ import { CharonService } from "./ethereum-services/CharonService";
 import { PrometheusService } from "./ethereum-services/PrometheusService";
 import { PrometheusNodeExporterService } from "./ethereum-services/PrometheusNodeExporterService";
 import { GrafanaService } from "./ethereum-services/GrafanaService";
-import { PrysmBeaconService } from "./ethereum-services/PrysmBeaconService";
+import { PrysmBeaconService, checkpointSyncUrls } from "./ethereum-services/PrysmBeaconService";
 import { PrysmValidatorService } from "./ethereum-services/PrysmValidatorService";
 import { FlashbotsMevBoostService } from "./ethereum-services/FlashbotsMevBoostService";
 import { ServicePort, servicePortProtocol, changeablePorts } from "./ethereum-services/ServicePort";
@@ -16,7 +16,7 @@ import { MetricsExporterService } from "./ethereum-services/MetricsExporterServi
 import { ExternalConsensusService } from "./ethereum-services/ExternalConsensusService";
 import { ExternalExecutionService } from "./ethereum-services/ExternalExecutionService";
 import { CustomService } from "./ethereum-services/CustomService";
-import { LssEjectorService } from "./ethereum-services/LssEjectorService";
+import { LssEjectorService, stakingContractAddresses } from "./ethereum-services/LssEjectorService";
 import { ConfigManager } from "./ConfigManager";
 import YAML from "yaml";
 // import { file } from "jszip";
@@ -1300,22 +1300,37 @@ export class ServiceManager {
       isString = true;
       command = command.replaceAll(/\n/gm, "").replaceAll(/\s\s+/gm, " ").split(" ");
     }
+    if (newNetwork === 'stratis') {
+      newNetwork = 'mainnet'
+    }
     if (service.service === "FlashbotsMevBoostService") {
       command = service.entrypoint;
-      let index = command.findIndex((c) => /^-(stratis|auroria$)/.test(c));
+      let index = command.findIndex((c) => /^-(mainnet|stratis|auroria$)/.test(c));
       command[index] = "-" + newNetwork;
       index = command.findIndex((c) => c === "-relays") + 1;
       command[index] = '""';
     } else if (service.service === "PrysmBeaconService") {
-      let index = command.findIndex((c) => /--(stratis|auroria)/.test(c));
-      command[index] = "--" + newNetwork;
+      let networkIndex = command.findIndex((c) => /--(mainnet|stratis|auroria)/.test(c));
+      if (networkIndex !== -1) {
+        command[networkIndex] = "--" + newNetwork;
+      } else {
+        command.push(`--${newNetwork}`)
+      }
+
+      const checkpointSyncIndex = command.findIndex(c => /--checkpoint-sync-url/.test(c))
+      if (checkpointSyncIndex !== -1) {
+        command[checkpointSyncIndex] = `--checkpoint-sync-url=${checkpointSyncUrls[newNetwork === 'mainnet' ? 'stratis' : newNetwork]}`
+      }
+    } else if (service.service === 'LssEjectorService') {
+      const index = command.findIndex(c => /--staking_address/.test(c))
+      command[index] = `--staking_address=${stakingContractAddresses[newNetwork === 'mainnet' ? 'stratis' : newNetwork]}`
     } else {
-      command = command.map((c) => {
-        if (/stratis|auroria/.test(c)) {
-          c = c.replace(/stratis|auroria/, newNetwork);
-        }
-        return c;
-      });
+      let networkIndex = command.findIndex((c) => /--(mainnet|stratis|auroria)/.test(c));
+      if (networkIndex !== -1) {
+        command[networkIndex] = "--" + newNetwork;
+      } else {
+        command.push(`--${newNetwork}`)
+      }
     }
     if (isString) return command.join(" ").trim();
     return command;
@@ -1332,6 +1347,15 @@ export class ServiceManager {
       service.network = newNetwork;
     }
     await this.createKeystores(services);
+    services.sort((a, b) => {
+      if (a.service === 'GethService' || b.service === 'LssEjectorService') {
+        return -1
+      } else if (b.service === 'GethService' || a.service === 'LssEjectorService') {
+        return 1
+      }
+
+      return 0
+    })
     await Promise.all(
       services.map(async (service) => {
         await this.nodeConnection.writeServiceConfiguration(service.buildConfiguration());

launcher/src/backend/ValidatorAccountManager.js

@@ -107,7 +107,7 @@ export class ValidatorAccountManager {
           await this.nodeConnection.sshService.exec(`chown 2000:2000 ${passwords_path}/wallet-password`);
           //Prysm - Create wallet for account(s)
           await this.nodeConnection.sshService.exec(
-            `docker exec stereum-${client.id} /app/cmd/validator/validator wallet create --wallet-dir=/opt/app/data/wallets --wallet-password-file=/opt/app/data/passwords/wallet-password --accept-terms-of-use --keymanager-kind=direct --auroria`
+            `docker exec stereum-${client.id} /app/cmd/validator/validator wallet create --wallet-dir=/opt/app/data/wallets --wallet-password-file=/opt/app/data/passwords/wallet-password --accept-terms-of-use --keymanager-kind=direct`
           );
 
           await this.nodeConnection.sshService.exec(`chown -R 2000:2000 ${wallet_path}`);

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

@@ -35,7 +35,9 @@ export class GethService extends NodeService {
       "--syncmode=full",
     ]
 
-    if (network !== 'stratis') {
+    if (network == 'stratis') {
+      command.unshift('--mainnet')
+    } else {
       command.unshift(`--${network}`)
     }
 

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

@@ -1,6 +1,11 @@
 import { NodeService } from "./NodeService";
 import { ServiceVolume } from "./ServiceVolume";
 
+export const stakingContractAddresses = {
+  stratis: '0x16CFc478175C222a1eC558baAE290593f175514F',
+  auroria: '0x0504D06711d02E6275e1724529a801441088f9f4',
+}
+
 export class LssEjectorService extends NodeService {
   static buildByUserInput(network, executionClients, consensusClients, otherServices) {
     const service = new LssEjectorService();
@@ -16,8 +21,8 @@ export class LssEjectorService extends NodeService {
     })
     .join();
 
-    const allAccountsKeystoreDir = '/config/all-accounts.keystore.json'
-    const walletPasswordDir = '/config/wallet-password'
+    const allAccountsKeystoreDir = '/config/wallets'
+    const walletPasswordDir = '/config/passwords'
 
     const validatorService = otherServices.find(s => s.service.includes('PrysmValidator'))
 
@@ -29,15 +34,10 @@ export class LssEjectorService extends NodeService {
     ).destinationPath
 
     const volumes = [
-      new ServiceVolume(`${walletsDir}/direct/accounts/all-accounts.keystore.json`, allAccountsKeystoreDir, 'ro'),
-      new ServiceVolume(`${passwordsDir}/wallet-password`, walletPasswordDir, 'ro'),
+      new ServiceVolume(walletsDir, allAccountsKeystoreDir, 'ro'),
+      new ServiceVolume(passwordsDir, walletPasswordDir, 'ro'),
     ]
 
-    let stakingContractAddress = '0x16CFc478175C222a1eC558baAE290593f175514F'
-    if (network === 'auroria') {
-      stakingContractAddress = '0x0504D06711d02E6275e1724529a801441088f9f4'
-    }
-
     service.init(
       "LssEjectorService", //service
       service.id, // id
@@ -49,9 +49,9 @@ export class LssEjectorService extends NodeService {
         '--all_accounts_file',
         `--consensus_endpoint=${consensusEndpoint}`,
         `--execution_endpoint=${executionEndpoint}`,
-        `--keys_dir=${allAccountsKeystoreDir}`,
-        `--keystore_password_file=${walletPasswordDir}`,
-        `--staking_address=${stakingContractAddress}`
+        `--keys_dir=${allAccountsKeystoreDir}/direct/accounts/all-accounts.keystore.json`,
+        `--keystore_password_file=${walletPasswordDir}/wallet-password`,
+        `--staking_address=${stakingContractAddresses[network]}`
       ], // command
       ["lss-ejector"], // entrypoint
       null, // env

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

@@ -2,6 +2,11 @@ import { NodeService } from "./NodeService.js";
 import { ServicePortDefinition } from "./SerivcePortDefinition.js";
 import { ServiceVolume } from "./ServiceVolume.js";
 
+export const checkpointSyncUrls = {
+  stratis: 'https://checkpoint.stratisevm.com/',
+  auroria: 'https://auroria.checkpoint.stratisevm.com/',
+}
+
 export class PrysmBeaconService extends NodeService {
   static buildByUserInput(network, ports, dir, executionClients, mevboost, checkpointURL) {
     const service = new PrysmBeaconService();
@@ -68,7 +73,9 @@ export class PrysmBeaconService extends NodeService {
       mevboost //mevboost
     );
 
-    if (network !== 'stratis') {
+    if (network === 'stratis') {
+      service.command.push(`--mainnet`)
+    } else {
       service.command.push(`--${network}`)
     }
 

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

@@ -69,7 +69,9 @@ export class PrysmValidatorService extends NodeService {
       consensusClients //consensusClients
     );
 
-    if (network !== 'stratis') {
+    if (network === 'stratis') {
+      service.command.push(`--mainnet`)
+    } else {
       service.command.push(`--${network}`)
     }