Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
12 changes: 11 additions & 1 deletion packages/dashmate/src/commands/group/reset.js
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 {configureContractsPrivateKeysTask} configureContractsPrivateKeysTask
* @param {ConfigFile} configFile
* @param {Object[]} systemConfigs
* @return {Promise<void>}
Expand All @@ -33,6 +34,7 @@ class GroupResetCommand extends GroupBaseCommand {
configureCoreTask,
configureTenderdashTask,
generateToAddressTask,
configureContractsPrivateKeysTask,
configFile,
systemConfigs,
) {
Expand All @@ -55,12 +57,20 @@ class GroupResetCommand extends GroupBaseCommand {
task: (ctx) => {
ctx.skipPlatformInitialization = true;

const subTasks = [{ task: () => resetNodeTask(config) }];

if (config.has('platform')) {
const network = configGroup[0].get('network');

config.set('platform.dpns', baseConfig.platform.dpns);
config.set('platform.dashpay', baseConfig.platform.dashpay);
config.set('platform.featureFlags', baseConfig.platform.featureFlags);
config.set('platform.masternodeRewardShares', baseConfig.platform.masternodeRewardShares);

subTasks.unshift({

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.

Why so?

task: () => configureContractsPrivateKeysTask(config, network),
});

// TODO: Should stay the same
config.set('platform.drive.tenderdash.nodeId', baseConfig.platform.drive.tenderdash.nodeId);
config.set('platform.drive.tenderdash.nodeKey', baseConfig.platform.drive.tenderdash.nodeKey);
Expand All @@ -71,7 +81,7 @@ class GroupResetCommand extends GroupBaseCommand {
config.set('core.masternode.operator.privateKey', baseConfig.core.masternode.operator.privateKey);
}

return resetNodeTask(config);
return new Listr(subTasks);
},
}))),
},
Expand Down
3 changes: 3 additions & 0 deletions packages/dashmate/src/createDIContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const restartNodeTaskFactory = require('./listr/tasks/restartNodeTaskFactory');
const resetNodeTaskFactory = require('./listr/tasks/resetNodeTaskFactory');
const configureCoreTaskFactory = require('./listr/tasks/setup/local/configureCoreTaskFactory');
const configureTenderdashTaskFactory = require('./listr/tasks/setup/local/configureTenderdashTaskFactory');
const configureContractsPrivateKeysTaskFactory = require('./listr/tasks/setup/local/configureContractsPrivateKeysTaskFactory');
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 @@ -173,6 +174,8 @@ async function createDIContainer() {
setupRegularPresetTask: asFunction(setupRegularPresetTaskFactory).singleton(),
configureCoreTask: asFunction(configureCoreTaskFactory).singleton(),
configureTenderdashTask: asFunction(configureTenderdashTaskFactory).singleton(),
configureContractsPrivateKeysTask: asFunction(configureContractsPrivateKeysTaskFactory)
.singleton(),
outputStatusOverview: asFunction(outputStatusOverviewFactory),
waitForNodeToBeReadyTask: asFunction(waitForNodeToBeReadyTaskFactory).singleton(),
enableCoreQuorumsTask: asFunction(enableCoreQuorumsTaskFactory).singleton(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
const { Listr } = require('listr2');

/**
* @param {generateHDPrivateKeys} generateHDPrivateKeys
* @return {configureTenderdashTask}
*/
function configureContractsPrivateKeysTaskFactory(generateHDPrivateKeys) {

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.

generateSystemDataContractKeysTask

/**
* @typedef {configureTenderdashTask}
* @return {Listr}
* @param config
* @param network
*/
function configureContractsPrivateKeysTask(config, network) {
return new Listr([
{
task: async (ctx, task) => {
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: masternodeRewardSharesPrivateKey,
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());

// 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()}`;
},
},
]);
}

return configureContractsPrivateKeysTask;
}

module.exports = configureContractsPrivateKeysTaskFactory;
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const {
* @param {resolveDockerHostIp} resolveDockerHostIp
* @param {configFileRepository} configFileRepository
* @param {generateHDPrivateKeys} generateHDPrivateKeys
* @param {configureContractsPrivateKeysTask} configureContractsPrivateKeysTask
*/
function setupLocalPresetTaskFactory(
configFile,
Expand All @@ -22,6 +23,7 @@ function setupLocalPresetTaskFactory(
resolveDockerHostIp,
configFileRepository,
generateHDPrivateKeys,
configureContractsPrivateKeysTask,
) {
/**
* @typedef {setupLocalPresetTask}
Expand Down Expand Up @@ -82,7 +84,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 @@ -98,53 +100,10 @@ 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: 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()}`;

const subTasks = ctx.configGroup.map((config, i) => (
{
title: `Create ${config.getName()} config`,
// eslint-disable-next-line consistent-return

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.

Bad idea

task: () => {
const nodeIndex = i + 1;

Expand Down Expand Up @@ -203,24 +162,7 @@ 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.masternodeRewardShares.masterPublicKey',
masternodeRewardSharesDerivedMasterPrivateKey.privateKey
.toPublicKey().toString(),
); config.set(
'platform.masternodeRewardShares.secondPublicKey',
masternodeRewardSharesDerivedSecondPrivateKey.privateKey
.toPublicKey().toString(),
);
return configureContractsPrivateKeysTask(config, network);
}
},
options: {
Expand Down