Skip to content
This repository was archived by the owner on Dec 16, 2021. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
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
14 changes: 14 additions & 0 deletions configs/migrations.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,10 @@ module.exports = {

config.core.sentinel.docker.image = systemConfigs.base.core.sentinel.docker.image;
}

if (typeof config.core.tor === 'undefined') {
config.core.tor = systemConfigs.base.core.tor;
}
});

// Set validator set LLMQ Type
Expand Down Expand Up @@ -251,6 +255,16 @@ module.exports = {
configFile.configs.testnet.platform.dashpay = systemConfigs.testnet.platform.dashpay;
configFile.configs.testnet.platform.featureFlags = systemConfigs.testnet.platform.featureFlags;

return configFile;
},
'0.21.0': (configFile) => {
Object.entries(configFile.configs)
.forEach(([, config]) => {
if (typeof config.core.tor === 'undefined') {
config.core.tor = systemConfigs.base.core.tor;
}
});

return configFile;
},
};
23 changes: 22 additions & 1 deletion configs/schema/configJsonSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,27 @@ module.exports = {
required: ['docker'],
additionalProperties: false,
},
tor: {
type: 'object',
properties: {
enable: {
type: 'boolean',
},
docker: {
$ref: '#/definitions/docker',
},
proxy: {
type: 'object',
properties: {
port: {
$ref: '#/definitions/port',
},
},
},
},
required: ['enable', 'docker', 'proxy'],
additionalProperties: false,
},
devnetName: {
type: ['string', 'null'],
minLength: 1,
Expand All @@ -204,7 +225,7 @@ module.exports = {
enum: [0, 1],
},
},
required: ['docker', 'p2p', 'rpc', 'spork', 'masternode', 'miner', 'devnetName', 'debug'],
required: ['docker', 'p2p', 'rpc', 'spork', 'masternode', 'miner', 'sentinel', 'tor', 'devnetName', 'debug'],
additionalProperties: false,
},
platform: {
Expand Down
9 changes: 9 additions & 0 deletions configs/system/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ module.exports = {
image: 'dashpay/sentinel:1.6.0',
},
},
tor: {
enable: false,
docker: {
image: 'dperson/torproxy',
},
proxy: {
port: 9050,
},
},
debug: 0,
devnetName: null,
},
Expand Down
3 changes: 3 additions & 0 deletions configs/system/testnet.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ module.exports = lodashMerge({}, baseConfig, {
rpc: {
port: 19998,
},
tor: {
enable: true,
},
},
platform: {
dpns: {
Expand Down
12 changes: 12 additions & 0 deletions docker-compose.tor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: '3.7'

services:
core_tor:
image: ${CORE_TOR_DOCKER_IMAGE:?err}
restart: unless-stopped
ports:
- ${CORE_TOR_PROXY_PORT:?err}:${CORE_TOR_PROXY_PORT:?err}
volumes:
- ${DASHMATE_HOME_DIR:?err}/${CONFIG_NAME:?err}/core/tor/torrc:/etc/tor/torrc
environment:
- SERVICE=${CORE_P2P_PORT:?err};core:${CORE_P2P_PORT:?err}
4 changes: 4 additions & 0 deletions src/config/Config.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ class Config {
toEnvs() {
const dockerComposeFiles = ['docker-compose.yml'];

if (this.get('core.tor.enable') === true) {
dockerComposeFiles.push('docker-compose.tor.yml');
}

if (this.has('platform')) {
dockerComposeFiles.push('docker-compose.platform.yml');

Expand Down
7 changes: 7 additions & 0 deletions templates/core/tor/torrc.dot
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
AutomapHostsOnResolve 1
DNSPort 5353
DataDirectory /var/lib/tor
ExitPolicy reject *:*
Log notice stderr
RunAsDaemon 0
User tor