Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ADD: Release Fixes #2097

Merged
merged 2 commits into from
Oct 17, 2024
Merged

ADD: Release Fixes #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb236e4
FIX: beaconcha button directing to validator page
NeoPlays Oct 17, 2024
9ac9ac3
FIX: Valdiator Exit Process
NeoPlays Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions launcher/src/backend/Monitoring.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3166,7 +3166,7 @@ rm -rf diskoutput
}

try {
const beaconAPIPort = beaconStatus.data[0].beacon.destinationPort;
const beaconAPIPort = beaconStatus.data[0].beacon.servicePort;
const serviceId = beaconStatus.data[0].sid;
if (!Array.isArray(pubkey)) {
pubkey = [pubkey];
Expand All @@ -3177,7 +3177,7 @@ rm -rf diskoutput
if (!output.includes("{") || !output.includes("}")) {
return {
pubkey: pubkey,
code: null,
code: /20[0-8] OK/.test(output) ? 200 : null,
msg: output,
};
}
Expand Down Expand Up @@ -3223,6 +3223,8 @@ rm -rf diskoutput
if (SSHService.checkExecError(runExitCommand) && runExitCommand.stderr) {
throw new Error(SSHService.extractExecError(runExitCommand));
}
if (!runExitCommand.stdout)
throw `ReturnCode: ${runExitCommand.rc}\nStderr: ${runExitCommand.stderr}\nStdout: ${runExitCommand.stdout}\nIs Your Consensus Client Running?`;

const response = parseRunExitCommandOutput(runExitCommand.stdout, pubkey);

Expand Down
14 changes: 14 additions & 0 deletions launcher/src/backend/ValidatorAccountManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ export class ValidatorAccountManager {

//Error handling
if (SSHService.checkExecError(result) && result.stderr) throw SSHService.extractExecError(result);
if (!result.stdout)
throw `ReturnCode: ${result.rc}\nStderr: ${result.stderr}\nStdout: ${result.stdout}\nIs Your Consensus Client Running?`;

const data = JSON.parse(result.stdout);
if (data.data === undefined) {
if (data.code === undefined || data.message === undefined) {
Expand Down Expand Up @@ -703,7 +706,18 @@ export class ValidatorAccountManager {

this.nodeConnection.taskManager.otherTasksHandler(ref, `Get Remote Keys`, true, result.stdout);

//Error handling
if (SSHService.checkExecError(result) && result.stderr) throw SSHService.extractExecError(result);
if (!result.stdout)
throw `ReturnCode: ${result.rc}\nStderr: ${result.stderr}\nStdout: ${result.stdout}\nIs Your Consensus Client Running?`;

const data = JSON.parse(result.stdout);
if (data.data === undefined) {
if (data.code === undefined || data.message === undefined) {
throw "Undexpected Error: " + result;
}
throw data.code + " " + data.message;
}
if (!data.data) data.data = [];

this.nodeConnection.taskManager.otherTasksHandler(ref);
Expand Down
2 changes: 1 addition & 1 deletion launcher/src/components/UI/staking-page/components/list/rows/KeyRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ const navToBeaconcha = (network) => {
holesky: "https://holesky.beaconcha.in/",
};

const url = urls[network];
const url = urls[network] + "validator/" + props.item.key;
if (url) {
window.open(url, "_blank");
} else {
Expand Down