chore(dashmate)!: adjust consensus params and enable re-check (#1669)

dashpay · Jan 12, 2024 · 31f84e4 · 31f84e4
1 parent b3f0114
commit 31f84e4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 31 deletions.
diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js
@@ -230,17 +230,34 @@ export default function getBaseConfigFactory(homeDir) {
             genesis: {
               consensus_params: {
                 block: {
-                  max_bytes: '22020096', max_gas: '-1', time_iota_ms: '5000',
+                  max_bytes: '2097152', max_gas: '57631392000', time_iota_ms: '5000',
                 },
                 evidence: {
-                  max_age: '100000', max_age_num_blocks: '100000', max_age_duration: '172800000000000',
+                  max_age: '100000',
+                  max_age_num_blocks: '100000',
+                  max_age_duration: '172800000000000',
                 },
                 validator: {
                   pub_key_types: ['bls12381'],
                 },
                 version: {
                   app_version: '1',
                 },
+                timeout: {
+                  propose: '30000000000',
+                  propose_delta: '1000000000',
+                  vote: '2000000000',
+                  vote_delta: '500000000',
+                  commit: '1000000000',
+                  bypass_commit_timeout: false,
+                },
+                synchrony: {
+                  message_delay: '32000000000',
+                  precision: '500000000',
+                },
+                abci: {
+                  recheck_tx: true,
+                },
               },
             },
             moniker: null,

diff --git a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js
@@ -82,35 +82,6 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
             genesis: {
               genesis_time: '2023-11-02T10:18:00.000Z',
               chain_id: 'dash-testnet-37',
-              initial_core_chain_locked_height: 918609,
-              consensus_params: {
-                timeout: {
-                  propose: '50000000000',
-                  propose_delta: '10000000000',
-                  vote: '500000000',
-                  vote_delta: '100000000',
-                  commit: '1000000000',
-                  bypass_commit_timeout: false,
-                },
-                block: {
-                  max_bytes: '22020096',
-                  max_gas: '-1',
-                  time_iota_ms: '5000',
-                },
-                evidence: {
-                  max_age: '100000',
-                  max_age_num_blocks: '100000',
-                  max_age_duration: '172800000000000',
-                },
-                validator: {
-                  pub_key_types: [
-                    'bls12381',
-                  ],
-                },
-                version: {
-                  app_version: '1',
-                },
-              },
               validator_quorum_type: 6,
             },
           },

diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js
@@ -406,6 +406,16 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
 
         return configFile;
       },
+      '1.0.0-dev.2': (configFile) => {
+        Object.entries(configFile.configs)
+          .forEach(([name, options]) => {
+            if (defaultConfigs.has(name)) {
+              options.platform.drive.tenderdash.genesis = defaultConfigs.get(name).get('options.platform.drive.tenderdash.genesis');
+            }
+          });
+
+        return configFile;
+      },
     };
   }