From 82a028b1e23bb03b14c54905483528b649534538 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Fri, 27 Jan 2023 19:40:03 +0400 Subject: [PATCH 1/3] fix(dashmate): add grpc removal migration --- packages/dashmate/configs/migrations.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/dashmate/configs/migrations.js b/packages/dashmate/configs/migrations.js index 183aacd22c1..f7ddb8d5b41 100644 --- a/packages/dashmate/configs/migrations.js +++ b/packages/dashmate/configs/migrations.js @@ -422,6 +422,8 @@ module.exports = { Object.entries(configFile.configs) .forEach(([, config]) => { if (config.platform) { + delete config.platform.dapi.envoy.grpc; + if (config.group === 'local') { config.platform.drive.tenderdash.moniker = config.name; } else { From fea8eb3a74351b774d205a19f80da7b6664f73da Mon Sep 17 00:00:00 2001 From: pshenmic Date: Fri, 17 Feb 2023 03:26:50 +0400 Subject: [PATCH 2/3] fix(dashmate): status visual fixes --- packages/dashmate/src/commands/status/host.js | 3 +-- packages/dashmate/src/commands/status/masternode.js | 11 ++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/dashmate/src/commands/status/host.js b/packages/dashmate/src/commands/status/host.js index 6878a3ea953..d1e9cf50a0f 100644 --- a/packages/dashmate/src/commands/status/host.js +++ b/packages/dashmate/src/commands/status/host.js @@ -14,7 +14,7 @@ class HostStatusCommand extends ConfigBaseCommand { if (flags.format === OUTPUT_FORMATS.PLAIN) { const { hostname, uptime, platform, arch, - username, diskFree, memory, cpus, ip, + username, memory, cpus, ip, } = scope; const plain = { @@ -23,7 +23,6 @@ class HostStatusCommand extends ConfigBaseCommand { Platform: platform, Arch: arch, Username: username, - Diskfree: diskFree, Memory: memory, CPUs: cpus, IP: ip, diff --git a/packages/dashmate/src/commands/status/masternode.js b/packages/dashmate/src/commands/status/masternode.js index e109185ced8..c10bb1e0ec5 100644 --- a/packages/dashmate/src/commands/status/masternode.js +++ b/packages/dashmate/src/commands/status/masternode.js @@ -7,6 +7,7 @@ const ConfigBaseCommand = require('../../oclif/command/ConfigBaseCommand'); const printObject = require('../../printers/printObject'); const colors = require('../../status/colors'); const MasternodeStateEnum = require('../../enums/masternodeState'); +const MasternodeSyncAssetEnum = require("../../enums/masternodeSyncAsset"); class MasternodeStatusCommand extends ConfigBaseCommand { /** @@ -35,14 +36,18 @@ class MasternodeStatusCommand extends ConfigBaseCommand { if (flags.format === OUTPUT_FORMATS.PLAIN) { const plain = {}; - plain['Masternode State'] = (scope.state === MasternodeStateEnum.READY - ? chalk.green : chalk.red)(scope.state); - if (scope.sentinel.version) { plain['Sentinel Version'] = scope.sentinel.version; plain['Sentinel Status'] = colors.sentinel(scope.sentinel.state)(scope.sentinel.state); } + if (scope.syncAsset === MasternodeSyncAssetEnum.MASTERNODE_SYNC_FINISHED) { + plain['Masternode State'] = (scope.state === MasternodeStateEnum.READY + ? chalk.green : chalk.red)(scope.state); + } else { + plain['Masternode Sync Status'] = chalk.yellow(scope.syncAsset); + } + if (scope.state === MasternodeStateEnum.READY) { const { lastPaidHeight, lastPaidTime, From 6e731bfd05acdfd44a5549902274ab529125d37a Mon Sep 17 00:00:00 2001 From: pshenmic Date: Fri, 17 Feb 2023 03:37:41 +0400 Subject: [PATCH 3/3] chore(dashmate): lint fix --- packages/dashmate/src/commands/status/masternode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dashmate/src/commands/status/masternode.js b/packages/dashmate/src/commands/status/masternode.js index c10bb1e0ec5..257f6fe6ff6 100644 --- a/packages/dashmate/src/commands/status/masternode.js +++ b/packages/dashmate/src/commands/status/masternode.js @@ -7,7 +7,7 @@ const ConfigBaseCommand = require('../../oclif/command/ConfigBaseCommand'); const printObject = require('../../printers/printObject'); const colors = require('../../status/colors'); const MasternodeStateEnum = require('../../enums/masternodeState'); -const MasternodeSyncAssetEnum = require("../../enums/masternodeSyncAsset"); +const MasternodeSyncAssetEnum = require('../../enums/masternodeSyncAsset'); class MasternodeStatusCommand extends ConfigBaseCommand { /**