diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c41750db24..768627649e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,72 @@ +## [2.1.0-dev.4](https://github.com/dashpay/platform/compare/v2.0.0...v2.1.0-dev.4) (2025-09-18) + + +### ⚠ BREAKING CHANGES + +* **wasm-sdk:** handle identity create transition signing for all types of keys (#2754) +* **wasm-sdk:** remove unused key_id parameters from state transitions (#2759) +* **sdk:** provide all getStatus info (#2729) + +### Features + +* add tests for new token transitions +* evo sdk ([#2771](https://github.com/dashpay/platform/issues/2771)) +* **sdk:** epic: rs-sdk-ffi and ios support ([#2756](https://github.com/dashpay/platform/issues/2756)) +* **sdk:** provide all getStatus info ([#2729](https://github.com/dashpay/platform/issues/2729)) +* **wasm-sdk:** implement four missing token transitions +* **wasm-sdk:** remove unused key_id parameters from state transitions ([#2759](https://github.com/dashpay/platform/issues/2759)) + + +### Bug Fixes + +* **sdk:** fix generate docs ([#2730](https://github.com/dashpay/platform/issues/2730)) +* **sdk:** js sdk audit warnings by adding crypto-related dependencies to package.json ([#2757](https://github.com/dashpay/platform/issues/2757)) +* **wasm-sdk:** handle identity create transition signing for all types of keys ([#2754](https://github.com/dashpay/platform/issues/2754)) +* **wasm-sdk:** address compiler warnings ([#2734](https://github.com/dashpay/platform/issues/2734)) +* **wasm-sdk:** connect where and orderBy clause functionality for getDocuments ([#2753](https://github.com/dashpay/platform/issues/2753)) +* **wasm-sdk:** enable proofs for getContestedResourceVotersForIdentity ([#2732](https://github.com/dashpay/platform/issues/2732)) +* **wasm-sdk:** fix nft transitions ([#2751](https://github.com/dashpay/platform/issues/2751)) +* **wasm-sdk:** resolve CI test failures and build issues ([#2765](https://github.com/dashpay/platform/issues/2765)) +* **wasm-sdk:** resolve test failures and optimize CI workflow ([#2735](https://github.com/dashpay/platform/issues/2735)) +* **wasm-sdk:** use identity contract nonce for data contract updates ([#2738](https://github.com/dashpay/platform/issues/2738)) + + +### Tests + +* **sdk:** expand wasm-sdk page UI testing ([#2720](https://github.com/dashpay/platform/issues/2720)) +* **wasm-sdk:** add ui tests for almost all state transitions ([#2739](https://github.com/dashpay/platform/issues/2739)) + + +### Miscellaneous Chores + +* add wasm-sdk as scope for pr linting ([#2731](https://github.com/dashpay/platform/issues/2731)) +* clean dpp clippy ([#2764](https://github.com/dashpay/platform/issues/2764)) +* **drive:** fix drive linting ([#2763](https://github.com/dashpay/platform/issues/2763)) +* sdk clippy issues ([#2767](https://github.com/dashpay/platform/issues/2767)) +* update yarn cache with new dependencies ([#2758](https://github.com/dashpay/platform/issues/2758)) +* **wasm-sdk:** apply cargo fmt and cleanup ([#2766](https://github.com/dashpay/platform/issues/2766)) + + +### Code Refactoring + +* **sdk:** wasm-sdk doc generation refactor ([#2726](https://github.com/dashpay/platform/issues/2726)) +* swift sdk fixes ([#2772](https://github.com/dashpay/platform/issues/2772)) +* **wasm-sdk:** improve documentation generation maintainability ([#2773](https://github.com/dashpay/platform/issues/2773)) + + +### Continuous Integration + +* dont do CI when it's not needed ([#2774](https://github.com/dashpay/platform/issues/2774)) +* swift CI fixes ([#2775](https://github.com/dashpay/platform/issues/2775)) +* Use self hosted mac runner ([#2776](https://github.com/dashpay/platform/issues/2776)) + + +### Build System + +* add version param to release a specific version +* 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.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 025e59931bc..84101e3ec88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -876,7 +876,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "check-features" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "toml", ] @@ -1308,7 +1308,7 @@ dependencies = [ [[package]] name = "dapi-grpc" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "dapi-grpc-macros", "futures-core", @@ -1326,7 +1326,7 @@ dependencies = [ [[package]] name = "dapi-grpc-macros" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "dapi-grpc", "heck 0.5.0", @@ -1371,7 +1371,7 @@ dependencies = [ [[package]] name = "dash-context-provider" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "dpp", "drive", @@ -1394,7 +1394,7 @@ dependencies = [ [[package]] name = "dash-platform-balance-checker" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "anyhow", "clap", @@ -1410,7 +1410,7 @@ dependencies = [ [[package]] name = "dash-sdk" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "arc-swap", "assert_matches", @@ -1576,7 +1576,7 @@ dependencies = [ [[package]] name = "dashpay-contract" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "platform-value", "platform-version", @@ -1586,7 +1586,7 @@ dependencies = [ [[package]] name = "data-contracts" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "dashpay-contract", "dpns-contract", @@ -1733,7 +1733,7 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "dpns-contract" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "platform-value", "platform-version", @@ -1743,7 +1743,7 @@ dependencies = [ [[package]] name = "dpp" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "anyhow", "assert_matches", @@ -1799,7 +1799,7 @@ dependencies = [ [[package]] name = "drive" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "arc-swap", "assert_matches", @@ -1840,7 +1840,7 @@ dependencies = [ [[package]] name = "drive-abci" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "arc-swap", "assert_matches", @@ -1894,7 +1894,7 @@ dependencies = [ [[package]] name = "drive-proof-verifier" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "bincode 2.0.0-rc.3", "dapi-grpc", @@ -2148,7 +2148,7 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "feature-flags-contract" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "platform-value", "platform-version", @@ -3316,7 +3316,7 @@ dependencies = [ [[package]] name = "json-schema-compatibility-validator" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "assert_matches", "json-patch", @@ -3433,7 +3433,7 @@ dependencies = [ [[package]] name = "keyword-search-contract" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "platform-value", "platform-version", @@ -3584,7 +3584,7 @@ dependencies = [ [[package]] name = "masternode-reward-shares-contract" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "platform-value", "platform-version", @@ -4296,7 +4296,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "platform-serialization" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "bincode 2.0.0-rc.3", "platform-version", @@ -4304,7 +4304,7 @@ dependencies = [ [[package]] name = "platform-serialization-derive" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "proc-macro2", "quote", @@ -4314,7 +4314,7 @@ dependencies = [ [[package]] name = "platform-value" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "base64 0.22.1", "bincode 2.0.0-rc.3", @@ -4333,7 +4333,7 @@ dependencies = [ [[package]] name = "platform-value-convertible" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "quote", "syn 2.0.106", @@ -4341,7 +4341,7 @@ dependencies = [ [[package]] name = "platform-version" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "bincode 2.0.0-rc.3", "grovedb-version", @@ -4352,7 +4352,7 @@ dependencies = [ [[package]] name = "platform-versioning" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "proc-macro2", "quote", @@ -4361,7 +4361,7 @@ dependencies = [ [[package]] name = "platform-wallet" -version = "0.1.0" +version = "2.1.0-dev.4" dependencies = [ "dashcore", "dpp", @@ -5041,7 +5041,7 @@ dependencies = [ [[package]] name = "rs-dapi-client" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "backon", "chrono", @@ -5068,7 +5068,7 @@ dependencies = [ [[package]] name = "rs-sdk-ffi" -version = "2.0.0-rc.14" +version = "2.1.0-dev.4" dependencies = [ "bincode 2.0.0-rc.3", "bs58", @@ -5097,7 +5097,7 @@ dependencies = [ [[package]] name = "rs-sdk-trusted-context-provider" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "arc-swap", "async-trait", @@ -5748,7 +5748,7 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "simple-signer" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "base64 0.22.1", "bincode 2.0.0-rc.3", @@ -5845,7 +5845,7 @@ dependencies = [ [[package]] name = "strategy-tests" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "bincode 2.0.0-rc.3", "dpp", @@ -6242,7 +6242,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token-history-contract" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "platform-value", "platform-version", @@ -6916,7 +6916,7 @@ dependencies = [ [[package]] name = "wallet-utils-contract" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "platform-value", "platform-version", @@ -7054,7 +7054,7 @@ dependencies = [ [[package]] name = "wasm-dpp" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "anyhow", "async-trait", @@ -7078,7 +7078,7 @@ dependencies = [ [[package]] name = "wasm-drive-verify" -version = "1.8.0" +version = "2.1.0-dev.4" dependencies = [ "base64 0.22.1", "bincode 2.0.0-rc.3", @@ -7113,7 +7113,7 @@ dependencies = [ [[package]] name = "wasm-sdk" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "base64 0.22.1", "bip39", @@ -7676,7 +7676,7 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "withdrawals-contract" -version = "2.0.0" +version = "2.1.0-dev.4" dependencies = [ "num_enum 0.5.11", "platform-value", diff --git a/package.json b/package.json index 92a04d68fbd..10cd8673680 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/platform", - "version": "2.0.0", + "version": "2.1.0-dev.4", "private": true, "scripts": { "setup": "yarn install && yarn run build && yarn run configure", diff --git a/packages/bench-suite/package.json b/packages/bench-suite/package.json index 9011bf4e69c..e02478fb2ab 100644 --- a/packages/bench-suite/package.json +++ b/packages/bench-suite/package.json @@ -1,7 +1,7 @@ { "name": "@dashevo/bench-suite", "private": true, - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "Dash Platform benchmark tool", "scripts": { "bench": "node ./bin/bench.js", diff --git a/packages/check-features/Cargo.toml b/packages/check-features/Cargo.toml index ed1ec4c647e..8558c9c4ca6 100644 --- a/packages/check-features/Cargo.toml +++ b/packages/check-features/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "check-features" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/packages/dapi-grpc/Cargo.toml b/packages/dapi-grpc/Cargo.toml index 97d60a6693c..184733d9c3b 100644 --- a/packages/dapi-grpc/Cargo.toml +++ b/packages/dapi-grpc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dapi-grpc" description = "GRPC client for Dash Platform" -version = "2.0.0" +version = "2.1.0-dev.4" authors = [ "Samuel Westrich ", "Igor Markin ", diff --git a/packages/dapi-grpc/package.json b/packages/dapi-grpc/package.json index c6aa41493ef..d51db80aed9 100644 --- a/packages/dapi-grpc/package.json +++ b/packages/dapi-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/dapi-grpc", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "DAPI GRPC definition file and generated clients", "browser": "browser.js", "main": "node.js", diff --git a/packages/dapi/package.json b/packages/dapi/package.json index 2c11248a6ad..6125cb82b02 100644 --- a/packages/dapi/package.json +++ b/packages/dapi/package.json @@ -1,7 +1,7 @@ { "name": "@dashevo/dapi", "private": true, - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "A decentralized API for the Dash network", "scripts": { "api": "node scripts/api.js", diff --git a/packages/dash-platform-balance-checker/Cargo.toml b/packages/dash-platform-balance-checker/Cargo.toml index ce05c9efc1e..492a9872a19 100644 --- a/packages/dash-platform-balance-checker/Cargo.toml +++ b/packages/dash-platform-balance-checker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dash-platform-balance-checker" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" [[bin]] diff --git a/packages/dash-spv/package.json b/packages/dash-spv/package.json index b3ec1bb1d70..f7047a7bfab 100644 --- a/packages/dash-spv/package.json +++ b/packages/dash-spv/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/dash-spv", - "version": "3.0.0", + "version": "3.1.0-dev.4", "description": "Repository containing SPV functions used by @dashevo", "main": "index.js", "scripts": { diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js index 467de99c331..360128a31a8 100644 --- a/packages/dashmate/configs/getConfigFileMigrationsFactory.js +++ b/packages/dashmate/configs/getConfigFileMigrationsFactory.js @@ -1103,6 +1103,9 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs) if (!options.core.zmq) { options.core.zmq = base.get('core.zmq'); } + + options.platform.drive.abci.docker.image = 'dashpay/drive:2-dev'; + options.platform.dapi.api.docker.image = 'dashpay/dapi:2-dev'; }); return configFile; }, diff --git a/packages/dashmate/package.json b/packages/dashmate/package.json index e255b48f1f0..a57cb5b067c 100644 --- a/packages/dashmate/package.json +++ b/packages/dashmate/package.json @@ -1,6 +1,6 @@ { "name": "dashmate", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "Distribution package for Dash node installation", "scripts": { "lint": "eslint .", diff --git a/packages/dashpay-contract/Cargo.toml b/packages/dashpay-contract/Cargo.toml index a41e2020336..2bb6a7f70be 100644 --- a/packages/dashpay-contract/Cargo.toml +++ b/packages/dashpay-contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dashpay-contract" description = "DashPay data contract schema and tools" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/dashpay-contract/package.json b/packages/dashpay-contract/package.json index 6157b1f0703..3a31b53dccd 100644 --- a/packages/dashpay-contract/package.json +++ b/packages/dashpay-contract/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/dashpay-contract", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "Reference contract of the DashPay DPA on Dash Evolution", "scripts": { "lint": "eslint .", diff --git a/packages/data-contracts/Cargo.toml b/packages/data-contracts/Cargo.toml index 42e71d68de5..da7a32a774b 100644 --- a/packages/data-contracts/Cargo.toml +++ b/packages/data-contracts/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "data-contracts" description = "Dash Platform system data contracts" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/dpns-contract/Cargo.toml b/packages/dpns-contract/Cargo.toml index c7236de02a2..c01a7810eca 100644 --- a/packages/dpns-contract/Cargo.toml +++ b/packages/dpns-contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dpns-contract" description = "DPNS data contract schema and tools" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/dpns-contract/package.json b/packages/dpns-contract/package.json index ae239b2ae14..caebbe332ff 100644 --- a/packages/dpns-contract/package.json +++ b/packages/dpns-contract/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/dpns-contract", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "A contract and helper scripts for DPNS DApp", "scripts": { "lint": "eslint .", diff --git a/packages/feature-flags-contract/Cargo.toml b/packages/feature-flags-contract/Cargo.toml index 7505707ff79..aeedab5a3a0 100644 --- a/packages/feature-flags-contract/Cargo.toml +++ b/packages/feature-flags-contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "feature-flags-contract" description = "Feature flags data contract schema and tools" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/feature-flags-contract/package.json b/packages/feature-flags-contract/package.json index 31664f692d4..9f8fa6d0b50 100644 --- a/packages/feature-flags-contract/package.json +++ b/packages/feature-flags-contract/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/feature-flags-contract", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "Data Contract to store Dash Platform feature flags", "scripts": { "build": "", diff --git a/packages/js-dapi-client/package.json b/packages/js-dapi-client/package.json index 6ac68fa37ae..c1ad06cd127 100644 --- a/packages/js-dapi-client/package.json +++ b/packages/js-dapi-client/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/dapi-client", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "Client library used to access Dash DAPI endpoints", "main": "lib/index.js", "contributors": [ diff --git a/packages/js-dash-sdk/package.json b/packages/js-dash-sdk/package.json index 5651d049454..beefd64bb69 100644 --- a/packages/js-dash-sdk/package.json +++ b/packages/js-dash-sdk/package.json @@ -1,6 +1,6 @@ { "name": "dash", - "version": "5.0.0", + "version": "5.1.0-dev.4", "description": "Dash library for JavaScript/TypeScript ecosystem (Wallet, DAPI, Primitives, BLS, ...)", "main": "build/index.js", "unpkg": "dist/dash.min.js", diff --git a/packages/js-evo-sdk/package.json b/packages/js-evo-sdk/package.json index f79365c7c9c..885706befbe 100644 --- a/packages/js-evo-sdk/package.json +++ b/packages/js-evo-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/evo-sdk", - "version": "2.0.0", + "version": "2.1.0-dev.4", "type": "module", "main": "./dist/sdk.js", "types": "./dist/sdk.d.ts", diff --git a/packages/js-grpc-common/package.json b/packages/js-grpc-common/package.json index c10eac078c9..6ade449d455 100644 --- a/packages/js-grpc-common/package.json +++ b/packages/js-grpc-common/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/grpc-common", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "Common GRPC library", "main": "index.js", "scripts": { diff --git a/packages/keyword-search-contract/Cargo.toml b/packages/keyword-search-contract/Cargo.toml index c0ece672ff6..b790043c7bf 100644 --- a/packages/keyword-search-contract/Cargo.toml +++ b/packages/keyword-search-contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "keyword-search-contract" description = "Search data contract schema and tools. Keyword Search contract is used to find other contracts and tokens" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/keyword-search-contract/package.json b/packages/keyword-search-contract/package.json index 34e70cb473b..dbb6a6bffb4 100644 --- a/packages/keyword-search-contract/package.json +++ b/packages/keyword-search-contract/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/keyword-search-contract", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "A contract that allows searching for contracts", "scripts": { "lint": "eslint .", diff --git a/packages/masternode-reward-shares-contract/Cargo.toml b/packages/masternode-reward-shares-contract/Cargo.toml index 7d71dd4753a..e05d81f434d 100644 --- a/packages/masternode-reward-shares-contract/Cargo.toml +++ b/packages/masternode-reward-shares-contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "masternode-reward-shares-contract" description = "Masternode reward shares data contract schema and tools" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/masternode-reward-shares-contract/package.json b/packages/masternode-reward-shares-contract/package.json index 15f73a6fa84..a52268470c8 100644 --- a/packages/masternode-reward-shares-contract/package.json +++ b/packages/masternode-reward-shares-contract/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/masternode-reward-shares-contract", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "A contract and helper scripts for reward sharing", "scripts": { "lint": "eslint .", diff --git a/packages/platform-test-suite/package.json b/packages/platform-test-suite/package.json index 85aff48e7b4..4cf6ea63cf6 100644 --- a/packages/platform-test-suite/package.json +++ b/packages/platform-test-suite/package.json @@ -1,7 +1,7 @@ { "name": "@dashevo/platform-test-suite", "private": true, - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "Dash Network end-to-end tests", "scripts": { "test": "yarn exec bin/test.sh", diff --git a/packages/rs-context-provider/Cargo.toml b/packages/rs-context-provider/Cargo.toml index 7df11ad104c..9315cc4d956 100644 --- a/packages/rs-context-provider/Cargo.toml +++ b/packages/rs-context-provider/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dash-context-provider" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" authors = ["sam@dash.org"] license = "MIT" diff --git a/packages/rs-dapi-client/Cargo.toml b/packages/rs-dapi-client/Cargo.toml index 509b127f373..d8fdbd6ab55 100644 --- a/packages/rs-dapi-client/Cargo.toml +++ b/packages/rs-dapi-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rs-dapi-client" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" [features] diff --git a/packages/rs-dapi-grpc-macros/Cargo.toml b/packages/rs-dapi-grpc-macros/Cargo.toml index ed19373b4aa..aae90bab70a 100644 --- a/packages/rs-dapi-grpc-macros/Cargo.toml +++ b/packages/rs-dapi-grpc-macros/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "dapi-grpc-macros" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" description = "Macros used by dapi-grpc. Internal use only." diff --git a/packages/rs-dpp/Cargo.toml b/packages/rs-dpp/Cargo.toml index 905f2a5c529..30c5eff8f63 100644 --- a/packages/rs-dpp/Cargo.toml +++ b/packages/rs-dpp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dpp" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true authors = [ diff --git a/packages/rs-drive-abci/Cargo.toml b/packages/rs-drive-abci/Cargo.toml index 05bff757b79..b47031213fc 100644 --- a/packages/rs-drive-abci/Cargo.toml +++ b/packages/rs-drive-abci/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "drive-abci" -version = "2.0.0" +version = "2.1.0-dev.4" authors = [ "Samuel Westrich ", "Ivan Shumkov ", diff --git a/packages/rs-drive-proof-verifier/Cargo.toml b/packages/rs-drive-proof-verifier/Cargo.toml index 539ac9deb50..c8d124f04ca 100644 --- a/packages/rs-drive-proof-verifier/Cargo.toml +++ b/packages/rs-drive-proof-verifier/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "drive-proof-verifier" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true diff --git a/packages/rs-drive/Cargo.toml b/packages/rs-drive/Cargo.toml index ff854e0a87f..46c58bba8a2 100644 --- a/packages/rs-drive/Cargo.toml +++ b/packages/rs-drive/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "drive" description = "Dash drive built on top of GroveDB" -version = "2.0.0" +version = "2.1.0-dev.4" authors = [ "Samuel Westrich ", "Ivan Shumkov ", diff --git a/packages/rs-json-schema-compatibility-validator/Cargo.toml b/packages/rs-json-schema-compatibility-validator/Cargo.toml index 308caefb2e9..aca9065711a 100644 --- a/packages/rs-json-schema-compatibility-validator/Cargo.toml +++ b/packages/rs-json-schema-compatibility-validator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "json-schema-compatibility-validator" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true authors = ["Ivan Shumkov "] diff --git a/packages/rs-platform-serialization-derive/Cargo.toml b/packages/rs-platform-serialization-derive/Cargo.toml index 5039c6459c2..83a1e873900 100644 --- a/packages/rs-platform-serialization-derive/Cargo.toml +++ b/packages/rs-platform-serialization-derive/Cargo.toml @@ -2,7 +2,7 @@ name = "platform-serialization-derive" authors = ["Samuel Westrich "] description = "Bincode serialization and deserialization derivations" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/rs-platform-serialization/Cargo.toml b/packages/rs-platform-serialization/Cargo.toml index ba5ee6ff2db..bb3faa8e2a0 100644 --- a/packages/rs-platform-serialization/Cargo.toml +++ b/packages/rs-platform-serialization/Cargo.toml @@ -2,7 +2,7 @@ name = "platform-serialization" authors = ["Samuel Westrich "] description = "Bincode based serialization and deserialization" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/rs-platform-value-convertible/Cargo.toml b/packages/rs-platform-value-convertible/Cargo.toml index cfb66288cfe..b1a79c31652 100644 --- a/packages/rs-platform-value-convertible/Cargo.toml +++ b/packages/rs-platform-value-convertible/Cargo.toml @@ -2,7 +2,7 @@ name = "platform-value-convertible" authors = ["Samuel Westrich "] description = "Convertion to and from platform values" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/rs-platform-value/Cargo.toml b/packages/rs-platform-value/Cargo.toml index 0bc35bec285..572ecf4a44d 100644 --- a/packages/rs-platform-value/Cargo.toml +++ b/packages/rs-platform-value/Cargo.toml @@ -2,7 +2,7 @@ name = "platform-value" authors = ["Samuel Westrich "] description = "A simple value module" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/rs-platform-version/Cargo.toml b/packages/rs-platform-version/Cargo.toml index 98db2822550..011e3812c9f 100644 --- a/packages/rs-platform-version/Cargo.toml +++ b/packages/rs-platform-version/Cargo.toml @@ -2,7 +2,7 @@ name = "platform-version" authors = ["Samuel Westrich "] description = "Versioning library for Platform" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/rs-platform-versioning/Cargo.toml b/packages/rs-platform-versioning/Cargo.toml index f3bc491b20c..cb89cd70731 100644 --- a/packages/rs-platform-versioning/Cargo.toml +++ b/packages/rs-platform-versioning/Cargo.toml @@ -2,7 +2,7 @@ name = "platform-versioning" authors = ["Samuel Westrich "] description = "Version derivation" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/rs-platform-wallet/Cargo.toml b/packages/rs-platform-wallet/Cargo.toml index 25e18792655..9e881f65406 100644 --- a/packages/rs-platform-wallet/Cargo.toml +++ b/packages/rs-platform-wallet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "platform-wallet" -version = "0.1.0" +version = "2.1.0-dev.4" edition = "2021" authors = ["Dash Core Team"] license = "MIT" diff --git a/packages/rs-sdk-ffi/Cargo.toml b/packages/rs-sdk-ffi/Cargo.toml index d6f52da57e1..49154fffd44 100644 --- a/packages/rs-sdk-ffi/Cargo.toml +++ b/packages/rs-sdk-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rs-sdk-ffi" -version = "2.0.0-rc.14" +version = "2.1.0-dev.4" authors = ["Dash Core Group "] edition = "2021" license = "MIT" diff --git a/packages/rs-sdk-trusted-context-provider/Cargo.toml b/packages/rs-sdk-trusted-context-provider/Cargo.toml index 56a65124176..5811456ff26 100644 --- a/packages/rs-sdk-trusted-context-provider/Cargo.toml +++ b/packages/rs-sdk-trusted-context-provider/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rs-sdk-trusted-context-provider" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" authors = ["sam@dash.org"] license = "MIT" diff --git a/packages/rs-sdk/Cargo.toml b/packages/rs-sdk/Cargo.toml index 875f190b685..507e8ced6ea 100644 --- a/packages/rs-sdk/Cargo.toml +++ b/packages/rs-sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dash-sdk" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" [dependencies] diff --git a/packages/simple-signer/Cargo.toml b/packages/simple-signer/Cargo.toml index 95bf9d4b18d..64cbcaeca31 100644 --- a/packages/simple-signer/Cargo.toml +++ b/packages/simple-signer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "simple-signer" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true diff --git a/packages/strategy-tests/Cargo.toml b/packages/strategy-tests/Cargo.toml index f36e82ae7c6..d80ee735b9f 100644 --- a/packages/strategy-tests/Cargo.toml +++ b/packages/strategy-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "strategy-tests" -version = "2.0.0" +version = "2.1.0-dev.4" authors = [ "Samuel Westrich ", "Ivan Shumkov ", diff --git a/packages/token-history-contract/Cargo.toml b/packages/token-history-contract/Cargo.toml index c45cd543979..04fadae8e0d 100644 --- a/packages/token-history-contract/Cargo.toml +++ b/packages/token-history-contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "token-history-contract" description = "Token history data contract schema and tools" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/token-history-contract/package.json b/packages/token-history-contract/package.json index a7dce995f8d..caca830fd2b 100644 --- a/packages/token-history-contract/package.json +++ b/packages/token-history-contract/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/token-history-contract", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "The token history contract", "scripts": { "lint": "eslint .", diff --git a/packages/wallet-lib/package.json b/packages/wallet-lib/package.json index 5061b245a74..147dc32ffc6 100644 --- a/packages/wallet-lib/package.json +++ b/packages/wallet-lib/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/wallet-lib", - "version": "9.0.0", + "version": "9.1.0-dev.4", "description": "Light wallet library for Dash", "main": "src/index.js", "unpkg": "dist/wallet-lib.min.js", diff --git a/packages/wallet-utils-contract/Cargo.toml b/packages/wallet-utils-contract/Cargo.toml index 57f7273eb1d..516f4d35167 100644 --- a/packages/wallet-utils-contract/Cargo.toml +++ b/packages/wallet-utils-contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "wallet-utils-contract" description = "Wallet data contract schema and tools" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/wallet-utils-contract/package.json b/packages/wallet-utils-contract/package.json index cd1b1706274..036d0aebaf9 100644 --- a/packages/wallet-utils-contract/package.json +++ b/packages/wallet-utils-contract/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/wallet-utils-contract", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "A contract and helper scripts for Wallet DApp", "scripts": { "lint": "eslint .", diff --git a/packages/wasm-dpp/Cargo.toml b/packages/wasm-dpp/Cargo.toml index e7510eb10a8..4d3f108a99f 100644 --- a/packages/wasm-dpp/Cargo.toml +++ b/packages/wasm-dpp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-dpp" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true authors = ["Anton Suprunchuk "] diff --git a/packages/wasm-dpp/package.json b/packages/wasm-dpp/package.json index b2fcab376cf..7aca67fc6c8 100644 --- a/packages/wasm-dpp/package.json +++ b/packages/wasm-dpp/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/wasm-dpp", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "The JavaScript implementation of the Dash Platform Protocol", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/wasm-drive-verify/Cargo.toml b/packages/wasm-drive-verify/Cargo.toml index 274eefdc77f..89ccb89a549 100644 --- a/packages/wasm-drive-verify/Cargo.toml +++ b/packages/wasm-drive-verify/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-drive-verify" -version = "1.8.0" +version = "2.1.0-dev.4" authors = ["Dash Core Group "] edition = "2021" rust-version = "1.89" diff --git a/packages/wasm-drive-verify/package.json b/packages/wasm-drive-verify/package.json index f9827a8198c..e1466e36c1f 100644 --- a/packages/wasm-drive-verify/package.json +++ b/packages/wasm-drive-verify/package.json @@ -3,7 +3,7 @@ "collaborators": [ "Dash Core Group " ], - "version": "1.8.0", + "version": "2.1.0-dev.4", "license": "MIT", "description": "WASM bindings for Drive verify functions", "repository": { diff --git a/packages/wasm-sdk/Cargo.toml b/packages/wasm-sdk/Cargo.toml index 1e917ec222e..fd1d678c8c1 100644 --- a/packages/wasm-sdk/Cargo.toml +++ b/packages/wasm-sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasm-sdk" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" publish = false rust-version.workspace = true diff --git a/packages/wasm-sdk/package.json b/packages/wasm-sdk/package.json index 10e86a6f69e..ed7f3a2e68f 100644 --- a/packages/wasm-sdk/package.json +++ b/packages/wasm-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/wasm-sdk", - "version": "2.0.0", + "version": "2.1.0-dev.4", "type": "module", "main": "./dist/sdk.js", "types": "./dist/sdk.d.ts", diff --git a/packages/withdrawals-contract/Cargo.toml b/packages/withdrawals-contract/Cargo.toml index 3f10524b3fe..c6582cb7198 100644 --- a/packages/withdrawals-contract/Cargo.toml +++ b/packages/withdrawals-contract/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "withdrawals-contract" description = "Witdrawals data contract schema and tools" -version = "2.0.0" +version = "2.1.0-dev.4" edition = "2021" rust-version.workspace = true license = "MIT" diff --git a/packages/withdrawals-contract/package.json b/packages/withdrawals-contract/package.json index d27b0852188..39f4530e4e4 100644 --- a/packages/withdrawals-contract/package.json +++ b/packages/withdrawals-contract/package.json @@ -1,6 +1,6 @@ { "name": "@dashevo/withdrawals-contract", - "version": "2.0.0", + "version": "2.1.0-dev.4", "description": "Data Contract to manipulate and track withdrawals", "scripts": { "build": "", diff --git a/scripts/release/bump_version.js b/scripts/release/bump_version.js index eabc74c3d25..5d58fa08864 100755 --- a/scripts/release/bump_version.js +++ b/scripts/release/bump_version.js @@ -14,6 +14,45 @@ const convertPrereleaseType = (version, prereleaseType) => { return `${semver.major(version)}.${semver.minor(version)}.0-${prereleaseType}.1`; }; +const setExactVersion = (targetVersion) => () => targetVersion; + +const parseArgs = (argv) => { + let releaseType; + let targetVersion; + + for (let i = 0; i < argv.length; i += 1) { + const arg = argv[i]; + + if (arg.startsWith('--target-version=')) { + targetVersion = arg.split('=')[1]; + continue; + } + + if (arg === '--target-version') { + targetVersion = argv[i + 1]; + i += 1; + continue; + } + + if (arg.startsWith('--version=')) { + targetVersion = arg.split('=')[1]; + continue; + } + + if (arg === '--version') { + targetVersion = argv[i + 1]; + i += 1; + continue; + } + + if (!releaseType && !arg.startsWith('-')) { + releaseType = arg; + } + } + + return { releaseType, targetVersion }; +}; + const bumpNpmPackages = (versionFunc, releaseType) => { for (const {filename, json} of packagesIterator.npm()) { const {version} = json; @@ -40,7 +79,7 @@ const bumpRustPackages = (versionFunc, releaseType) => { } (async () => { - let [ releaseType ] = process.argv.slice(2); + const { releaseType: releaseTypeArg, targetVersion } = parseArgs(process.argv.slice(2)); const { version: rootVersion } = rootPackageJson; @@ -51,12 +90,40 @@ const bumpRustPackages = (versionFunc, releaseType) => { rootVersionType = semverPrerelease[0]; } + let releaseType = releaseTypeArg; + + if (targetVersion !== undefined && !semver.valid(targetVersion)) { + throw new Error(`Invalid target version: ${targetVersion}`); + } + + if (targetVersion !== undefined && releaseType === undefined) { + const targetPrerelease = semver.prerelease(targetVersion); + releaseType = targetPrerelease !== null ? targetPrerelease[0] : 'release'; + } + // Figure out release type using current version if not set if (releaseType === undefined) { // get releaseType from root package.json releaseType = rootVersionType; } + if (targetVersion !== undefined) { + const targetPrerelease = semver.prerelease(targetVersion); + const targetVersionType = targetPrerelease !== null ? targetPrerelease[0] : 'release'; + + if (releaseType !== targetVersionType) { + throw new Error(`Specified release type (${releaseType}) does not match target version type (${targetVersionType})`); + } + + bumpNpmPackages(setExactVersion(targetVersion), releaseType); + bumpRustPackages(setExactVersion(targetVersion), releaseType); + + rootPackageJson.version = targetVersion; + fs.writeFileSync(path.join(__dirname, '..', '..', 'package.json'), `${JSON.stringify(rootPackageJson, null, 2)}\n`); + + return; + } + if (rootVersionType === releaseType && releaseType === 'release') { // release to release bumpNpmPackages(semver.inc, 'patch'); diff --git a/scripts/release/release.sh b/scripts/release/release.sh index b27e5a15188..6e33f3d3388 100755 --- a/scripts/release/release.sh +++ b/scripts/release/release.sh @@ -12,6 +12,7 @@ cmd_usage="Usage: yarn release [options] Options: -t --type - release, dev or alpha + -v --version - explicitly set target version -c --changelog-from - tag to build changelog from -h --help - show help " @@ -26,12 +27,30 @@ case ${i} in -t=*|--type=*) RELEASE_TYPE="${i#*=}" ;; + -v=*|--version=*) + TARGET_VERSION="${i#*=}" + ;; -c=*|--changelog-from=*) LATEST_TAG="${i#*=}" ;; esac done +# if target version is provided but release type is not, infer release type from version +if [ -n "$TARGET_VERSION" ]; then + if ! node -e "require.resolve('semver')" >/dev/null 2>&1; then + echo "Error: 'semver' package not found. Run 'yarn add -D semver' in the repo root." >&2 + exit 1 + fi + # validate target version + if ! node -e "const semver=require('semver');process.exit(semver.valid('$TARGET_VERSION')?0:1)"; then + echo "Error: TARGET_VERSION '$TARGET_VERSION' is not a valid semver." >&2 + exit 1 + fi + if [ -z "$RELEASE_TYPE" ]; then + RELEASE_TYPE=$(node -e "const semver=require('semver');const pr=semver.prerelease('$TARGET_VERSION');console.log(pr ? pr[0] : 'release');") + fi +fi # if parameter is empty, get release type from current version if [ -z "$RELEASE_TYPE" ] then @@ -56,9 +75,13 @@ if ! gh auth status&> /dev/null; then fi # bump version -yarn node $DIR/bump_version.js "$RELEASE_TYPE" +if [ -n "$TARGET_VERSION" ]; then + yarn node $DIR/bump_version.js "$RELEASE_TYPE" --target-version="$TARGET_VERSION" +else + yarn node $DIR/bump_version.js "$RELEASE_TYPE" +fi -cargo metadata > /dev/null +cargo metadata --format-version 1 > /dev/null NEW_PACKAGE_VERSION=$(cat $DIR/../../package.json|grep version|head -1|awk -F: '{ print $2 }'|sed 's/[", ]//g')