From 177df0bc2488a408d7f0df25ca240c120c4c9aeb Mon Sep 17 00:00:00 2001 From: Konstantin Shuplenkov Date: Fri, 16 Dec 2022 17:14:29 +0300 Subject: [PATCH 1/3] chore(dashmate): update tenderdash up to 0.10.0-dev.6 --- packages/dashmate/configs/system/base.js | 2 +- packages/dashmate/configs/system/testnet.js | 4 ++-- .../listr/tasks/setup/local/configureTenderdashTaskFactory.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/dashmate/configs/system/base.js b/packages/dashmate/configs/system/base.js index f95d33a762e..aeaa97117bf 100644 --- a/packages/dashmate/configs/system/base.js +++ b/packages/dashmate/configs/system/base.js @@ -131,7 +131,7 @@ module.exports = { }, tenderdash: { docker: { - image: 'dashpay/tenderdash:0.10.0-dev.5', + image: 'dashpay/tenderdash:0.10.0-dev.6', }, p2p: { port: 26656, diff --git a/packages/dashmate/configs/system/testnet.js b/packages/dashmate/configs/system/testnet.js index bcd83d6950f..635ba007b4e 100644 --- a/packages/dashmate/configs/system/testnet.js +++ b/packages/dashmate/configs/system/testnet.js @@ -103,8 +103,8 @@ module.exports = lodashMerge({}, baseConfig, { type: 'tendermint/PubKeyBLS12381', value: 'imxjukh5hRY91Mvm/sfhQp6iSnICyvKMMdhY5Sq6Ej0QJyB3vtN4UfYwvmxdzOVM', }, - quorum_type: 4, - quorum_hash: '0000000000000000000000000000000000000000000000000000000000000000', + validator_quorum_type: 4, + validator_quorum_hash: '0000000000000000000000000000000000000000000000000000000000000000', app_hash: '', }, }, diff --git a/packages/dashmate/src/listr/tasks/setup/local/configureTenderdashTaskFactory.js b/packages/dashmate/src/listr/tasks/setup/local/configureTenderdashTaskFactory.js index 1b252a4d8b4..68b9afb4e35 100644 --- a/packages/dashmate/src/listr/tasks/setup/local/configureTenderdashTaskFactory.js +++ b/packages/dashmate/src/listr/tasks/setup/local/configureTenderdashTaskFactory.js @@ -60,7 +60,7 @@ function configureTenderdashTaskFactory( config.set('platform.drive.tenderdash.p2p.persistentPeers', p2pPeers); config.set( - 'platform.drive.tenderdash.genesis.quorum_type', + 'platform.drive.tenderdash.genesis.validator_quorum_type', config.get('platform.drive.abci.validatorSet.llmqType'), ); From 1e311a46361daf84ae38a0cf401863d359dc36da Mon Sep 17 00:00:00 2001 From: Konstantin Shuplenkov Date: Fri, 16 Dec 2022 17:17:04 +0300 Subject: [PATCH 2/3] fead(drive): initChain commits data only if all operations were success --- .../js-drive/lib/abci/handlers/initChainHandlerFactory.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/js-drive/lib/abci/handlers/initChainHandlerFactory.js b/packages/js-drive/lib/abci/handlers/initChainHandlerFactory.js index 6364252d3e7..9db11dd6cec 100644 --- a/packages/js-drive/lib/abci/handlers/initChainHandlerFactory.js +++ b/packages/js-drive/lib/abci/handlers/initChainHandlerFactory.js @@ -99,10 +99,6 @@ function initChainHandlerFactory( 'Synchronized masternode identities', ); - await groveDBStore.commitTransaction(); - - const appHash = await groveDBStore.getRootHash(); - // Set initial validator set await validatorSet.initialize(initialCoreChainLockedHeight); @@ -117,6 +113,10 @@ function initChainHandlerFactory( consensusLogger, ); + const appHash = await groveDBStore.getRootHash({ useTransaction: true }); + + await groveDBStore.commitTransaction(); + consensusLogger.trace(validatorSetUpdate, `Validator set initialized with ${quorumHash} quorum`); consensusLogger.info( From 0aaff15a7fd4e3aab8a9141397acf26a2142d8cf Mon Sep 17 00:00:00 2001 From: Konstantin Shuplenkov Date: Fri, 16 Dec 2022 17:17:55 +0300 Subject: [PATCH 3/3] WIP --- .../js-drive/lib/abci/handlers/initChainHandlerFactory.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/js-drive/lib/abci/handlers/initChainHandlerFactory.js b/packages/js-drive/lib/abci/handlers/initChainHandlerFactory.js index 9db11dd6cec..6364252d3e7 100644 --- a/packages/js-drive/lib/abci/handlers/initChainHandlerFactory.js +++ b/packages/js-drive/lib/abci/handlers/initChainHandlerFactory.js @@ -99,6 +99,10 @@ function initChainHandlerFactory( 'Synchronized masternode identities', ); + await groveDBStore.commitTransaction(); + + const appHash = await groveDBStore.getRootHash(); + // Set initial validator set await validatorSet.initialize(initialCoreChainLockedHeight); @@ -113,10 +117,6 @@ function initChainHandlerFactory( consensusLogger, ); - const appHash = await groveDBStore.getRootHash({ useTransaction: true }); - - await groveDBStore.commitTransaction(); - consensusLogger.trace(validatorSetUpdate, `Validator set initialized with ${quorumHash} quorum`); consensusLogger.info(