feat: add Tor service

configs/migrations.js

@@ -184,6 +184,10 @@ module.exports = {
         if (typeof config.platform.drive.tenderdash.log === 'undefined') {
           config.platform.drive.tenderdash.log = systemConfigs.base.platform.drive.tenderdash.log;
         }
+
+        if (typeof config.core.tor === 'undefined') {
+          config.core.tor = systemConfigs.base.core.tor;
+        }
       });
   },
 };

configs/schema/configJsonSchema.js

@@ -195,6 +195,41 @@ 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',
+                },
+              },
+            },
+            control: {
+              type: 'object',
+              properties: {
+                port: {
+                  $ref: '#/definitions/port',
+                },
+                password: {
+                  type: 'string',
+                  minLength: 1,
+                },
+              },
+              required: ['port', 'password'],
+              additionalProperties: false,
+            },
+          },
+          required: ['enable', 'docker', 'proxy', 'control'],
+          additionalProperties: false,
+        },
         devnetName: {
           type: ['string', 'null'],
           minLength: 1,
@@ -204,7 +239,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: {

configs/system/base.js

@@ -7,7 +7,7 @@ module.exports = {
   group: null,
   core: {
     docker: {
-      image: 'dashpay/dashd:0.17.0.0-rc5',
+      image: 'strophy/dashd:tor',
     },
     p2p: {
       port: 20001,
@@ -38,6 +38,19 @@ module.exports = {
         image: 'dashpay/sentinel:1.5.0',
       },
     },
+    tor: {
+      enable: true,
+      docker: {
+        image: 'dperson/torproxy',
+      },
+      proxy: {
+        port: 9050,
+      },
+      control: {
+        port: 9051,
+        password: 'torcontrolpassword',
+      },
+    },
     debug: 0,
     devnetName: null,
   },

configs/system/local.js

@@ -8,6 +8,11 @@ const baseConfig = require('./base');
 
 module.exports = lodashMerge({}, baseConfig, {
   description: 'template for local configs',
+  core: {
+    tor: {
+      enable: false,
+    },
+  },
   platform: {
     dapi: {
       envoy: {

docker-compose.tor.yml

@@ -0,0 +1,21 @@
+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:
+      - PASSWORD=${CORE_TOR_CONTROL_PASSWORD}
+
+  core:
+    depends_on:
+      - core_tor
+    environment:
+      - TOR_CONTROL_HOST=core_tor
+      - TOR_CONTROL_PORT=${CORE_TOR_CONTROL_PORT}
+      - TOR_CONTROL_PASSWORD=${CORE_TOR_CONTROL_PASSWORD}
+      - TOR_PROXY_PORT=${CORE_TOR_PROXY_PORT}

src/config/Config.js

@@ -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');
 

templates/core/dash.conf.dot

@@ -62,3 +62,4 @@ port={{=it.core.p2p.port}}
 bind=0.0.0.0
 rpcbind=0.0.0.0
 rpcport={{=it.core.rpc.port}}
+{{? it.core.tor.enable}}torpassword={{=it.core.tor.control.password}}{{?}}

templates/core/tor/torrc.dot

@@ -0,0 +1,11 @@
+AutomapHostsOnResolve 1
+ControlPort 0.0.0.0:{{=it.core.tor.control.port}}
+DNSPort 5353
+DataDirectory /var/lib/tor
+ExitPolicy reject *:*
+Log notice stderr
+RunAsDaemon 0
+SocksPort 0.0.0.0:{{=it.core.tor.proxy.port}} IsolateDestAddr
+TransPort 0.0.0.0:9040
+User tor
+VirtualAddrNetworkIPv4 10.192.0.0/10