From c02ecf27c40bd8fe362fb0c4ea8ad46767ed1a6e Mon Sep 17 00:00:00 2001
From: Ivan Shumkov <ivan@shumkov.ru>
Date: Wed, 29 Mar 2023 12:12:25 +0800
Subject: [PATCH] refactor(dashmate): move core devnet options to subsection

---
 packages/dashmate/configs/migrations.js       |  9 +++++
 .../configs/schema/configJsonSchema.js        | 33 +++++++++++--------
 packages/dashmate/configs/system/base.js      |  8 +++--
 .../dashmate/templates/core/dash.conf.dot     |  6 ++--
 4 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/packages/dashmate/configs/migrations.js b/packages/dashmate/configs/migrations.js
index dfce03a2202..34fa96c26a4 100644
--- a/packages/dashmate/configs/migrations.js
+++ b/packages/dashmate/configs/migrations.js
@@ -497,6 +497,15 @@ module.exports = {
               .platform.drive.tenderdash.rpc.port;
           }
         }
+
+        config.core.devnet.name = config.core.devnetName;
+        delete config.core.devnetName;
+
+        config.core.devnet.powTargetSpacing = config.core.powTargetSpacing;
+        delete config.core.powTargetSpacing;
+
+        config.core.devnet.minimumDifficultyBlocks = config.core.minimumDifficultyBlocks;
+        delete config.core.minimumDifficultyBlocks;
       });
 
     return configFile;
diff --git a/packages/dashmate/configs/schema/configJsonSchema.js b/packages/dashmate/configs/schema/configJsonSchema.js
index a756e3b4505..8045b2e9beb 100644
--- a/packages/dashmate/configs/schema/configJsonSchema.js
+++ b/packages/dashmate/configs/schema/configJsonSchema.js
@@ -224,17 +224,24 @@ module.exports = {
           required: ['docker'],
           additionalProperties: false,
         },
-        minimumDifficultyBlocks: {
-          type: 'integer',
-          minimum: 0,
-        },
-        powTargetSpacing: {
-          type: 'integer',
-          minimum: 1,
-        },
-        devnetName: {
-          type: ['string', 'null'],
-          minLength: 1,
+        devnet: {
+          type: 'object',
+          properties: {
+            name: {
+              type: ['string', 'null'],
+              minLength: 1,
+            },
+            minimumDifficultyBlocks: {
+              type: 'integer',
+              minimum: 0,
+            },
+            powTargetSpacing: {
+              type: 'integer',
+              minimum: 1,
+            },
+          },
+          additionalProperties: false,
+          required: ['name', 'minimumDifficultyBlocks', 'powTargetSpacing'],
         },
         debug: {
           type: 'integer',
@@ -263,8 +270,8 @@ module.exports = {
           additionalProperties: false,
         },
       },
-      required: ['docker', 'p2p', 'rpc', 'spork', 'masternode', 'miner', 'devnetName',
-        'debug', 'reindex', 'minimumDifficultyBlocks', 'powTargetSpacing', 'logIps', 'indexes'],
+      required: ['docker', 'p2p', 'rpc', 'spork', 'masternode', 'miner', 'devnet',
+        'debug', 'reindex', 'logIps', 'indexes'],
       additionalProperties: false,
     },
     platform: {
diff --git a/packages/dashmate/configs/system/base.js b/packages/dashmate/configs/system/base.js
index 747bba51a35..79a87c4a5d0 100644
--- a/packages/dashmate/configs/system/base.js
+++ b/packages/dashmate/configs/system/base.js
@@ -74,16 +74,18 @@ module.exports = {
         image: 'dashpay/sentinel:1.7.1',
       },
     },
+    devnet: {
+      name: null,
+      minimumDifficultyBlocks: 0,
+      powTargetSpacing: 150,
+    },
     debug: 0,
     logIps: 0,
     indexes: true,
-    minimumDifficultyBlocks: 0,
-    powTargetSpacing: 150,
     reindex: {
       enable: false,
       containerId: null,
     },
-    devnetName: null,
   },
   platform: {
     dapi: {
diff --git a/packages/dashmate/templates/core/dash.conf.dot b/packages/dashmate/templates/core/dash.conf.dot
index 22a4fa602e6..2e0332b854d 100644
--- a/packages/dashmate/templates/core/dash.conf.dot
+++ b/packages/dashmate/templates/core/dash.conf.dot
@@ -58,14 +58,14 @@ regtest=1
 {{? it.core.miner.mediantime}}mocktime={{=it.core.miner.mediantime}}{{?}}
 
 {{?? it.network === 'devnet'}}
-devnet={{=it.core.devnetName}}
+devnet={{=it.core.devnet.name}}
 [devnet]
 {{? it.core.spork.address}}sporkaddr={{=it.core.spork.address}}{{?}}
 {{? it.core.spork.privateKey}}sporkkey={{=it.core.spork.privateKey}}{{?}}
 
 # devnet-specific
-powtargetspacing={{=it.core.powTargetSpacing}}
-minimumdifficultyblocks={{=it.core.minimumDifficultyBlocks}}
+powtargetspacing={{=it.core.devnet.powTargetSpacing}}
+minimumdifficultyblocks={{=it.core.devnet.minimumDifficultyBlocks}}
 highsubsidyblocks=500
 highsubsidyfactor=10
 llmqchainlocks=llmq_devnet