chore: merge v2.0.1 into v2.1-dev

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)
 
 

package.json

@@ -113,4 +113,4 @@
     "dompurify": "^3.2.6",
     "node-gyp": "^10.0.1"
   }
-}
+}

packages/bench-suite/package.json

@@ -56,4 +56,4 @@
     "url": "https://github.com/dashevo/platform/issues"
   },
   "homepage": "https://github.com/dashevo/platform#readme"
-}
+}

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]

packages/dapi-grpc/package.json

@@ -64,4 +64,4 @@
     "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0"
   }
-}
+}

packages/dapi/package.json

@@ -84,4 +84,4 @@
     "url": "https://github.com/dashevo/dapi/issues"
   },
   "homepage": "https://github.com/dashevo/dapi#readme"
-}
+}

packages/dash-spv/package.json

@@ -28,4 +28,4 @@
     "should": "^13.2.3",
     "sinon": "^17.0.1"
   }
-}
+}

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,
                 },
               },
             },

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]) => {

packages/dashmate/package.json

@@ -166,4 +166,4 @@
     },
     "topicSeparator": " "
   }
-}
+}

packages/dashpay-contract/package.json

@@ -35,4 +35,4 @@
     "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0"
   }
-}
+}

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"]

packages/dpns-contract/package.json

@@ -41,4 +41,4 @@
     "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0"
   }
-}
+}

packages/feature-flags-contract/package.json

@@ -42,4 +42,4 @@
     "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0"
   }
-}
+}

packages/js-dapi-client/package.json

@@ -102,4 +102,4 @@
     ]
   },
   "license": "MIT"
-}
+}

packages/js-dash-sdk/package.json

@@ -109,4 +109,4 @@
     "webpack": "^5.94.0",
     "webpack-cli": "^4.9.1"
   }
-}
+}

packages/js-grpc-common/package.json

@@ -34,4 +34,4 @@
     "long": "^5.2.0",
     "semver": "^7.5.3"
   }
-}
+}

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"

packages/keyword-search-contract/lib/systemIds.js

@@ -1,4 +1,4 @@
 module.exports = {
   ownerId: '11111111111111111111111111111111',
-  contractId: '7CSFGeF4WNzgDmx94zwvHkYaG3Dx4XEe5LFsFgJswLbm',
+  contractId: 'BsjE6tQxG47wffZCRQCovFx5rYrAYYC3rTVRWKro27LA',
 };

packages/keyword-search-contract/package.json

@@ -26,4 +26,4 @@
     "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0"
   }
-}
+}

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<Valu
         }),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use base58::FromBase58;
+
+    use super::*;
+
+    #[test]
+    /// Ensure that the ID constant matches the expected value
+    /// and that it can be encoded to base58 correctly.
+    fn test_id() {
+        assert_eq!(
+            ID,
+            Identifier(IdentifierBytes32(ID_BYTES)),
+            "ID should match the expected value"
+        );
+
+        let base58_decoded = "BsjE6tQxG47wffZCRQCovFx5rYrAYYC3rTVRWKro27LA"
+            .from_base58()
+            .unwrap();
+        assert_eq!(
+            base58_decoded, ID_BYTES,
+            "ID should match the base58 decoded value"
+        );
+    }
+}

packages/masternode-reward-shares-contract/package.json

@@ -41,4 +41,4 @@
     "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0"
   }
-}
+}

packages/platform-test-suite/package.json

@@ -81,4 +81,4 @@
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.29.0"
   }
-}
+}