Skip to content

feat(dashmate)!: configure service listening interfaces #1630

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 3 commits into from
Dec 11, 2023
Merged

feat(dashmate)!: configure service listening interfaces #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a3df9c
feat(dashmate)!: configure private interface
shumkov Dec 11, 2023
719dfc3
chore: more granular configuration
shumkov Dec 11, 2023
a871cdb
Merge branch 'master' into feat/dashmate/privite-interface
shumkov Dec 11, 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
18 changes: 14 additions & 4 deletions packages/dashmate/configs/defaults/getBaseConfigFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function getBaseConfigFactory(homeDir) {
group: null,
docker: {
network: {
subnet: '0.0.0.0/0', bindIp: '0.0.0.0',
subnet: '0.0.0.0/0',
},
baseImage: {
build: {
Expand Down Expand Up @@ -75,9 +75,12 @@ export default function getBaseConfigFactory(homeDir) {
image: 'dashpay/dashd:20', commandArgs: [],
},
p2p: {
port: 9999, seeds: [],
host: '0.0.0.0',
port: 9999,
seeds: [],
},
rpc: {
host: '127.0.0.1',
port: 9998,
user: 'dashrpc',
password: 'rpcpassword',
Expand Down Expand Up @@ -113,6 +116,7 @@ export default function getBaseConfigFactory(homeDir) {
image: 'dashpay/envoy:1.22.11',
},
http: {
host: '0.0.0.0',
port: 443,
},
rateLimiter: {
Expand Down Expand Up @@ -167,16 +171,22 @@ export default function getBaseConfigFactory(homeDir) {
image: 'dashpay/tenderdash:0.13.4',
},
p2p: {
port: 26656, persistentPeers: [], seeds: [],
host: '0.0.0.0',
port: 26656,
persistentPeers: [],
seeds: [],
},
rpc: {
host: '127.0.0.1',
port: 26657,
},
pprof: {
enabled: false, port: 6060,
},
metrics: {
enabled: false, port: 26660,
enabled: false,
host: '127.0.0.1',
port: 26660,
},
consensus: {
createEmptyBlocks: true, createEmptyBlocksInterval: '3m',
Expand Down
9 changes: 9 additions & 0 deletions packages/dashmate/configs/getConfigFileMigrationsFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,15 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
Object.entries(configFile.configs)
.forEach(([, options]) => {
options.platform.drive.tenderdash.docker.image = base.get('platform.drive.tenderdash.docker.image');

delete options.docker.network.bindIp;

options.core.p2p.host = base.get('core.p2p.host');
options.core.rpc.host = base.get('core.rpc.host');
options.platform.dapi.envoy.http.host = base.get('platform.dapi.envoy.http.host');
options.platform.drive.tenderdash.p2p.host = base.get('platform.drive.tenderdash.p2p.host');
options.platform.drive.tenderdash.rpc.host = base.get('platform.drive.tenderdash.rpc.host');
options.platform.drive.tenderdash.metrics.host = base.get('platform.drive.tenderdash.metrics.host');
});

return configFile;
Expand Down
12 changes: 6 additions & 6 deletions packages/dashmate/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ services:
org.dashmate.service.title: "Core"
restart: unless-stopped
ports:
- ${DOCKER_NETWORK_BIND_IP:?err}:${CORE_P2P_PORT:?err}:${CORE_P2P_PORT:?err} # P2P
- 127.0.0.1:${CORE_RPC_PORT:?err}:${CORE_RPC_PORT:?err} #RPC
- ${CORE_P2P_HOST:?err}:${CORE_P2P_PORT:?err}:${CORE_P2P_PORT:?err} # P2P
- ${CORE_RPC_HOST:?err}:${CORE_RPC_PORT:?err}:${CORE_RPC_PORT:?err} #RPC
volumes:
- core_data:/home/dash
- ${DASHMATE_HOME_DIR:?err}/${CONFIG_NAME:?err}/core/dash.conf:/home/dash/.dashcore/dash.conf:ro
Expand Down Expand Up @@ -85,10 +85,10 @@ services:
depends_on:
- drive_abci
ports:
- ${DOCKER_NETWORK_BIND_IP:?err}:${PLATFORM_DRIVE_TENDERDASH_P2P_PORT:?err}:${PLATFORM_DRIVE_TENDERDASH_P2P_PORT:?err} # P2P
- 127.0.0.1:${PLATFORM_DRIVE_TENDERDASH_RPC_PORT:?err}:${PLATFORM_DRIVE_TENDERDASH_RPC_PORT:?err} # RPC
- ${PLATFORM_DRIVE_TENDERDASH_P2P_HOST:?err}:${PLATFORM_DRIVE_TENDERDASH_P2P_PORT:?err}:${PLATFORM_DRIVE_TENDERDASH_P2P_PORT:?err} # P2P
- ${PLATFORM_DRIVE_TENDERDASH_RPC_HOST}:${PLATFORM_DRIVE_TENDERDASH_RPC_PORT:?err}:${PLATFORM_DRIVE_TENDERDASH_RPC_PORT:?err} # RPC
- 127.0.0.1:${PLATFORM_DRIVE_TENDERDASH_PPROF_PORT:?err}:${PLATFORM_DRIVE_TENDERDASH_PPROF_PORT:?err} # pprof
- 127.0.0.1:${PLATFORM_DRIVE_TENDERDASH_METRICS_PORT:?err}:${PLATFORM_DRIVE_TENDERDASH_METRICS_PORT:?err} # Metrics
- ${PLATFORM_DRIVE_TENDERDASH_METRICS_HOST:?err}:${PLATFORM_DRIVE_TENDERDASH_METRICS_PORT:?err}:${PLATFORM_DRIVE_TENDERDASH_METRICS_PORT:?err} # Metrics
volumes:
- drive_tenderdash:/tenderdash
- ${DASHMATE_HOME_DIR:?err}/${CONFIG_NAME:?err}/platform/drive/tenderdash:/tenderdash/config:ro
Expand Down Expand Up @@ -155,7 +155,7 @@ services:
org.dashmate.service.title: "DAPI Envoy"
restart: unless-stopped
ports:
- ${DOCKER_NETWORK_BIND_IP:?err}:${PLATFORM_DAPI_ENVOY_HTTP_PORT:?err}:10000 # JSON RPC and gRPC Web & Native
- ${PLATFORM_DAPI_ENVOY_HTTP_HOST:?err}:${PLATFORM_DAPI_ENVOY_HTTP_PORT:?err}:10000 # JSON RPC and gRPC Web & Native
depends_on:
- dapi_api
- dapi_tx_filter_stream
Expand Down
48 changes: 37 additions & 11 deletions packages/dashmate/src/config/configJsonSchema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,9 @@ export default {
subnet: {
type: 'string',
},
bindIp: {
type: 'string',
format: 'ipv4',
},
},
additionalProperties: false,
required: ['subnet', 'bindIp'],
required: ['subnet'],
},
baseImage: {
type: 'object',
Expand Down Expand Up @@ -168,6 +164,11 @@ export default {
p2p: {
type: 'object',
properties: {
host: {
type: 'string',
minLength: 1,
format: 'ipv4',
},
port: {
$ref: '#/definitions/port',
},
Expand All @@ -189,12 +190,17 @@ export default {
},
},
},
required: ['port', 'seeds'],
required: ['host', 'port', 'seeds'],
additionalProperties: false,
},
rpc: {
type: 'object',
properties: {
host: {
type: 'string',
minLength: 1,
format: 'ipv4',
},
port: {
$ref: '#/definitions/port',
},
Expand All @@ -213,7 +219,7 @@ export default {
},
},
},
required: ['port', 'user', 'password'],
required: ['host', 'port', 'user', 'password'],
additionalProperties: false,
},
spork: {
Expand Down Expand Up @@ -346,11 +352,16 @@ export default {
http: {
type: 'object',
properties: {
host: {
type: 'string',
minLength: 1,
format: 'ipv4',
},
port: {
$ref: '#/definitions/port',
},
},
required: ['port'],
required: ['host', 'port'],
additionalProperties: false,
},
rateLimiter: {
Expand Down Expand Up @@ -501,6 +512,11 @@ export default {
p2p: {
type: 'object',
properties: {
host: {
type: 'string',
minLength: 1,
format: 'ipv4',
},
port: {
$ref: '#/definitions/port',
},
Expand All @@ -517,7 +533,7 @@ export default {
},
},
},
required: ['port', 'persistentPeers', 'seeds'],
required: ['host', 'port', 'persistentPeers', 'seeds'],
additionalProperties: false,
},
consensus: {
Expand Down Expand Up @@ -556,11 +572,16 @@ export default {
rpc: {
type: 'object',
properties: {
host: {
type: 'string',
minLength: 1,
format: 'ipv4',
},
port: {
$ref: '#/definitions/port',
},
},
required: ['port'],
required: ['host', 'port'],
additionalProperties: false,
},
pprof: {
Expand All @@ -583,11 +604,16 @@ export default {
enabled: {
type: 'boolean',
},
host: {
type: 'string',
minLength: 1,
format: 'ipv4',
},
port: {
$ref: '#/definitions/port',
},
},
required: ['enabled', 'port'],
required: ['enabled', 'host', 'port'],
additionalProperties: false,
},
node: {
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/src/core/startCoreFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default function startCoreFactory(
port: config.get('core.rpc.port'),
user: config.get('core.rpc.user'),
pass: config.get('core.rpc.password'),
host: await getConnectionHost(config, 'core'),
host: await getConnectionHost(config, 'core', 'core.rpc.host'),
},
);

Expand Down
5 changes: 3 additions & 2 deletions packages/dashmate/src/docker/getConnectionHostFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ export default function getConnectionHostFactory(dockerCompose, isHelper) {
* @typedef {function} getConnectionHost
* @param {Config} config
* @param {string} serviceName
* @param {string} hostConfigurationPath
* @return {Promise<string>}
*/
async function getConnectionHost(config, serviceName) {
async function getConnectionHost(config, serviceName, hostConfigurationPath) {
if (isHelper) {
const containerInfo = await dockerCompose.inspectService(config, serviceName);

Expand All @@ -21,7 +22,7 @@ export default function getConnectionHostFactory(dockerCompose, isHelper) {
return containerIP;
}

return '127.0.0.1';
return config.get(hostConfigurationPath);
}

return getConnectionHost;
Expand Down
7 changes: 5 additions & 2 deletions packages/dashmate/src/helper/waitForDashmateHelperAPI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import wait from '../util/wait.js';
*
* @typedef {waitForDashmateHelperAPI}
* @param {Config} config
* @param {{maxRetries: number, delay: number}} options, default 120s
* @param {{maxRetries: number, delay: number}} [options] maxRetries default is 120s
* @return {Promise<void>}
*/
export default async function waitForDashmateHelperAPI(config, options =
Expand All @@ -19,9 +19,12 @@ export default async function waitForDashmateHelperAPI(config, options =

const { maxRetries, delay } = options;

const host = '127.0.0.1';
const port = config.get('dashmate.helper.api.port');

do {
try {
const response = await fetch(`http://127.0.0.1:${config.get('dashmate.helper.api.port')}`, {
const response = await fetch(`http://${host}:${port}`, {
headers: { 'Content-Type': 'application/json' },
method: 'POST',
body: JSON.stringify({
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -19,9 +19,10 @@ export default function waitForNodeToBeReadyTaskFactory(
{
title: `Wait for node ${config.getName()} to be ready`,
task: async () => {
const host = config.get('platform.drive.tenderdash.rpc.host');
const port = config.get('platform.drive.tenderdash.rpc.port');

const tenderdashRpcClient = createTenderdashRpcClient({ port });
const tenderdashRpcClient = createTenderdashRpcClient({ host, port });

let success = false;
do {
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/src/listr/tasks/reindexNodeTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default function reindexNodeTaskFactory(
port: config.get('core.rpc.port'),
user: config.get('core.rpc.user'),
pass: config.get('core.rpc.password'),
host: await getConnectionHost(config, 'core'),
host: await getConnectionHost(config, 'core', 'core.rpc.host'),
});

const container = await getCoreContainer(config);
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/src/listr/tasks/startGroupNodesTaskFactory.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 startGroupNodesTaskFactory(
port: config.get('core.rpc.port'),
user: config.get('core.rpc.user'),
pass: config.get('core.rpc.password'),
host: await getConnectionHost(config, 'core'),
host: await getConnectionHost(config, 'core', 'core.rpc.host'),
});

await waitForCorePeersConnected(rpcClient);
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/src/listr/tasks/startNodeTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export default function startNodeTaskFactory(
port: config.get('core.rpc.port'),
user: config.get('core.rpc.user'),
pass: config.get('core.rpc.password'),
host: await getConnectionHost(config, 'core'),
host: await getConnectionHost(config, 'core', 'core.rpc.host'),
});

return new Observable(async (observer) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/src/listr/tasks/stopNodeTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default function stopNodeTaskFactory(
port: config.get('core.rpc.port'),
user: config.get('core.rpc.user'),
pass: config.get('core.rpc.password'),
host: await getConnectionHost(config, 'core'),
host: await getConnectionHost(config, 'core', 'core.rpc.host'),
});

const { result: { mediantime } } = await rpcClient.getBlockchainInfo();
Expand Down
4 changes: 2 additions & 2 deletions packages/dashmate/src/status/scopes/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function getCoreScopeFactory(
*/
async function getCoreScope(config) {
const network = config.get('network');
const rpcService = config.get('core.rpc.port') ? `127.0.0.1:${config.get('core.rpc.port')}` : null;
const rpcService = `${config.get('core.rpc.host')}:${config.get('core.rpc.port')}`;
const p2pService = config.get('externalIp') ? `${config.get('externalIp')}:${config.get('core.p2p.port')}` : null;

const core = {
Expand Down Expand Up @@ -78,7 +78,7 @@ export default function getCoreScopeFactory(
port: config.get('core.rpc.port'),
user: config.get('core.rpc.user'),
pass: config.get('core.rpc.password'),
host: await getConnectionHost(config, 'core'),
host: await getConnectionHost(config, 'core', 'core.rpc.host'),
});

const [mnsyncStatus, networkInfo, blockchainInfo] = await Promise.all([
Expand Down
4 changes: 2 additions & 2 deletions packages/dashmate/src/status/scopes/masternode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function getMasternodeScopeFactory(
port: config.get('core.rpc.port'),
user: config.get('core.rpc.user'),
pass: config.get('core.rpc.password'),
host: await getConnectionHost(config, 'core'),
host: await getConnectionHost(config, 'core', 'core.rpc.host'),
});

const mnsyncStatus = await rpcClient.mnsync('status');
Expand All @@ -33,7 +33,7 @@ export default function getMasternodeScopeFactory(
port: config.get('core.rpc.port'),
user: config.get('core.rpc.user'),
pass: config.get('core.rpc.password'),
host: await getConnectionHost(config, 'core'),
host: await getConnectionHost(config, 'core', 'core.rpc.host'),
});

const info = {
Expand Down
Loading