From e0a4c8c0cdecbe5ab69de91a2c9e40a95479868f Mon Sep 17 00:00:00 2001 From: "markin.io" Date: Thu, 11 Jan 2024 12:43:57 +0000 Subject: [PATCH 1/6] chore(dashmate): update to core 20.1.0-nightly.2024.01.10 --- packages/dashmate/configs/defaults/getBaseConfigFactory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js index 0f0d404023f..0915b408a18 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-nightly.2024.01.10', commandArgs: [], }, p2p: { host: '0.0.0.0', From 89302c8cc50539a760e2d996bb3e272cb5b204b1 Mon Sep 17 00:00:00 2001 From: "markin.io" Date: Thu, 11 Jan 2024 12:54:44 +0000 Subject: [PATCH 2/6] fix(dashmate): remove unnecessary core config --- packages/dashmate/templates/core/dash.conf.dot | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/dashmate/templates/core/dash.conf.dot b/packages/dashmate/templates/core/dash.conf.dot index 3907b248d8c..a0d9e28e52e 100644 --- a/packages/dashmate/templates/core/dash.conf.dot +++ b/packages/dashmate/templates/core/dash.conf.dot @@ -69,8 +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'}} devnet={{=it.core.devnet.name}} From df4f5b8f36e82ae6765319f75aab3cb3f7b50f4e Mon Sep 17 00:00:00 2001 From: "markin.io" Date: Thu, 11 Jan 2024 13:03:19 +0000 Subject: [PATCH 3/6] wip: test ci --- .../src/SDK/Client/Platform/methods/identities/register.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts b/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts index 432f70773e3..5d97e141fee 100644 --- a/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts +++ b/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts @@ -15,6 +15,7 @@ export default async function register( await this.initialize(); const { client } = this; + console.log('Register'); const account = await client.getWalletAccount(); From 93e004cc08f93fb5c56514bf123a1c7e15cbd595 Mon Sep 17 00:00:00 2001 From: "markin.io" Date: Fri, 12 Jan 2024 17:26:59 +0000 Subject: [PATCH 4/6] feat(dashmate): update logic that awaits for test platform quorum --- .../configs/defaults/getBaseConfigFactory.js | 3 ++- packages/dashmate/src/constants.js | 2 ++ .../setup/local/enableCoreQuorumsTaskFactory.js | 12 +++++------- packages/dashmate/templates/core/dash.conf.dot | 2 ++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js index 0915b408a18..278585974ce 100644 --- a/packages/dashmate/configs/defaults/getBaseConfigFactory.js +++ b/packages/dashmate/configs/defaults/getBaseConfigFactory.js @@ -72,7 +72,8 @@ export default function getBaseConfigFactory(homeDir) { port: 3001, }, docker: { - image: 'dashpay/dashd:20.1.0-nightly.2024.01.10', commandArgs: [], + image: 'dashpay/dashd:20.1.0-devpr5790.98457039', commandArgs: [], + // image: 'dashpay/dashd:20', 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..669bccbf4ba 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 testPlatformQuorumHash = newQuorumList[LLMQ_TYPE_TEST_PLATFORM][0]; - while (isEqual(ctx.initialQuorumList, newQuorumList)) { + while (!testPlatformQuorumHash) { await wait(300); await ctx.bumpMockTime(); @@ -263,12 +260,13 @@ export default function enableCoreQuorumsTaskFactory(generateBlocks) { ); ({ result: newQuorumList } = await ctx.seedRpcClient.quorum('list')); + [testPlatformQuorumHash] = newQuorumList[LLMQ_TYPE_TEST_PLATFORM]; } 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 a0d9e28e52e..fab801c3f65 100644 --- a/packages/dashmate/templates/core/dash.conf.dot +++ b/packages/dashmate/templates/core/dash.conf.dot @@ -69,6 +69,8 @@ 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'}} devnet={{=it.core.devnet.name}} From c0dd053294edc659757dfda5acb52e701317581a Mon Sep 17 00:00:00 2001 From: "markin.io" Date: Fri, 19 Jan 2024 14:27:53 +0000 Subject: [PATCH 5/6] update core image --- packages/dashmate/configs/defaults/getBaseConfigFactory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js index 278585974ce..ff89d4af994 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.1.0-devpr5790.98457039', commandArgs: [], + image: 'dashpay/dashd:20.1.0-devpr5832.2c60a16d', commandArgs: [], // image: 'dashpay/dashd:20', commandArgs: [], }, p2p: { From 5661346b3a0c896e717c84efc3352c0d6c1fc38c Mon Sep 17 00:00:00 2001 From: "markin.io" Date: Tue, 23 Jan 2024 12:01:21 +0000 Subject: [PATCH 6/6] chore: update core image and cleanup --- packages/dashmate/configs/defaults/getBaseConfigFactory.js | 3 +-- .../listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js | 6 +++--- packages/dashmate/templates/core/dash.conf.dot | 1 - .../src/SDK/Client/Platform/methods/identities/register.ts | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js index ff89d4af994..0772a101113 100644 --- a/packages/dashmate/configs/defaults/getBaseConfigFactory.js +++ b/packages/dashmate/configs/defaults/getBaseConfigFactory.js @@ -72,8 +72,7 @@ export default function getBaseConfigFactory(homeDir) { port: 3001, }, docker: { - image: 'dashpay/dashd:20.1.0-devpr5832.2c60a16d', commandArgs: [], - // 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/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js b/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js index 669bccbf4ba..9dd3f68699a 100644 --- a/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js +++ b/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js @@ -241,9 +241,9 @@ export default function enableCoreQuorumsTaskFactory(generateBlocks) { ); let { result: newQuorumList } = await ctx.seedRpcClient.quorum('list'); - let testPlatformQuorumHash = newQuorumList[LLMQ_TYPE_TEST_PLATFORM][0]; + let testPlatformQuorumEnabled = !!newQuorumList[LLMQ_TYPE_TEST_PLATFORM][0]; - while (!testPlatformQuorumHash) { + while (!testPlatformQuorumEnabled) { await wait(300); await ctx.bumpMockTime(); @@ -260,7 +260,7 @@ export default function enableCoreQuorumsTaskFactory(generateBlocks) { ); ({ result: newQuorumList } = await ctx.seedRpcClient.quorum('list')); - [testPlatformQuorumHash] = newQuorumList[LLMQ_TYPE_TEST_PLATFORM]; + testPlatformQuorumEnabled = !!newQuorumList[LLMQ_TYPE_TEST_PLATFORM][0]; } const { result: quorumList } = await ctx.seedRpcClient.quorum('list', 1); diff --git a/packages/dashmate/templates/core/dash.conf.dot b/packages/dashmate/templates/core/dash.conf.dot index fab801c3f65..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'}} diff --git a/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts b/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts index 5d97e141fee..432f70773e3 100644 --- a/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts +++ b/packages/js-dash-sdk/src/SDK/Client/Platform/methods/identities/register.ts @@ -15,7 +15,6 @@ export default async function register( await this.initialize(); const { client } = this; - console.log('Register'); const account = await client.getWalletAccount();