diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js index 0f0d404023f..0772a101113 100644 --- a/packages/dashmate/configs/defaults/getBaseConfigFactory.js +++ b/packages/dashmate/configs/defaults/getBaseConfigFactory.js @@ -72,7 +72,7 @@ export default function getBaseConfigFactory(homeDir) { port: 3001, }, docker: { - image: 'dashpay/dashd:20', commandArgs: [], + image: 'dashpay/dashd:20.1.0-devpr5806.a1814ce2', commandArgs: [], }, p2p: { host: '0.0.0.0', diff --git a/packages/dashmate/src/constants.js b/packages/dashmate/src/constants.js index b7f7e7c4641..35b8707b9ab 100644 --- a/packages/dashmate/src/constants.js +++ b/packages/dashmate/src/constants.js @@ -28,9 +28,11 @@ export const NODE_TYPE_MASTERNODE = 'masternode'; export const NODE_TYPE_FULLNODE = 'fullnode'; export const LLMQ_TYPE_TEST = 'llmq_test'; +export const LLMQ_TYPE_TEST_PLATFORM = 'llmq_test_platform'; export const QUORUM_TYPES = { LLMQ_TYPE_TEST: 100, + LLMQ_TYPE_TEST_PLATFORM: 106, }; export const MASTERNODE_COLLATERAL_AMOUNT = 1000; diff --git a/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js b/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js index 78d7c11788d..9dd3f68699a 100644 --- a/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js +++ b/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js @@ -1,15 +1,11 @@ import { Listr } from 'listr2'; -import lodash from 'lodash'; -import { LLMQ_TYPE_TEST, NETWORK_LOCAL } from '../../../../constants.js'; +import { LLMQ_TYPE_TEST_PLATFORM, NETWORK_LOCAL } from '../../../../constants.js'; import waitForNodesToHaveTheSameHeight from '../../../../core/waitForNodesToHaveTheSameHeight.js'; import waitForQuorumPhase from '../../../../core/quorum/waitForQuorumPhase.js'; import waitForQuorumConnections from '../../../../core/quorum/waitForQuorumConnections.js'; import waitForQuorumCommitments from '../../../../core/quorum/waitForQuorumCommitements.js'; import wait from '../../../../util/wait.js'; import waitForMasternodeProbes from '../../../../core/quorum/waitForMasternodeProbes.js'; - -const { isEqual } = lodash; - /** * @param {generateBlocks} generateBlocks * @return {enableCoreQuorumsTask} @@ -245,8 +241,9 @@ export default function enableCoreQuorumsTaskFactory(generateBlocks) { ); let { result: newQuorumList } = await ctx.seedRpcClient.quorum('list'); + let testPlatformQuorumEnabled = !!newQuorumList[LLMQ_TYPE_TEST_PLATFORM][0]; - while (isEqual(ctx.initialQuorumList, newQuorumList)) { + while (!testPlatformQuorumEnabled) { await wait(300); await ctx.bumpMockTime(); @@ -263,12 +260,13 @@ export default function enableCoreQuorumsTaskFactory(generateBlocks) { ); ({ result: newQuorumList } = await ctx.seedRpcClient.quorum('list')); + testPlatformQuorumEnabled = !!newQuorumList[LLMQ_TYPE_TEST_PLATFORM][0]; } const { result: quorumList } = await ctx.seedRpcClient.quorum('list', 1); // eslint-disable-next-line prefer-destructuring - ctx.quorumHash = quorumList[LLMQ_TYPE_TEST][0]; + ctx.quorumHash = quorumList[LLMQ_TYPE_TEST_PLATFORM][0]; const llmqType = ctx.masternodeCoreServices[0].getConfig().get('platform.drive.abci.validatorSet.llmqType'); diff --git a/packages/dashmate/templates/core/dash.conf.dot b/packages/dashmate/templates/core/dash.conf.dot index 3907b248d8c..08885afa6c6 100644 --- a/packages/dashmate/templates/core/dash.conf.dot +++ b/packages/dashmate/templates/core/dash.conf.dot @@ -69,7 +69,6 @@ regtest=1 {{? it.core.spork.address}}sporkaddr={{=it.core.spork.address}}{{?}} {{? it.core.spork.privateKey}}sporkkey={{=it.core.spork.privateKey}}{{?}} {{? it.core.miner.mediantime}}mocktime={{=it.core.miner.mediantime}}{{?}} -llmqtestinstantsend=llmq_test llmqtestinstantsenddip0024=llmq_test_instantsend {{?? it.network === 'devnet'}}