diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9d2d8775921..036e6ac49c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -137,7 +137,7 @@ jobs: image_name: drive target: drive-abci - release-drive-dapi: + release-dapi-image: name: Release DAPI image secrets: inherit uses: ./.github/workflows/release-docker-image.yml diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js index 9584a47fcea..b671976c609 100644 --- a/packages/dashmate/configs/defaults/getBaseConfigFactory.js +++ b/packages/dashmate/configs/defaults/getBaseConfigFactory.js @@ -54,7 +54,7 @@ export default function getBaseConfigFactory(homeDir) { port: 3001, }, docker: { - image: 'dashpay/dashd:20', + image: 'dashpay/dashd:21', commandArgs: [], }, p2p: { @@ -332,10 +332,10 @@ export default function getBaseConfigFactory(homeDir) { cacheSize: 15000, size: 5000, maxTxsBytes: 1073741824, - timeoutCheckTx: '0', - txEnqueueTimeout: '0', - txSendRateLimit: 0, - txRecvRateLimit: 0, + timeoutCheckTx: '1s', + txEnqueueTimeout: '10ms', + txSendRateLimit: 10, + txRecvRateLimit: 12, maxConcurrentCheckTx: 250, }, consensus: { @@ -388,8 +388,8 @@ export default function getBaseConfigFactory(homeDir) { app_version: '1', }, timeout: { - propose: '30000000000', - propose_delta: '1000000000', + propose: '40000000000', + propose_delta: '5000000000', vote: '2000000000', vote_delta: '500000000', commit: '1000000000', @@ -397,7 +397,7 @@ export default function getBaseConfigFactory(homeDir) { }, synchrony: { message_delay: '32000000000', - precision: '500000000', + precision: '1000000000', }, abci: { recheck_tx: true, diff --git a/packages/dashmate/configs/defaults/getLocalConfigFactory.js b/packages/dashmate/configs/defaults/getLocalConfigFactory.js index eb1a4100557..ebc4e014aed 100644 --- a/packages/dashmate/configs/defaults/getLocalConfigFactory.js +++ b/packages/dashmate/configs/defaults/getLocalConfigFactory.js @@ -24,10 +24,6 @@ export default function getLocalConfigFactory(getBaseConfig) { }, }, core: { - docker: { - image: 'dashpay/dashd:21.0.0-rc.2', - commandArgs: [], - }, p2p: { port: 20001, }, diff --git a/packages/dashmate/configs/defaults/getMainnetConfigFactory.js b/packages/dashmate/configs/defaults/getMainnetConfigFactory.js index a744b69d763..10e050bc97e 100644 --- a/packages/dashmate/configs/defaults/getMainnetConfigFactory.js +++ b/packages/dashmate/configs/defaults/getMainnetConfigFactory.js @@ -37,6 +37,44 @@ export default function getMainnetConfigFactory(homeDir, getBaseConfig) { network: NETWORK_MAINNET, platform: { enable: false, + drive: { + tenderdash: { + p2p: { + seeds: [ + { + id: '069639dfceec5f7c86257e6e9c46407c16ad1eab', + host: '34.211.174.194', + port: 26656, + }, + { + id: 'd46e2445642b2f94158ac3c2a6d90b88b83705b8', + host: '3.76.148.150', + port: 26656, + }, + { + id: 'b08a650ecfac178939f21c0c12801eccaf18a5ea', + host: '3.0.60.103', + port: 26656, + }, + { + id: '4cb4a8488eb1dbabda7fb79e47ac3c14eec73c4f', + host: '188.166.140.47', + port: 26656, + }, + ], + }, + mempool: { + timeoutCheckTx: '3s', + txEnqueueTimeout: '30ms', + txSendRateLimit: 100, + txRecvRateLimit: 120, + }, + genesis: { + chain_id: 'dash-1', + validator_quorum_type: 4, + }, + }, + }, }, }; diff --git a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js index 477bbae1473..d21310ee2d0 100644 --- a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js +++ b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js @@ -24,10 +24,6 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) { }, }, core: { - docker: { - image: 'dashpay/dashd:21.0.0-rc.2', - commandArgs: [], - }, p2p: { port: 19999, }, @@ -95,12 +91,6 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) { ], port: 36656, }, - mempool: { - timeoutCheckTx: '1s', - txEnqueueTimeout: '10ms', - txSendRateLimit: 10, - txRecvRateLimit: 12, - }, rpc: { port: 36657, timeoutBroadcastTx: '1s', diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js index 41e15f806fd..c077de0bd3a 100644 --- a/packages/dashmate/configs/getConfigFileMigrationsFactory.js +++ b/packages/dashmate/configs/getConfigFileMigrationsFactory.js @@ -23,6 +23,7 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs) function getConfigFileMigrations() { const base = defaultConfigs.get('base'); const testnet = defaultConfigs.get('testnet'); + const mainnet = defaultConfigs.get('mainnet'); /** * @param {string} name @@ -733,6 +734,28 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs) }); return configFile; }, + '1.0.0': (configFile) => { + Object.entries(configFile.configs) + .forEach(([name, options]) => { + if (name === 'base') { + options.platform.drive.tenderdash.mempool = base.get('platform.drive.tenderdash.mempool'); + options.platform.drive.tenderdash.genesis = base.get('platform.drive.tenderdash.genesis'); + } else if (options.network === NETWORK_MAINNET) { + options.platform.drive.tenderdash.p2p = mainnet.get('platform.drive.tenderdash.p2p'); + options.platform.drive.tenderdash.mempool = mainnet.get('platform.drive.tenderdash.mempool'); + options.platform.drive.tenderdash.genesis = mainnet.get('platform.drive.tenderdash.genesis'); + + if (options.platform.drive.tenderdash.node.id !== null) { + options.platform.enable = true; + } + } + + // Update tenderdash image + options.platform.drive.tenderdash.docker.image = base.get('platform.drive.tenderdash.docker.image'); + options.core.docker.image = base.get('core.docker.image'); + }); + return configFile; + }, }; } diff --git a/packages/dashmate/src/listr/tasks/setup/setupRegularPresetTaskFactory.js b/packages/dashmate/src/listr/tasks/setup/setupRegularPresetTaskFactory.js index 2e02b6cb0ba..76949757aa3 100644 --- a/packages/dashmate/src/listr/tasks/setup/setupRegularPresetTaskFactory.js +++ b/packages/dashmate/src/listr/tasks/setup/setupRegularPresetTaskFactory.js @@ -5,7 +5,6 @@ import chalk from 'chalk'; import { NODE_TYPE_MASTERNODE, NODE_TYPE_FULLNODE, - PRESET_MAINNET, } from '../../../constants.js'; import { @@ -83,8 +82,7 @@ export default function setupRegularPresetTaskFactory( ctx.config = defaultConfigs.get(ctx.preset); - // TODO: We need to change this and enable platform on mainnet - ctx.config.set('platform.enable', ctx.isHP && ctx.config.get('network') !== PRESET_MAINNET); + ctx.config.set('platform.enable', ctx.isHP); ctx.config.set('core.masternode.enable', ctx.nodeType === NODE_TYPE_MASTERNODE); if (ctx.config.get('core.masternode.enable')) {