From fbc0433fd20806ea4227324f1e09f14532750571 Mon Sep 17 00:00:00 2001 From: SergeevDmitry Date: Mon, 24 Jun 2024 20:08:08 +0300 Subject: [PATCH] Skip sync step on one click install; fixed network name for services --- .../backend/ethereum-services/GethService.js | 54 ++++++++++--------- .../ethereum-services/PrysmBeaconService.js | 8 +-- .../PrysmValidatorService.js | 8 +-- .../components/presets/PresetBody.vue | 15 +++--- .../components/verify/VerifyBody.vue | 8 +++ .../components/verify/VerifyFooter.vue | 2 +- launcher/src/composables/nextRoute.js | 18 +++---- 7 files changed, 59 insertions(+), 54 deletions(-) diff --git a/launcher/src/backend/ethereum-services/GethService.js b/launcher/src/backend/ethereum-services/GethService.js index 272070637..f2776f792 100755 --- a/launcher/src/backend/ethereum-services/GethService.js +++ b/launcher/src/backend/ethereum-services/GethService.js @@ -14,37 +14,41 @@ export class GethService extends NodeService { new ServiceVolume(workingDir + "/engine.jwt", JWTDir), ]; + const command = [ + `--datadir=${dataDir}`, + "--http", + "--http.port=8545", + "--http.addr=0.0.0.0", + "--http.vhosts=*", + "--http.api=eth,web3,net", + "--http.corsdomain=*", + "--ws", + "--ws.port=8546", + "--ws.addr=0.0.0.0", + "--ws.api=eth,net,web3", + "--ws.origins=*", + "--authrpc.port=8551", + "--authrpc.addr=0.0.0.0", + "--authrpc.vhosts=*", + "--authrpc.jwtsecret=/engine.jwt", + "--metrics", + "--metrics.expensive", + "--metrics.port=6060", + "--metrics.addr=0.0.0.0", + "--syncmode=full", + ] + + if (network !== 'stratis') { + command.unshift(`--${network}`) + } + service.init( "GethService", // service service.id, // id 1, // configVersion "stratisevm/go-stratis", // image "latest", // imageVersion - [ - `--${network}`, - `--datadir=${dataDir}`, - "--state.scheme=path", - "--http", - "--http.port=8545", - "--http.addr=0.0.0.0", - "--http.vhosts=*", - "--http.api=eth,web3,net", - "--http.corsdomain=*", - "--ws", - "--ws.port=8546", - "--ws.addr=0.0.0.0", - "--ws.api=eth,net,web3", - "--ws.origins=*", - "--authrpc.port=8551", - "--authrpc.addr=0.0.0.0", - "--authrpc.vhosts=*", - "--authrpc.jwtsecret=/engine.jwt", - "--metrics", - "--metrics.expensive", - "--metrics.port=6060", - "--metrics.addr=0.0.0.0", - "--syncmode=full", - ], // command + command, // command ["geth"], // entrypoint null, // env ports, // ports diff --git a/launcher/src/backend/ethereum-services/PrysmBeaconService.js b/launcher/src/backend/ethereum-services/PrysmBeaconService.js index 3b1140d7a..5fec6d587 100755 --- a/launcher/src/backend/ethereum-services/PrysmBeaconService.js +++ b/launcher/src/backend/ethereum-services/PrysmBeaconService.js @@ -41,10 +41,6 @@ export class PrysmBeaconService extends NodeService { let builderCommand = mevboostEndpoint ? " --http-mev-relay=" + mevboostEndpoint : ""; let checkpointCommand = checkpointURL ? " --checkpoint-sync-url=" + checkpointURL : ""; - if (network === 'stratis') { - network = 'mainnet' - } - service.init( "PrysmBeaconService", //service service.id, //id @@ -53,8 +49,8 @@ export class PrysmBeaconService extends NodeService { "latest", //imageVersion "/app/cmd/beacon-chain/beacon-chain --accept-terms-of-use=true --datadir=" + dataDir + - ' --p2p-host-dns="" --' + - network + + ' --p2p-host-dns="" ' + + (network === 'stratis' ? '' : `--${network}`) + " --block-batch-limit=512" + " --rpc-host=0.0.0.0 --grpc-gateway-host=0.0.0.0 --p2p-max-peers=100 --execution-endpoint=" + executionEndpoint + diff --git a/launcher/src/backend/ethereum-services/PrysmValidatorService.js b/launcher/src/backend/ethereum-services/PrysmValidatorService.js index 151b89b28..91b06f7f8 100755 --- a/launcher/src/backend/ethereum-services/PrysmValidatorService.js +++ b/launcher/src/backend/ethereum-services/PrysmValidatorService.js @@ -33,10 +33,6 @@ export class PrysmValidatorService extends NodeService { }) .join(); - if (network === 'stratis') { - network = 'mainnet' - } - service.init( "PrysmValidatorService", //service service.id, //id @@ -47,8 +43,8 @@ export class PrysmValidatorService extends NodeService { provider + '" --beacon-rpc-gateway-provider="' + providerGateway + - '" --web --' + - network + + '" --web ' + + (network === 'stratis' ? '' : `--${network}`) + " --datadir=" + dataDir + " --wallet-dir=" + diff --git a/launcher/src/components/UI/one-click/components/presets/PresetBody.vue b/launcher/src/components/UI/one-click/components/presets/PresetBody.vue index f419afa81..53bcb56a1 100644 --- a/launcher/src/components/UI/one-click/components/presets/PresetBody.vue +++ b/launcher/src/components/UI/one-click/components/presets/PresetBody.vue @@ -112,11 +112,11 @@ const openDropdown = ref(false); //watchers -watch(displayItem, () => { - if (displayItem.value === "Click to select a network") { - clickStore.selectedPreset = null; - } -}); +// watch(displayItem, () => { +// if (displayItem.value === "Click to select a network") { +// clickStore.selectedPreset = null; +// } +// }); //Lifecycle @@ -124,8 +124,6 @@ onMounted(() => { clickStore.installMonitoring = false; displayItem.value = "Click to select a network"; // clickStore.presets.forEach((p) => (p.selected = false)); - // Select `staking` preset by default - emit("installPreset", clickStore.presets.find((p) => p.name === 'staking')) }); //Methods @@ -138,6 +136,9 @@ const getNetwork = (network) => { clickStore.presets.forEach((p) => (p.selected = false)); manageStore.currentNetwork = network; displayItem.value = network; + // Select `staking` preset by default + const preset = clickStore.presets.find((p) => p.name === 'staking') + getPreset(preset) }; const getPreset = (preset) => { diff --git a/launcher/src/components/UI/one-click/components/verify/VerifyBody.vue b/launcher/src/components/UI/one-click/components/verify/VerifyBody.vue index 1843c6f16..107a8c396 100644 --- a/launcher/src/components/UI/one-click/components/verify/VerifyBody.vue +++ b/launcher/src/components/UI/one-click/components/verify/VerifyBody.vue @@ -41,15 +41,23 @@ import { ref, onMounted } from 'vue'; diff --git a/launcher/src/components/UI/one-click/components/verify/VerifyFooter.vue b/launcher/src/components/UI/one-click/components/verify/VerifyFooter.vue index 2d872e3a7..3b648669a 100644 --- a/launcher/src/components/UI/one-click/components/verify/VerifyFooter.vue +++ b/launcher/src/components/UI/one-click/components/verify/VerifyFooter.vue @@ -4,7 +4,7 @@ @mousedown.prevent > {{ $t("customFooter.back") }} diff --git a/launcher/src/composables/nextRoute.js b/launcher/src/composables/nextRoute.js index e03da06f8..0dcb0438a 100644 --- a/launcher/src/composables/nextRoute.js +++ b/launcher/src/composables/nextRoute.js @@ -14,15 +14,15 @@ export function goToNext() { case "/oneClick/preset": return "/oneClick/config"; case "/oneClick/config": - if (installStore.selectedPreset.includedPlugins.some((plugin) => plugin.service === "FlashbotsMevBoostService")) { - return "/oneClick/mevboost"; - } else { - return "/oneClick/sync"; - } - case "/oneClick/mevboost": - return "/oneClick/sync"; - case "/oneClick/sync": - return "/oneClick/verify"; + // if (installStore.selectedPreset.includedPlugins.some((plugin) => plugin.service === "FlashbotsMevBoostService")) { + // return "/oneClick/mevboost"; + // } else { + return "/oneClick/verify"; + // } + // case "/oneClick/mevboost": + // return "/oneClick/verify"; + // case "/oneClick/sync": + // return "/oneClick/verify"; case "/oneClick/verify": return "/oneClick/launch"; default: