Skip to content

chore(dashmate): update to core v20.1.0-devpr5806.a1814ce2 #1665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markin-io merged 6 commits into from
Jan 23, 2024
Merged

chore(dashmate): update to core v20.1.0-devpr5806.a1814ce2 #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0a4c8c
chore(dashmate): update to core 20.1.0-nightly.2024.01.10
markin-io Jan 11, 2024
89302c8
fix(dashmate): remove unnecessary core config
markin-io Jan 11, 2024
df4f5b8
wip: test ci
markin-io Jan 11, 2024
93e004c
feat(dashmate): update logic that awaits for test platform quorum
markin-io Jan 12, 2024
c0dd053
update core image
markin-io Jan 19, 2024
5661346
chore: update core image and cleanup
markin-io Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/dashmate/configs/defaults/getBaseConfigFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions packages/dashmate/src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 5 additions & 7 deletions packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand Down Expand Up @@ -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();
Expand All @@ -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');

Expand Down
1 change: 0 additions & 1 deletion packages/dashmate/templates/core/dash.conf.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}}
Expand Down