Skip to content

Commit c15655d

Browse files
FIX: Release Fixes (#2194)
* 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]>
1 parent 7d0dba3 commit c15655d

File tree

18 files changed

+256
-272
lines changed

18 files changed

+256
-272
lines changed

launcher/src/App.vue

+8-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33
<router-view> </router-view>
44
</div>
55
</template>
6-
<script>
7-
export default {};
6+
<script setup>
7+
import { onMounted } from "vue";
8+
9+
onMounted(() => {
10+
setTimeout(() => {
11+
window.HSStaticMethods.autoInit();
12+
}, 100);
13+
});
814
</script>
915
<style>
1016
* {

launcher/src/backend/Monitoring.js

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ export class Monitoring {
157157
config: {
158158
serviceID: config.id,
159159
configVersion: config.configVersion,
160+
env: config.env,
160161
image: config.image,
161162
imageVersion: config.imageVersion,
162163
runningImageVersion: newState?.Image ? newState.Image.split(":").pop() : null,

launcher/src/backend/ValidatorAccountManager.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,7 @@ export class ValidatorAccountManager {
563563
walletPath = service.volumes.find((v) => v.servicePath == "/opt/app/data/wallets").destinationPath;
564564
}
565565
//Make sure keystores have correct permissions
566-
const chmodResult = await this.nodeConnection.sshService.exec("chmod -Rv 600 " + walletPath + "/direct/accounts/*");
567-
log.info(chmodResult.stdout);
566+
await this.nodeConnection.sshService.exec("chmod -Rv 600 " + walletPath + "/direct/accounts/*");
568567
if (walletPath) {
569568
result = await this.nodeConnection.sshService.exec("cat " + walletPath + "/auth-token");
570569
result.stdout = result.stdout

launcher/src/backend/web3/CSM.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,9 @@ async function getNodeOperatorInfo(contract, nodeOperatorId) {
9595
}
9696

9797
const nodeOperator = await contract.methods.getNodeOperator(nodeOperatorId).call();
98-
const enqueuedCount = nodeOperator.enqueuedCount;
9998

10099
//log.info("Enqueued Count:", enqueuedCount);
101-
return enqueuedCount;
100+
return nodeOperator;
102101
} catch (error) {
103102
log.error("Error calling getNodeOperator:", error);
104103
return null;
@@ -240,7 +239,8 @@ async function getSigningKeysWithQueueInfo(monitoring) {
240239
}
241240

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

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

382382
// Retrieve enqueuedCount and ensure it's above 0
383-
const enqueuedCount = await getNodeOperatorInfo(contract, nodeOperatorId);
383+
const enqueuedCount = (await getNodeOperatorInfo(contract, nodeOperatorId)).enqueuedCount;
384384
if (enqueuedCount === null || enqueuedCount <= 0) {
385385
log.info("No enqueued validators for this Node Operator.");
386386
return false;

0 commit comments

Comments
 (0)