Skip to content

Commit

Permalink
FIX: Release Fixes (#2194)
Browse files Browse the repository at this point in the history
* ADD: logs to debug

* FIX: lines warning

* FIX: removing imported dplg key

* REMOVE: log

* FIX: fetching dplg interval

* ADD: fetching dplg interval

* FIX: some fixes on lines

* REMOVE: CSM Website Link

* REMOVE: Log for prysm keystore mod change

* FIX: only get csm stats if lcom is running

* FIX: csm in queue value

* FIX: CSM stats somewhat

* FIX: missing translation

* FIX: preline issue

* FIX: wrong pass for dplg

* REMOVE: comments & logs

* FIX: open app twice

* FIX: format

---------

Co-authored-by: NeoPlays <[email protected]>
  • Loading branch information
MaxTheGeeek and NeoPlays authored Feb 21, 2025
1 parent 7d0dba3 commit c15655d
Show file tree
Hide file tree
Showing 18 changed files with 256 additions and 272 deletions.
10 changes: 8 additions & 2 deletions launcher/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
<router-view> </router-view>
</div>
</template>
<script>
export default {};
<script setup>
import { onMounted } from "vue";
onMounted(() => {
setTimeout(() => {
window.HSStaticMethods.autoInit();
}, 100);
});
</script>
<style>
* {
Expand Down
1 change: 1 addition & 0 deletions launcher/src/backend/Monitoring.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ export class Monitoring {
config: {
serviceID: config.id,
configVersion: config.configVersion,
env: config.env,
image: config.image,
imageVersion: config.imageVersion,
runningImageVersion: newState?.Image ? newState.Image.split(":").pop() : null,
Expand Down
3 changes: 1 addition & 2 deletions launcher/src/backend/ValidatorAccountManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,7 @@ export class ValidatorAccountManager {
walletPath = service.volumes.find((v) => v.servicePath == "/opt/app/data/wallets").destinationPath;
}
//Make sure keystores have correct permissions
const chmodResult = await this.nodeConnection.sshService.exec("chmod -Rv 600 " + walletPath + "/direct/accounts/*");
log.info(chmodResult.stdout);
await this.nodeConnection.sshService.exec("chmod -Rv 600 " + walletPath + "/direct/accounts/*");
if (walletPath) {
result = await this.nodeConnection.sshService.exec("cat " + walletPath + "/auth-token");
result.stdout = result.stdout
Expand Down
10 changes: 5 additions & 5 deletions launcher/src/backend/web3/CSM.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,9 @@ async function getNodeOperatorInfo(contract, nodeOperatorId) {
}

const nodeOperator = await contract.methods.getNodeOperator(nodeOperatorId).call();
const enqueuedCount = nodeOperator.enqueuedCount;

//log.info("Enqueued Count:", enqueuedCount);
return enqueuedCount;
return nodeOperator;
} catch (error) {
log.error("Error calling getNodeOperator:", error);
return null;
Expand Down Expand Up @@ -240,7 +239,8 @@ async function getSigningKeysWithQueueInfo(monitoring) {
}

// Retrieve enqueued count
const enqueuedCount = await getNodeOperatorInfo(contract, nodeOperatorId);
const nodeOperatorInfo = await getNodeOperatorInfo(contract, nodeOperatorId);
const enqueuedCount = nodeOperatorInfo.enqueuedCount;
if (enqueuedCount === null || enqueuedCount <= 0) {
log.info("No enqueued validators for this Node Operator.");
}
Expand All @@ -253,7 +253,7 @@ async function getSigningKeysWithQueueInfo(monitoring) {
}

// Retrieve the signing keys
const signingKeys = await getSigningKeys(contract, nodeOperatorId, 0, numberOfNoneWithdrawnKeys);
const signingKeys = await getSigningKeys(contract, nodeOperatorId, 0, nodeOperatorInfo.totalAddedKeys);
if (!signingKeys) {
log.info("Failed to retrieve signing keys.");
return null;
Expand Down Expand Up @@ -380,7 +380,7 @@ async function checkSigningKeys(keysArray, monitoring) {
}

// Retrieve enqueuedCount and ensure it's above 0
const enqueuedCount = await getNodeOperatorInfo(contract, nodeOperatorId);
const enqueuedCount = (await getNodeOperatorInfo(contract, nodeOperatorId)).enqueuedCount;
if (enqueuedCount === null || enqueuedCount <= 0) {
log.info("No enqueued validators for this Node Operator.");
return false;
Expand Down
Loading

0 comments on commit c15655d

Please sign in to comment.