Merge branch 'chore/dashmate/update-core-21.2-nightly' into new-core-…

…and-withdrawals
dashpay · Nov 6, 2024 · c2b4cea · c2b4cea
2 parents a9a6539 + 978929a
commit c2b4cea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/packages/dashmate/configs/defaults/getLocalConfigFactory.js b/packages/dashmate/configs/defaults/getLocalConfigFactory.js
@@ -25,7 +25,7 @@ export default function getLocalConfigFactory(getBaseConfig) {
       },
       core: {
         docker: {
-          image: 'dashpay/dashd:22.0.0-nightly.2024.10.29',
+          image: 'dashpay/dashd:22.0.0-devpr6375.dde1edf3',
         },
         p2p: {
           port: 20001,

diff --git a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js
@@ -25,7 +25,7 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
       },
       core: {
         docker: {
-          image: 'dashpay/dashd:22.0.0-nightly.2024.10.29',
+          image: 'dashpay/dashd:22.0.0-devpr6375.dde1edf3',
         },
         p2p: {
           port: 19999,

diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js
@@ -1032,7 +1032,7 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
             }
 
             if ([NETWORK_LOCAL, NETWORK_TESTNET, NETWORK_DEVNET].includes(options.network)) {
-              options.core.docker.image = 'dashpay/dashd:22.0.0-nightly.2024.10.29';
+              options.core.docker.image = 'dashpay/dashd:22.0.0-devpr6375.dde1edf3';
             }
           });
         return configFile;

diff --git a/packages/dashmate/src/status/scopes/platform.js b/packages/dashmate/src/status/scopes/platform.js
@@ -312,11 +312,7 @@ export default function getPlatformScopeFactory(
       if (mnRRSoftFork.active) {
         scope.platformActivation = `Activated (at height ${mnRRSoftFork.height})`;
       } else {
-        const startTime = mnRRSoftFork.bip9.start_time;
-
-        const diff = (new Date().getTime() - startTime) / 1000;
-
-        scope.platformActivation = `Waiting for activation (approximately in ${prettyMs(diff, { compact: true })})`;
+        scope.platformActivation = `Waiting for activation on height ${mnRRSoftFork.height}`;
       }
 
       const [tenderdash, drive] = await Promise.all([