diff --git a/CHANGELOG.md b/CHANGELOG.md index 6272d326873..612182d8b68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -103,6 +103,17 @@ * bump tenderdash-abci to v1.5.0-dev.2 ([#2770](https://github.com/dashpay/platform/issues/2770)) * update rust to 1.89 ([#2755](https://github.com/dashpay/platform/issues/2755)) +### [2.0.1](https://github.com/dashpay/platform/compare/v2.0.0...v2.0.1) (2025-07-10) + + +### ⚠ BREAKING CHANGES + +* **platform:** update keyword search contract ID and owner ID bytes (#2693) + +### Bug Fixes + +* **platform:** update keyword search contract ID and owner ID bytes ([#2693](https://github.com/dashpay/platform/issues/2693)) + ## [2.0.0](https://github.com/dashpay/platform/compare/v2.0.0-rc.16...v2.0.0) (2025-06-26) diff --git a/Cargo.lock b/Cargo.lock index e8b0ecbbce2..616d61e7bfc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -372,6 +372,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" +[[package]] +name = "base58" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" + [[package]] name = "base58ck" version = "0.1.0" @@ -1017,7 +1023,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -2105,7 +2111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] @@ -3208,7 +3214,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3435,6 +3441,7 @@ dependencies = [ name = "keyword-search-contract" version = "2.1.0-dev.7" dependencies = [ + "base58", "platform-value", "platform-version", "serde_json", @@ -3472,7 +3479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667" dependencies = [ "cfg-if 1.0.3", - "windows-targets 0.48.5", + "windows-targets 0.53.3", ] [[package]] @@ -5200,7 +5207,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5213,7 +5220,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.11.0", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] @@ -6011,7 +6018,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix 1.1.2", - "windows-sys 0.52.0", + "windows-sys 0.61.0", ] [[package]] @@ -7241,7 +7248,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.0", ] [[package]] diff --git a/package.json b/package.json index 663f29ea333..54156ff2ac0 100644 --- a/package.json +++ b/package.json @@ -113,4 +113,4 @@ "dompurify": "^3.2.6", "node-gyp": "^10.0.1" } -} +} \ No newline at end of file diff --git a/packages/bench-suite/package.json b/packages/bench-suite/package.json index 9e5aa758ae7..b437ca94c23 100644 --- a/packages/bench-suite/package.json +++ b/packages/bench-suite/package.json @@ -56,4 +56,4 @@ "url": "https://github.com/dashevo/platform/issues" }, "homepage": "https://github.com/dashevo/platform#readme" -} +} \ No newline at end of file diff --git a/packages/dapi-grpc/Cargo.toml b/packages/dapi-grpc/Cargo.toml index c6c9245454d..f8c493daf79 100644 --- a/packages/dapi-grpc/Cargo.toml +++ b/packages/dapi-grpc/Cargo.toml @@ -51,9 +51,7 @@ platform-version = { path = "../rs-platform-version" } tonic-prost = { version = "0.14.2" } [target.'cfg(target_arch = "wasm32")'.dependencies] -tonic = { version = "0.14.2", features = [ - "codegen", -], default-features = false } +tonic = { version = "0.14.2", features = ["codegen"], default-features = false } getrandom = { version = "0.2", features = ["js"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] diff --git a/packages/dapi-grpc/package.json b/packages/dapi-grpc/package.json index e55f851f603..e414f27788c 100644 --- a/packages/dapi-grpc/package.json +++ b/packages/dapi-grpc/package.json @@ -64,4 +64,4 @@ "sinon": "^17.0.1", "sinon-chai": "^3.7.0" } -} +} \ No newline at end of file diff --git a/packages/dapi/package.json b/packages/dapi/package.json index 8b98e0fb95d..ee2f4674d77 100644 --- a/packages/dapi/package.json +++ b/packages/dapi/package.json @@ -84,4 +84,4 @@ "url": "https://github.com/dashevo/dapi/issues" }, "homepage": "https://github.com/dashevo/dapi#readme" -} +} \ No newline at end of file diff --git a/packages/dash-spv/package.json b/packages/dash-spv/package.json index b6b75052f37..ac7b51c4b96 100644 --- a/packages/dash-spv/package.json +++ b/packages/dash-spv/package.json @@ -28,4 +28,4 @@ "should": "^13.2.3", "sinon": "^17.0.1" } -} +} \ No newline at end of file diff --git a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js index 3422ad2438c..5ea3bccc701 100644 --- a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js +++ b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js @@ -1,8 +1,8 @@ import lodash from 'lodash'; +import Config from '../../src/config/Config.js'; import { NETWORK_TESTNET, } from '../../src/constants.js'; -import Config from '../../src/config/Config.js'; const { merge: lodashMerge } = lodash; /** @@ -116,8 +116,38 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) { chain_id: 'dash-testnet-51', validator_quorum_type: 6, consensus_params: { + block: { + max_bytes: '2097152', + max_gas: '57631392000', + }, + evidence: { + max_age_num_blocks: '100000', + max_age_duration: '172800000000000', + max_bytes: '512000', + }, + validator: { + pub_key_types: [ + 'bls12381', + ], + }, version: { app_version: '1', + consensus: '0', + }, + synchrony: { + precision: '500000000', + message_delay: '32000000000', + }, + timeout: { + propose: '30000000000', + propose_delta: '1000000000', + vote: '2000000000', + vote_delta: '500000000', + commit: '0', + bypass_commit_timeout: false, + }, + abci: { + recheck_tx: true, }, }, }, diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js index 9aa5870c943..a39f2016260 100644 --- a/packages/dashmate/configs/getConfigFileMigrationsFactory.js +++ b/packages/dashmate/configs/getConfigFileMigrationsFactory.js @@ -554,7 +554,7 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs) Object.entries(configFile.configs) .forEach(([name, options]) => { if (options.network === NETWORK_TESTNET && name !== 'base') { - options.platform.drive.tenderdash.genesis = testnet.get('platform.drive.tenderdash.genesis'); + options.platform.drive.tenderdash.genesis = lodash.cloneDeep(testnet.get('platform.drive.tenderdash.genesis')); } const defaultConfig = getDefaultConfigByNameOrGroup(name, options.group); @@ -758,7 +758,7 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs) options.core.devnet.llmq = base.get('core.devnet.llmq'); if (options.network === NETWORK_TESTNET) { - options.platform.drive.tenderdash.genesis = testnet.get('platform.drive.tenderdash.genesis'); + options.platform.drive.tenderdash.genesis = lodash.cloneDeep(testnet.get('platform.drive.tenderdash.genesis')); } }); return configFile; @@ -784,7 +784,7 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs) Object.entries(configFile.configs) .forEach(([, options]) => { if (options.network === NETWORK_TESTNET) { - options.platform.drive.tenderdash.genesis = testnet.get('platform.drive.tenderdash.genesis'); + options.platform.drive.tenderdash.genesis = lodash.cloneDeep(testnet.get('platform.drive.tenderdash.genesis')); } // Update tenderdash image @@ -1096,6 +1096,15 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs) }); return configFile; }, + '2.0.2-rc.1': (configFile) => { + Object.entries(configFile.configs) + .forEach(([name, options]) => { + if (options.network === NETWORK_TESTNET && name !== 'base') { + options.platform.drive.tenderdash.genesis.consensus_params = lodash.cloneDeep(testnet.get('platform.drive.tenderdash.genesis.consensus_params')); + } + }); + return configFile; + }, '2.1.0-dev.1': (configFile) => { Object.entries(configFile.configs) .forEach(([, options]) => { diff --git a/packages/dashmate/package.json b/packages/dashmate/package.json index fbf77f98848..c8774af8f99 100644 --- a/packages/dashmate/package.json +++ b/packages/dashmate/package.json @@ -166,4 +166,4 @@ }, "topicSeparator": " " } -} +} \ No newline at end of file diff --git a/packages/dashpay-contract/package.json b/packages/dashpay-contract/package.json index 56afcd54fff..0d506e80314 100644 --- a/packages/dashpay-contract/package.json +++ b/packages/dashpay-contract/package.json @@ -35,4 +35,4 @@ "sinon": "^17.0.1", "sinon-chai": "^3.7.0" } -} +} \ No newline at end of file diff --git a/packages/data-contracts/Cargo.toml b/packages/data-contracts/Cargo.toml index eac84ebe94b..1fc670aab9b 100644 --- a/packages/data-contracts/Cargo.toml +++ b/packages/data-contracts/Cargo.toml @@ -9,7 +9,16 @@ license = "MIT" [features] default = ["all-contracts"] # Include all contracts -all-contracts = ["withdrawals", "masternode-rewards", "dpns", "dashpay", "feature-flags", "wallet-utils", "token-history", "keyword-search"] +all-contracts = [ + "withdrawals", + "masternode-rewards", + "dpns", + "dashpay", + "feature-flags", + "wallet-utils", + "token-history", + "keyword-search", +] # Individual contract features withdrawals = ["dep:withdrawals-contract"] diff --git a/packages/dpns-contract/package.json b/packages/dpns-contract/package.json index 1628ce054b3..3368e2f5dc5 100644 --- a/packages/dpns-contract/package.json +++ b/packages/dpns-contract/package.json @@ -41,4 +41,4 @@ "sinon": "^17.0.1", "sinon-chai": "^3.7.0" } -} +} \ No newline at end of file diff --git a/packages/feature-flags-contract/package.json b/packages/feature-flags-contract/package.json index a8fc954e1c5..45ab22dd4e5 100644 --- a/packages/feature-flags-contract/package.json +++ b/packages/feature-flags-contract/package.json @@ -42,4 +42,4 @@ "sinon": "^17.0.1", "sinon-chai": "^3.7.0" } -} +} \ No newline at end of file diff --git a/packages/js-dapi-client/package.json b/packages/js-dapi-client/package.json index 009ce58753c..67fc09ecde7 100644 --- a/packages/js-dapi-client/package.json +++ b/packages/js-dapi-client/package.json @@ -102,4 +102,4 @@ ] }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/js-dash-sdk/package.json b/packages/js-dash-sdk/package.json index db206ab2165..03ee4a2c6bc 100644 --- a/packages/js-dash-sdk/package.json +++ b/packages/js-dash-sdk/package.json @@ -109,4 +109,4 @@ "webpack": "^5.94.0", "webpack-cli": "^4.9.1" } -} +} \ No newline at end of file diff --git a/packages/js-grpc-common/package.json b/packages/js-grpc-common/package.json index e3abb95e257..993267d9d7a 100644 --- a/packages/js-grpc-common/package.json +++ b/packages/js-grpc-common/package.json @@ -34,4 +34,4 @@ "long": "^5.2.0", "semver": "^7.5.3" } -} +} \ No newline at end of file diff --git a/packages/keyword-search-contract/Cargo.toml b/packages/keyword-search-contract/Cargo.toml index 9b0a40a92d0..31cb8525f27 100644 --- a/packages/keyword-search-contract/Cargo.toml +++ b/packages/keyword-search-contract/Cargo.toml @@ -11,3 +11,5 @@ thiserror = "2.0.12" platform-version = { path = "../rs-platform-version" } serde_json = { version = "1.0" } platform-value = { path = "../rs-platform-value" } +[dev-dependencies] +base58 = "0.2.0" diff --git a/packages/keyword-search-contract/lib/systemIds.js b/packages/keyword-search-contract/lib/systemIds.js index f1aa5b80c07..82fdd9b7dd6 100644 --- a/packages/keyword-search-contract/lib/systemIds.js +++ b/packages/keyword-search-contract/lib/systemIds.js @@ -1,4 +1,4 @@ module.exports = { ownerId: '11111111111111111111111111111111', - contractId: '7CSFGeF4WNzgDmx94zwvHkYaG3Dx4XEe5LFsFgJswLbm', + contractId: 'BsjE6tQxG47wffZCRQCovFx5rYrAYYC3rTVRWKro27LA', }; diff --git a/packages/keyword-search-contract/package.json b/packages/keyword-search-contract/package.json index dafc7b09630..42413d8da27 100644 --- a/packages/keyword-search-contract/package.json +++ b/packages/keyword-search-contract/package.json @@ -26,4 +26,4 @@ "sinon": "^17.0.1", "sinon-chai": "^3.7.0" } -} +} \ No newline at end of file diff --git a/packages/keyword-search-contract/src/lib.rs b/packages/keyword-search-contract/src/lib.rs index e074d139c7f..0375042f95f 100644 --- a/packages/keyword-search-contract/src/lib.rs +++ b/packages/keyword-search-contract/src/lib.rs @@ -7,8 +7,8 @@ use platform_version::version::PlatformVersion; use serde_json::Value; pub const ID_BYTES: [u8; 32] = [ - 92, 20, 14, 101, 92, 2, 101, 187, 194, 168, 8, 113, 109, 225, 132, 121, 133, 19, 89, 24, 173, - 81, 205, 253, 11, 118, 102, 75, 169, 91, 163, 124, + 161, 147, 167, 153, 40, 225, 219, 101, 50, 156, 28, 146, 150, 52, 114, 213, 56, 154, 106, 15, + 79, 66, 18, 156, 94, 146, 216, 104, 140, 93, 170, 215, ]; pub const OWNER_ID_BYTES: [u8; 32] = [0; 32]; @@ -35,3 +35,29 @@ pub fn load_documents_schemas(platform_version: &PlatformVersion) -> Result