diff --git a/Cargo.lock b/Cargo.lock index 0d3f3b9ca61..b98fe562b21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1252,7 +1252,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2740,7 +2740,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -3895,7 +3895,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.4", + "socket2 0.5.10", "system-configuration", "tokio", "tower-service", @@ -4139,7 +4139,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -4926,7 +4926,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5801,8 +5801,8 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03da047801ff44bb6a4d407d4860c05fd70bb81714e6b2f3812603d5b145b042" dependencies = [ - "heck 0.5.0", - "itertools 0.14.0", + "heck 0.4.1", + "itertools 0.10.5", "log", "multimap", "petgraph", @@ -5823,7 +5823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.117", @@ -5836,7 +5836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.117", @@ -5952,7 +5952,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.2", "rustls", - "socket2 0.6.4", + "socket2 0.5.10", "thiserror 2.0.18", "tokio", "tracing", @@ -5991,7 +5991,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.4", + "socket2 0.5.10", "tracing", "windows-sys 0.59.0", ] @@ -6805,7 +6805,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -6864,7 +6864,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -7695,13 +7695,13 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] name = "tenderdash-abci" -version = "1.8.1" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.8.1#eebfc46cc64b27022ccbbb3924604dd87a10c340" +version = "2.0.0-dev.2" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v2.0.0-dev.2#80b946ee9c52913608e0423e9cd885a1b76d25bf" dependencies = [ "bytes", "futures", @@ -7721,8 +7721,8 @@ dependencies = [ [[package]] name = "tenderdash-proto" -version = "1.8.1" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.8.1#eebfc46cc64b27022ccbbb3924604dd87a10c340" +version = "2.0.0-dev.2" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v2.0.0-dev.2#80b946ee9c52913608e0423e9cd885a1b76d25bf" dependencies = [ "bytes", "chrono", @@ -7741,8 +7741,8 @@ dependencies = [ [[package]] name = "tenderdash-proto-compiler" -version = "1.8.1" -source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v1.8.1#eebfc46cc64b27022ccbbb3924604dd87a10c340" +version = "2.0.0-dev.2" +source = "git+https://github.com/dashpay/rs-tenderdash-abci?tag=v2.0.0-dev.2#80b946ee9c52913608e0423e9cd885a1b76d25bf" dependencies = [ "fs_extra", "prost-build", @@ -9140,7 +9140,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] diff --git a/packages/dapi-grpc/Cargo.toml b/packages/dapi-grpc/Cargo.toml index 811ba42861c..84b70e44ddf 100644 --- a/packages/dapi-grpc/Cargo.toml +++ b/packages/dapi-grpc/Cargo.toml @@ -57,7 +57,7 @@ serde = ["dep:serde", "dep:serde_bytes", "tenderdash-proto/serde"] mocks = ["serde", "dep:serde_json"] [dependencies] -tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", tag = "v1.8.1", default-features = false } +tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", tag = "v2.0.0-dev.2", default-features = false } prost = { version = "0.14" } futures-core = "0.3.30" diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js index c563a92402d..ad7fca223eb 100644 --- a/packages/dashmate/configs/defaults/getBaseConfigFactory.js +++ b/packages/dashmate/configs/defaults/getBaseConfigFactory.js @@ -379,7 +379,7 @@ export default function getBaseConfigFactory() { tenderdash: { mode: 'full', docker: { - image: 'dashpay/tenderdash:1.8', + image: 'dashpay/tenderdash:2.0.0-dev.2', }, p2p: { host: '0.0.0.0', diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js index 3edc76275e5..c39baecf0ac 100644 --- a/packages/dashmate/configs/getConfigFileMigrationsFactory.js +++ b/packages/dashmate/configs/getConfigFileMigrationsFactory.js @@ -1899,6 +1899,31 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs) return configFile; }, + // Sorts after every 5.1 prerelease key, so it runs for configs stamped by any 5.1 + // prerelease build. Configs stamped 5.1.0 skip any 5.1 prerelease key added later. + '5.1.0': (configFile) => { + Object.entries(configFile.configs) + .forEach(([, options]) => { + const tenderdash = options.platform?.drive?.tenderdash; + + if (tenderdash?.docker) { + tenderdash.docker.image = base.get('platform.drive.tenderdash.docker.image'); + } + + // Tenderdash 2.0 validates the P2P section on start and refuses to run + // with an empty packet payload or more outgoing than total connections. + const p2p = tenderdash?.p2p; + if (p2p?.maxPacketMsgPayloadSize === 0) { + p2p.maxPacketMsgPayloadSize = getDefaultConfigByNetwork(options.network) + .get('platform.drive.tenderdash.p2p.maxPacketMsgPayloadSize'); + } + if (p2p?.maxOutgoingConnections > p2p?.maxConnections) { + p2p.maxOutgoingConnections = p2p.maxConnections; + } + }); + + return configFile; + }, }; } diff --git a/packages/dashmate/docker-compose.yml b/packages/dashmate/docker-compose.yml index c81076900b9..74c990060a1 100644 --- a/packages/dashmate/docker-compose.yml +++ b/packages/dashmate/docker-compose.yml @@ -131,7 +131,8 @@ services: volumes: - drive_tenderdash:/tenderdash - ${DASHMATE_HOME_DIR:?err}/${CONFIG_NAME:?err}/platform/drive/tenderdash:/tenderdash/config:ro - stop_grace_period: 10s + # Longer than Tenderdash's 30s --shutdown-timeout, so cleanup can finish before SIGKILL. + stop_grace_period: 40s profiles: - platform diff --git a/packages/dashmate/docs/config/tenderdash.md b/packages/dashmate/docs/config/tenderdash.md index 21f1fbd4d0c..0a8eb49161d 100644 --- a/packages/dashmate/docs/config/tenderdash.md +++ b/packages/dashmate/docs/config/tenderdash.md @@ -18,7 +18,7 @@ Tenderdash can operate in different modes depending on the node's role in the ne | Option | Description | Default | Example | |--------|-------------|---------|---------| -| `platform.drive.tenderdash.docker.image` | Docker image for Tenderdash | `dashpay/tenderdash:1.8` | `dashpay/tenderdash:latest` | +| `platform.drive.tenderdash.docker.image` | Docker image for Tenderdash | `dashpay/tenderdash:2.0.0-dev.2` | `dashpay/tenderdash:latest` | ## P2P diff --git a/packages/dashmate/src/config/configJsonSchema.js b/packages/dashmate/src/config/configJsonSchema.js index 66cddade75a..0185e381014 100644 --- a/packages/dashmate/src/config/configJsonSchema.js +++ b/packages/dashmate/src/config/configJsonSchema.js @@ -1169,7 +1169,7 @@ export default { }, maxPacketMsgPayloadSize: { type: 'integer', - minimum: 0, + minimum: 1, }, sendRate: { type: 'integer', diff --git a/packages/dashmate/templates/platform/drive/tenderdash/config.toml.dot b/packages/dashmate/templates/platform/drive/tenderdash/config.toml.dot index 220f84df843..9a5194a6e7b 100644 --- a/packages/dashmate/templates/platform/drive/tenderdash/config.toml.dot +++ b/packages/dashmate/templates/platform/drive/tenderdash/config.toml.dot @@ -541,14 +541,9 @@ unsafe-vote-timeout-delta-override = "{{= it.platform.drive.tenderdash.consensus # Options: # 1) "null" (default) - no indexer services. # 2) "kv" - a simple indexer backed by key-value storage (see DBBackend) -# 3) "psql" - the indexer services backed by PostgreSQL. -# When "kv" or "psql" is chosen "tx.height" and "tx.hash" will always be indexed. +# When "kv" is chosen "tx.height" and "tx.hash" will always be indexed. indexer = ["kv"] -# The PostgreSQL connection configuration, the connection format: -# postgresql://:@:/? -psql-conn = "" - ####################################################### ### Instrumentation Configuration Options ### ####################################################### diff --git a/packages/dashmate/test/unit/config/configFile/tenderdashImageMigration.spec.js b/packages/dashmate/test/unit/config/configFile/tenderdashImageMigration.spec.js index c93aa55fa9e..f460523d587 100644 --- a/packages/dashmate/test/unit/config/configFile/tenderdashImageMigration.spec.js +++ b/packages/dashmate/test/unit/config/configFile/tenderdashImageMigration.spec.js @@ -1,29 +1,36 @@ import fs from 'fs'; import path from 'path'; import getBaseConfigFactory from '../../../../configs/defaults/getBaseConfigFactory.js'; +import getLocalConfigFactory from '../../../../configs/defaults/getLocalConfigFactory.js'; import getConfigFileMigrationsFactory from '../../../../configs/getConfigFileMigrationsFactory.js'; +import InvalidOptionError from '../../../../src/config/errors/InvalidOptionError.js'; import getConfigFormatVersion from '../../../../src/config/configFile/getConfigFormatVersion.js'; import migrateConfigFileFactory from '../../../../src/config/configFile/migrateConfigFileFactory.js'; import { PACKAGE_ROOT_DIR } from '../../../../src/constants.js'; describe('Tenderdash image migration', () => { const { version } = JSON.parse(fs.readFileSync(path.join(PACKAGE_ROOT_DIR, 'package.json'), 'utf8')); - const base = getBaseConfigFactory()(); - const defaults = new Map(['base', 'mainnet', 'testnet'].map((name) => [name, base])); + const getBaseConfig = getBaseConfigFactory(); + const base = getBaseConfig(); + const local = getLocalConfigFactory(getBaseConfig)(); + const defaults = new Map([ + ...['base', 'mainnet', 'testnet'].map((name) => [name, base]), + ['local', local], + ]); const getMigrations = getConfigFileMigrationsFactory(null, defaults); const migrateConfigFile = migrateConfigFileFactory(getMigrations); - it('should use the floating 1.8 tag for new configurations', () => { - expect(base.get('platform.drive.tenderdash.docker.image')).to.equal('dashpay/tenderdash:1.8'); + it('should use the Tenderdash 2.0.0-dev.2 image for new configurations', () => { + expect(base.get('platform.drive.tenderdash.docker.image')).to.equal('dashpay/tenderdash:2.0.0-dev.2'); }); - for (const fromVersion of ['4.2.0-dev.1', '4.2.0-beta.3']) { + for (const fromVersion of ['4.2.0-dev.1', '4.2.0-beta.3', '5.0.0-rc.3', '5.0.3']) { it(`should migrate pinned images from config format ${fromVersion}`, () => { const configFileData = { configFormatVersion: fromVersion, configs: { - mainnet: { platform: { drive: { tenderdash: { docker: { image: 'dashpay/tenderdash:1.8.0' } } } } }, - testnet: { platform: { drive: { tenderdash: { docker: { image: 'dashpay/tenderdash:1.7' } } } } }, + mainnet: { platform: { drive: { tenderdash: { docker: { image: 'dashpay/tenderdash:1.8' } } } } }, + testnet: { platform: { drive: { tenderdash: { docker: { image: 'dashpay/tenderdash:1.8.2' } } } } }, withoutPlatform: {}, withoutDocker: { platform: { drive: { tenderdash: {} } } }, }, @@ -33,7 +40,7 @@ describe('Tenderdash image migration', () => { for (const name of ['mainnet', 'testnet']) { expect(migrated.configs[name].platform.drive.tenderdash.docker.image) - .to.equal('dashpay/tenderdash:1.8'); + .to.equal('dashpay/tenderdash:2.0.0-dev.2'); } expect(migrated.configs.withoutPlatform).to.deep.equal({}); expect(migrated.configs.withoutDocker).to.deep.equal({ @@ -46,4 +53,45 @@ describe('Tenderdash image migration', () => { expect(migrateConfigFile(migrated, migrated.configFormatVersion, version)).to.equal(migrated); }); } + + describe('P2P settings Tenderdash 2.0 refuses to start with', () => { + function migrateP2p(configs) { + return migrateConfigFile({ configFormatVersion: '5.0.3', configs }, '5.0.3', version).configs; + } + + function p2pConfig(network, p2p) { + return { network, platform: { drive: { tenderdash: { docker: {}, p2p } } } }; + } + + it('should reject a zero maxPacketMsgPayloadSize', () => { + const config = getBaseConfig(); + + expect(() => config.set('platform.drive.tenderdash.p2p.maxPacketMsgPayloadSize', 0)) + .to.throw(InvalidOptionError); + }); + + it('should reset a zero maxPacketMsgPayloadSize to the network default', () => { + const configs = migrateP2p({ + mainnet: p2pConfig('mainnet', { maxPacketMsgPayloadSize: 0 }), + local: p2pConfig('local', { maxPacketMsgPayloadSize: 0 }), + custom: p2pConfig('testnet', { maxPacketMsgPayloadSize: 4096 }), + }); + + expect(configs.mainnet.platform.drive.tenderdash.p2p.maxPacketMsgPayloadSize).to.equal(10240); + expect(configs.local.platform.drive.tenderdash.p2p.maxPacketMsgPayloadSize).to.equal(1024); + expect(configs.custom.platform.drive.tenderdash.p2p.maxPacketMsgPayloadSize).to.equal(4096); + }); + + it('should cap maxOutgoingConnections at maxConnections', () => { + const configs = migrateP2p({ + above: p2pConfig('mainnet', { maxConnections: 20, maxOutgoingConnections: 30 }), + equal: p2pConfig('mainnet', { maxConnections: 30, maxOutgoingConnections: 30 }), + below: p2pConfig('mainnet', { maxConnections: 64, maxOutgoingConnections: 30 }), + }); + + expect(configs.above.platform.drive.tenderdash.p2p.maxOutgoingConnections).to.equal(20); + expect(configs.equal.platform.drive.tenderdash.p2p.maxOutgoingConnections).to.equal(30); + expect(configs.below.platform.drive.tenderdash.p2p.maxOutgoingConnections).to.equal(30); + }); + }); }); diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index bd7ecc81a38..082df27f017 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -51,7 +51,7 @@ tracing-subscriber = { version = "0.3.22", default-features = false, features = "registry", "tracing-log", ], optional = false } -tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", tag = "v1.8.1", features = [ +tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", tag = "v2.0.0-dev.2", features = [ "grpc", ] } time = { version = "0.3", optional = true, features = [ diff --git a/packages/rs-drive-abci/src/abci/handler/verify_vote_extension.rs b/packages/rs-drive-abci/src/abci/handler/verify_vote_extension.rs index ce15941e3ae..2a14e9df7e0 100644 --- a/packages/rs-drive-abci/src/abci/handler/verify_vote_extension.rs +++ b/packages/rs-drive-abci/src/abci/handler/verify_vote_extension.rs @@ -8,7 +8,9 @@ use tenderdash_abci::proto::abci::response_verify_vote_extension::VerifyStatus; /// transactions this node built for the same block. /// /// Tenderdash asks about every non-nil precommit of another validator at the height it is -/// deciding, whatever the round, and drops the vote when it is rejected. +/// deciding, whatever the round, and drops the vote when it is rejected. It also asks about a +/// commit's threshold-recovered extensions, with an empty `validator_pro_tx_hash`, after +/// `process_proposal` of the committed block; a rejection there halts block replay and sync. pub fn verify_vote_extension( app: &A, request: proto::RequestVerifyVoteExtension, @@ -136,6 +138,27 @@ mod tests { .status } + /// A commit's extension vector, as Tenderdash sends it after `process_proposal` of the + /// committed block: no validator, the commit round, only threshold-recoverable extensions. + fn verify_commit( + app: &FullAbciApplication, + round: u32, + block_hash: [u8; 32], + vote_extensions: Vec, + ) -> i32 { + let request = proto::RequestVerifyVoteExtension { + hash: block_hash.to_vec(), + validator_pro_tx_hash: vec![], + height: HEIGHT as i64, + round: round as i32, + vote_extensions, + }; + + verify_vote_extension::<_, MockCoreRPCLike>(app, request) + .expect("verification answers with a status") + .status + } + /// Round 0 accepted at `HEIGHT`, at `ROUND_0_CORE_HEIGHT` fn accept_round_0(app: &FullAbciApplication) { app.unsigned_withdrawal_txs_by_round @@ -348,4 +371,42 @@ mod tests { VerifyStatus::Reject as i32 ); } + + /// Tenderdash verifies a commit's extensions before it finalizes the block, also during + /// block sync and replay, and halts on a rejection. + #[test] + fn should_accept_the_extensions_of_a_commit_of_an_accepted_block() { + let platform = platform(); + let app = FullAbciApplication::::new(&platform.platform); + accept_round_0(&app); + accept_round_1(&app); + + assert_eq!( + verify_commit(&app, 1, ROUND_1_BLOCK, round_1_extensions()), + VerifyStatus::Accept as i32 + ); + assert_eq!( + verify_commit(&app, 0, ROUND_0_BLOCK, round_0_extensions()), + VerifyStatus::Accept as i32 + ); + assert_eq!( + verify_commit(&app, 1, ROUND_1_BLOCK, round_0_extensions()), + VerifyStatus::Reject as i32 + ); + } + + #[test] + fn should_accept_the_empty_extensions_of_a_commit_without_withdrawals() { + let platform = platform(); + let app = FullAbciApplication::::new(&platform.platform); + app.unsigned_withdrawal_txs_by_round + .write() + .unwrap() + .insert(HEIGHT, 0, ROUND_0_BLOCK, vec![]); + + assert_eq!( + verify_commit(&app, 0, ROUND_0_BLOCK, vec![]), + VerifyStatus::Accept as i32 + ); + } } diff --git a/packages/rs-drive-proof-verifier/Cargo.toml b/packages/rs-drive-proof-verifier/Cargo.toml index 03a7fb1fad1..25a03e7b684 100644 --- a/packages/rs-drive-proof-verifier/Cargo.toml +++ b/packages/rs-drive-proof-verifier/Cargo.toml @@ -34,7 +34,7 @@ dash-context-provider = { path = "../rs-context-provider", features = [ bincode = { workspace = true, features = ["serde"] } platform-serialization-derive = { path = "../rs-platform-serialization-derive", optional = true } platform-serialization = { path = "../rs-platform-serialization" } -tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", tag = "v1.8.1", features = [ +tenderdash-abci = { git = "https://github.com/dashpay/rs-tenderdash-abci", tag = "v2.0.0-dev.2", features = [ "crypto", ], default-features = false } tracing = { version = "0.1.41" } diff --git a/packages/rs-sdk/src/platform/transition/asset_lock_submission.rs b/packages/rs-sdk/src/platform/transition/asset_lock_submission.rs index 457250c8a45..1c534048795 100644 --- a/packages/rs-sdk/src/platform/transition/asset_lock_submission.rs +++ b/packages/rs-sdk/src/platform/transition/asset_lock_submission.rs @@ -259,8 +259,8 @@ fn encoded_len(proof: &AssetLockProof) -> Option { /// Each retry bumps `settings.user_fee_increase` so the resubmitted ST /// hashes differently — Tenderdash caches rejected ST hashes for ~24h /// on mainnet/testnet (`keep-invalid-txs-in-cache = true`), so an -/// identical-bytes resubmit would be silently dropped before reaching -/// Platform's CheckTx. +/// identical-bytes resubmit would get the cached CheckTx rejection back +/// without reaching Platform's CheckTx again. /// /// **Retry scope.** This wrapper retries ONLY consensus code 10506 /// (CL-height-too-low). Every other `Error` — including