Skip to content

fix(dashmate): Remove -masternodeblsprivkey from docker arguments #538

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
shumkov merged 13 commits into from
Sep 29, 2022
Merged

fix(dashmate): Remove -masternodeblsprivkey from docker arguments #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8f1321d
fix(dashmate): update v18 for the mainnet nodes
pshenmic Aug 30, 2022
a9527a6
Merge remote-tracking branch 'origin/master'
pshenmic Sep 1, 2022
278e656
Merge remote-tracking branch 'origin/master'
pshenmic Sep 13, 2022
a8ef692
fix(dashmate): move masternode privkey to the core config
pshenmic Sep 20, 2022
f059913
fix(dashmate): disable masternode if wallet mode is on
pshenmic Sep 28, 2022
e2c4cb2
fix(dashmate): add missing core command
pshenmic Sep 28, 2022
92e0d5e
fix(dashmate): move privKey to arguments
pshenmic Sep 29, 2022
c658b86
fix(dashmate): add missing --disablewallet and fix privkey arg pass
pshenmic Sep 29, 2022
31c78c4
fix(dashmate): remove redundant
pshenmic Sep 29, 2022
146f326
fix(dashmate): add task title
pshenmic Sep 29, 2022
9cbc8cc
feat(dashmate): remove core command from startCore
pshenmic Sep 29, 2022
aa465d7
fix(dashmate): fix template
pshenmic Sep 29, 2022
8e1508f
feat(dashmate): render dash.conf when setting operator privateKey
pshenmic Sep 29, 2022
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: 0 additions & 2 deletions packages/dashmate/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ services:
- ${DASHMATE_HOME_DIR:?err}/${CONFIG_NAME:?err}/core/dash.conf:/dash/.dashcore/dash.conf
command:
- dashd
- -masternodeblsprivkey=${CORE_MASTERNODE_OPERATOR_PRIVATE_KEY}

volumes:
core_data:

Expand Down
27 changes: 17 additions & 10 deletions packages/dashmate/src/core/startCoreFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,32 @@ function startCoreFactory(
...options,
};

// Run Core service
const isMasternode = config.get('core.masternode.enable');

if (isMasternode) {
Comment thread
shumkov marked this conversation as resolved.
// Check operatorPrivateKey is set (error will be thrown if not)
config.get('core.masternode.operator.privateKey', true);
}

// Run Core service
const coreCommand = [
'dashd',
];
const isMasternode = config.get('core.masternode.enable');
const operatorKey = config.get('core.masternode.operator.privateKey');

if (options.wallet) {
coreCommand.push('--disablewallet=0');
} else if (isMasternode && Boolean(operatorKey)) {
coreCommand.push(`-masternodeblsprivkey=${operatorKey}`);
}

if (options.addressIndex) {
coreCommand.push('--addressindex=1');
}

if (options.wallet) {
if (isMasternode) {
throw new Error('You cannot run masternode with wallet mode on')
}

coreCommand.push('--disablewallet=0');
} else {
coreCommand.push('--disablewallet=1');
}

const coreContainer = await dockerCompose.runService(
config.toEnvs(),
'core',
Expand All @@ -72,7 +80,6 @@ function startCoreFactory(
);

// Wait Core to start

await waitForCoreStart(coreService);

return coreService;
Expand Down
1 change: 1 addition & 0 deletions packages/dashmate/src/listr/tasks/platform/waitForNodeToBeReadyTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function waitForNodeToBeReadyTaskFactory(
async function waitForNodeToBeReadyTask(config) {
return new Listr([
{
title: `Wait for node ${config.getName()} to be ready`,
task: async () => {
const port = config.get('platform.drive.tenderdash.rpc.port');

Expand Down
4 changes: 4 additions & 0 deletions packages/dashmate/src/listr/tasks/setup/local/configureCoreTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ function configureCoreTaskFactory(

config.set('core.masternode.operator.privateKey', ctx.operator.privateKey);

// Write configs
const configFiles = renderServiceTemplates(config);
writeServiceConfigs(config.getName(), configFiles);

// eslint-disable-next-line no-param-reassign
task.output = `Public key: ${ctx.operator.publicKey}\nPrivate key: ${ctx.operator.privateKey}`;
},
Expand Down
5 changes: 5 additions & 0 deletions packages/dashmate/templates/core/dash.conf.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ zmqpubrawchainlocksig=tcp://0.0.0.0:29998
zmqpubrawchainlock=tcp://0.0.0.0:29998
zmqpubrawtxlocksig=tcp://0.0.0.0:29998

{{? it.core.masternode.enable === true}}
masternodeblsprivkey={{=it.core.masternode.operator.privateKey}}
{{?}}

{{? it.network === 'testnet'}}testnet=1
[test]
{{?? it.network === 'local'}}
Expand Down Expand Up @@ -69,3 +73,4 @@ port={{=it.core.p2p.port}}
bind=0.0.0.0
rpcbind=0.0.0.0
rpcport={{=it.core.rpc.port}}