Merge branch 'v1.0-dev' into feat/process-asset-locks

# Conflicts: # packages/dashmate/configs/getConfigFileMigrationsFactory.js
dashpay · Oct 30, 2023 · cf39d6a · cf39d6a
2 parents fc08fe1 + 2f879d2
commit cf39d6a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js
@@ -199,7 +199,7 @@ function getBaseConfigFactory(homeDir) {
               createEmptyBlocksInterval: '3m',
             },
             log: {
-              level: 'debug',
+              level: 'info',
               format: 'plain',
               path: null,
             },

diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js
@@ -270,9 +270,11 @@ function getConfigFileMigrationsFactory(homeDir, defaultConfigs) {
 
         return configFile;
       },
-      '0.25.8': (configFile) => {
+      '1.0.0-dev.1': (configFile) => {
         Object.entries(configFile.configs)
           .forEach(([, options]) => {
+            options.platform.tenderdash.log.level = 'info';
+
             if (options.network !== NETWORK_MAINNET) {
               options.core.docker.image = base.get('core.docker.image');
             }

diff --git a/packages/dashmate/src/listr/tasks/setup/setupLocalPresetTaskFactory.js b/packages/dashmate/src/listr/tasks/setup/setupLocalPresetTaskFactory.js
@@ -85,7 +85,7 @@ function setupLocalPresetTaskFactory(
           ctx.minerInterval = await task.prompt({
             type: 'input',
             message: 'Enter the interval between core blocks',
-            initial: configFile.getConfig('base').options.core.miner.interval,
+            initial: configFile.getConfig('base').get('core.miner.interval'),
             validate: (state) => {
               if (state.match(/\d+(\.\d+)?(m|s)/)) {
                 return true;
@@ -239,6 +239,7 @@ function setupLocalPresetTaskFactory(
                       config.set('platform.drive.abci.logs.stdout.format', 'full');
                     }
 
+                    // TODO: Shall we use trace?
                     config.set('platform.drive.tenderdash.log.level', 'debug');
                   }