Merge branch 'v1.3-dev' into release_1.3.0-dev.6

dashpay · Sep 18, 2024 · 9c6ee9a · 9c6ee9a
2 parents 1cb02ab + 44c4731
commit 9c6ee9a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js
@@ -311,7 +311,7 @@ export default function getBaseConfigFactory() {
           tenderdash: {
             mode: 'full',
             docker: {
-              image: 'dashpay/tenderdash:1',
+              image: 'dashpay/tenderdash:fix-wrong-proposer-at-round',
             },
             p2p: {
               host: '0.0.0.0',

diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js
@@ -886,6 +886,13 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
           });
         return configFile;
       },
+      '1.3.0-dev.6': (configFile) => {
+        Object.entries(configFile.configs)
+          .forEach(([, options]) => {
+            options.platform.drive.tenderdash.docker.image = 'dashpay/tenderdash:fix-wrong-proposer-at-round';
+          });
+        return configFile;
+      },
     };
   }
 

diff --git a/packages/rs-drive-abci/src/execution/engine/consensus_params_update/v0/mod.rs b/packages/rs-drive-abci/src/execution/engine/consensus_params_update/v0/mod.rs
@@ -30,7 +30,7 @@ pub(super) fn consensus_params_update_v0(
             }
         }
         Network::Testnet => {
-            if epoch_info.is_first_block_of_epoch(1475) {
+            if epoch_info.is_first_block_of_epoch(1476) {
                 return Some(ConsensusParams {
                     block: None,
                     evidence: None,