Skip to content

fix(dashmate): local nodes missing envs after group reset #839

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

Closed
pshenmic wants to merge 8 commits into from
Closed

fix(dashmate): local nodes missing envs after group reset #839

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c8aa7a5
fix(dashmate): generate contract keys after group reset
pshenmic Mar 16, 2023
46ef622
Merge remote-tracking branch 'origin/v0.24-dev' into fix/dashmate-gro…
pshenmic Apr 18, 2023
9413ccf
chore(dashmate): lint and bug fixes
pshenmic Apr 18, 2023
95160bc
chore(dashmate): code review fixes
pshenmic Apr 19, 2023
4e4080f
fix(dashmate): leave contract keys on group reset
pshenmic Apr 20, 2023
9bea33d
fix(dashmate): print system contracts private keys
pshenmic Apr 20, 2023
1cfac2e
fix(dashmate): revert generateSystemDataContractKeysTask
pshenmic Apr 22, 2023
6c8f23e
chore(dashmate): revert script
pshenmic Apr 22, 2023
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
11 changes: 10 additions & 1 deletion packages/dashmate/src/commands/group/reset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class GroupResetCommand extends GroupBaseCommand {
* @param {configureCoreTask} configureCoreTask
* @param {configureTenderdashTask} configureTenderdashTask
* @param {generateToAddressTask} generateToAddressTask
* @param {generateSystemDataContractKeysTask} generateSystemDataContractKeysTask
* @param {ConfigFile} configFile
* @param {Object[]} systemConfigs
* @return {Promise<void>}
Expand All @@ -33,6 +34,7 @@ class GroupResetCommand extends GroupBaseCommand {
configureCoreTask,
configureTenderdashTask,
generateToAddressTask,
generateSystemDataContractKeysTask,
configFile,
systemConfigs,
) {
Expand Down Expand Up @@ -69,7 +71,14 @@ class GroupResetCommand extends GroupBaseCommand {
config.set('core.masternode.operator.privateKey', baseConfig.core.masternode.operator.privateKey);
}

return resetNodeTask(config);
return new Listr([
{
task: () => resetNodeTask(config),
},
{
task: () => generateSystemDataContractKeysTask(config, config.get('network')),

@shumkov shumkov Apr 19, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you test it? I think it won't work because all configs will have different keys now so init chain won't be deterministic. If you see how it worked before. We generated it once on setup and set to all configs. You should do the same

},
]);
},
}))),
},
Expand Down
3 changes: 3 additions & 0 deletions packages/dashmate/src/createDIContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ const resetNodeTaskFactory = require('./listr/tasks/resetNodeTaskFactory');
const configureCoreTaskFactory = require('./listr/tasks/setup/local/configureCoreTaskFactory');
const configureTenderdashTaskFactory = require('./listr/tasks/setup/local/configureTenderdashTaskFactory');
const obtainSelfSignedCertificateTaskFactory = require('./listr/tasks/ssl/selfSigned/obtainSelfSignedCertificateTaskFactory');
const generateSystemDataContractKeysTaskFactory = require('./listr/tasks/setup/local/generateSystemDataContractKeysTaskFactory');
const waitForNodeToBeReadyTaskFactory = require('./listr/tasks/platform/waitForNodeToBeReadyTaskFactory');
const enableCoreQuorumsTaskFactory = require('./listr/tasks/setup/local/enableCoreQuorumsTaskFactory');
const startGroupNodesTaskFactory = require('./listr/tasks/startGroupNodesTaskFactory');
Expand Down Expand Up @@ -214,6 +215,8 @@ async function createDIContainer() {
setupRegularPresetTask: asFunction(setupRegularPresetTaskFactory).singleton(),
configureCoreTask: asFunction(configureCoreTaskFactory).singleton(),
configureTenderdashTask: asFunction(configureTenderdashTaskFactory).singleton(),
generateSystemDataContractKeysTask: asFunction(generateSystemDataContractKeysTaskFactory)
.singleton(),
waitForNodeToBeReadyTask: asFunction(waitForNodeToBeReadyTaskFactory).singleton(),
enableCoreQuorumsTask: asFunction(enableCoreQuorumsTaskFactory).singleton(),
registerMasternodeGuideTask: asFunction(registerMasternodeGuideTaskFactory).singleton(),
Expand Down
69 changes: 69 additions & 0 deletions packages/dashmate/src/listr/tasks/setup/local/generateSystemDataContractKeysTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
const { Listr } = require('listr2');

/**
* @param {generateHDPrivateKeys} generateHDPrivateKeys
* @return {configureTenderdashTask}
*/
function generateSystemDataContractKeysTaskFactory(generateHDPrivateKeys) {
/**
* @typedef {configureTenderdashTask}
* @return {Listr}
* @param config
* @param network
*/
function generateSystemDataContractKeysTask(config, network) {
return new Listr([
{
task: async () => {
const {
derivedPrivateKeys: [
dpnsDerivedMasterPrivateKey,
dpnsDerivedSecondPrivateKey,
],
} = await generateHDPrivateKeys(network, [0, 1]);

const {
derivedPrivateKeys: [
featureFlagsDerivedMasterPrivateKey,
featureFlagsDerivedSecondPrivateKey,
],
} = await generateHDPrivateKeys(network, [0, 1]);

const {
derivedPrivateKeys: [
dashpayDerivedMasterPrivateKey,
dashpayDerivedSecondPrivateKey,
],
} = await generateHDPrivateKeys(network, [0, 1]);

const {
derivedPrivateKeys: [
masternodeRewardSharesDerivedMasterPrivateKey,
masternodeRewardSharesDerivedSecondPrivateKey,
],
} = await generateHDPrivateKeys(network, [0, 1]);

config.set('platform.dpns.masterPublicKey', dpnsDerivedMasterPrivateKey.privateKey.toPublicKey().toString());
config.set('platform.dpns.secondPublicKey', dpnsDerivedSecondPrivateKey.privateKey.toPublicKey().toString());

config.set('platform.featureFlags.masterPublicKey', featureFlagsDerivedMasterPrivateKey.privateKey.toPublicKey().toString());
config.set('platform.featureFlags.secondPublicKey', featureFlagsDerivedSecondPrivateKey.privateKey.toPublicKey().toString());

config.set('platform.dashpay.masterPublicKey', dashpayDerivedMasterPrivateKey.privateKey.toPublicKey().toString());
config.set('platform.dashpay.secondPublicKey', dashpayDerivedSecondPrivateKey.privateKey.toPublicKey().toString());

config.set('platform.masternodeRewardShares.masterPublicKey',
masternodeRewardSharesDerivedMasterPrivateKey.privateKey
.toPublicKey().toString());
config.set('platform.masternodeRewardShares.secondPublicKey',
masternodeRewardSharesDerivedSecondPrivateKey.privateKey
.toPublicKey().toString());
},
},
]);
}

return generateSystemDataContractKeysTask;
}

module.exports = generateSystemDataContractKeysTaskFactory;
89 changes: 9 additions & 80 deletions packages/dashmate/src/listr/tasks/setup/setupLocalPresetTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const deriveTenderdashNodeId = require('../../../tenderdash/deriveTenderdashNode
* @param {obtainSelfSignedCertificateTask} obtainSelfSignedCertificateTask
* @param {resolveDockerHostIp} resolveDockerHostIp
* @param {configFileRepository} configFileRepository
* @param {generateHDPrivateKeys} generateHDPrivateKeys
* @param {generateSystemDataContractKeysTask} generateSystemDataContractKeysTask
*/
function setupLocalPresetTaskFactory(
configFile,
Expand All @@ -26,7 +26,7 @@ function setupLocalPresetTaskFactory(
configureTenderdashTask,
resolveDockerHostIp,
configFileRepository,
generateHDPrivateKeys,
generateSystemDataContractKeysTask,
) {
/**
* @typedef {setupLocalPresetTask}
Expand Down Expand Up @@ -87,7 +87,7 @@ function setupLocalPresetTaskFactory(
},
{
title: 'Create local group configs',
task: async (ctx, task) => {
task: async (ctx) => {
ctx.configGroup = new Array(ctx.nodeCount)
.fill(undefined)
.map((value, i) => `local_${i + 1}`)
Expand All @@ -103,61 +103,6 @@ function setupLocalPresetTaskFactory(

const network = ctx.configGroup[0].get('network');

const {
hdPrivateKey: dpnsPrivateKey,
derivedPrivateKeys: [
dpnsDerivedMasterPrivateKey,
dpnsDerivedSecondPrivateKey,
],
} = await generateHDPrivateKeys(network, [0, 1]);

const {
hdPrivateKey: featureFlagsPrivateKey,
derivedPrivateKeys: [
featureFlagsDerivedMasterPrivateKey,
featureFlagsDerivedSecondPrivateKey,
],
} = await generateHDPrivateKeys(network, [0, 1]);

const {
hdPrivateKey: dashpayPrivateKey,
derivedPrivateKeys: [
dashpayDerivedMasterPrivateKey,
dashpayDerivedSecondPrivateKey,
],
} = await generateHDPrivateKeys(network, [0, 1]);

const {
hdPrivateKey: withdrawalsPrivateKey,
derivedPrivateKeys: [
withdrawalsDerivedMasterPrivateKey,
withdrawalsDerivedSecondPrivateKey,
],
} = await generateHDPrivateKeys(network, [0, 1]);

const {
hdPrivateKey: masternodeRewardSharesPrivateKey,
derivedPrivateKeys: [
masternodeRewardSharesDerivedMasterPrivateKey,
masternodeRewardSharesDerivedSecondPrivateKey,
],
} = await generateHDPrivateKeys(network, [0, 1]);

// eslint-disable-next-line no-param-reassign
task.output = `DPNS Private Key: ${dpnsPrivateKey.toString()}`;

// eslint-disable-next-line no-param-reassign
task.output = `Feature Flags Private Key: ${featureFlagsPrivateKey.toString()}`;

// eslint-disable-next-line no-param-reassign
task.output = `Dashpay Private Key: ${dashpayPrivateKey.toString()}`;

// eslint-disable-next-line no-param-reassign
task.output = `Masternode Reward Shares Private Key: ${masternodeRewardSharesPrivateKey.toString()}`;

// eslint-disable-next-line no-param-reassign
task.output = `Withdrawals Private Key: ${withdrawalsPrivateKey.toString()}`;

const subTasks = ctx.configGroup.map((config, i) => (
{
title: `Create ${config.getName()} config`,
Expand Down Expand Up @@ -223,30 +168,14 @@ function setupLocalPresetTaskFactory(
config.set('platform.drive.abci.log.jsonFile.path', driveJsonLogFile);
}

config.set('platform.dpns.masterPublicKey', dpnsDerivedMasterPrivateKey.privateKey.toPublicKey().toString());
config.set('platform.dpns.secondPublicKey', dpnsDerivedSecondPrivateKey.privateKey.toPublicKey().toString());

config.set('platform.featureFlags.masterPublicKey', featureFlagsDerivedMasterPrivateKey.privateKey.toPublicKey().toString());
config.set('platform.featureFlags.secondPublicKey', featureFlagsDerivedSecondPrivateKey.privateKey.toPublicKey().toString());

config.set('platform.dashpay.masterPublicKey', dashpayDerivedMasterPrivateKey.privateKey.toPublicKey().toString());
config.set('platform.dashpay.secondPublicKey', dashpayDerivedSecondPrivateKey.privateKey.toPublicKey().toString());

config.set('platform.withdrawals.masterPublicKey', withdrawalsDerivedMasterPrivateKey.privateKey.toPublicKey().toString());
config.set('platform.withdrawals.secondPublicKey', withdrawalsDerivedSecondPrivateKey.privateKey.toPublicKey().toString());

config.set(
'platform.masternodeRewardShares.masterPublicKey',
masternodeRewardSharesDerivedMasterPrivateKey.privateKey
.toPublicKey().toString(),
); config.set(
'platform.masternodeRewardShares.secondPublicKey',
masternodeRewardSharesDerivedSecondPrivateKey.privateKey
.toPublicKey().toString(),
);

config.set('dashmate.helper.api.port', config.get('dashmate.helper.api.port') + (i * 100));

return new Listr([{
task: () => generateSystemDataContractKeysTask(config, network),
}]);
}

return null;
},
options: {
persistentOutput: true,
Expand Down