Skip to content

Commit

Permalink
Merge branch 'v1.8-dev' into fix/dashmate/failed-core-after-restart
Browse files Browse the repository at this point in the history
  • Loading branch information
shumkov authored Dec 17, 2024
2 parents cb97363 + 889d192 commit 873627f
Show file tree
Hide file tree
Showing 57 changed files with 224 additions and 93 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
## [1.8.0-dev.1](https://github.com/dashpay/platform/compare/v1.7.0...v1.8.0-dev.1) (2024-12-16)


### Continuous Integration

* fix artifact upload issue on release build ([#2389](https://github.com/dashpay/platform/issues/2389))


### Miscellaneous Chores

* remove deprecated check_network_version.sh ([#2084](https://github.com/dashpay/platform/issues/2084))


### Tests

* **sdk:** generate test vectors using testnet ([#2381](https://github.com/dashpay/platform/issues/2381))


### Code Refactoring

* **platform:** replace bls library ([#2257](https://github.com/dashpay/platform/issues/2257))

### [1.7.0](https://github.com/dashpay/platform/compare/v1.6.2...v1.7.0) (2024-12-13)


Expand Down
53 changes: 27 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,13 @@ members = [
"packages/simple-signer",
"packages/rs-json-schema-compatibility-validator",
"packages/check-features",
"packages/wallet-utils-contract"
"packages/wallet-utils-contract",
]
[workspace.package]

rust-version = "1.80"
rust-version = "1.83"

[patch.crates-io]
tower-service = { git = "https://github.com/QuantumExplorer/tower", branch = "fix/indexMap2OnV0413" }
tower-layer = { git = "https://github.com/QuantumExplorer/tower", branch = "fix/indexMap2OnV0413" }
tower = { git = "https://github.com/QuantumExplorer/tower", branch = "fix/indexMap2OnV0413" }

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ this repository may be used on the following networks:
- Install prerequisites:
- [node.js](https://nodejs.org/) v20
- [docker](https://docs.docker.com/get-docker/) v20.10+
- [rust](https://www.rust-lang.org/tools/install) v1.80+, with wasm32 target (`rustup target add wasm32-unknown-unknown`)
- [rust](https://www.rust-lang.org/tools/install) v1.83+, with wasm32 target (`rustup target add wasm32-unknown-unknown`)
- [protoc - protobuf compiler](https://github.com/protocolbuffers/protobuf/releases) v27.3+
- if needed, set PROTOC environment variable to location of `protoc` binary
- [wasm-bingen toolchain](https://rustwasm.github.io/wasm-bindgen/):
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dashevo/platform",
"version": "1.7.0",
"version": "1.8.0-dev.1",
"private": true,
"scripts": {
"setup": "yarn install && yarn run build && yarn run configure",
Expand Down
2 changes: 1 addition & 1 deletion packages/bench-suite/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@dashevo/bench-suite",
"private": true,
"version": "1.7.0",
"version": "1.8.0-dev.1",
"description": "Dash Platform benchmark tool",
"scripts": {
"bench": "node ./bin/bench.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/check-features/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "check-features"
version = "1.7.0"
version = "1.8.0-dev.1"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion packages/dapi-grpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "dapi-grpc"
description = "GRPC client for Dash Platform"
version = "1.7.0"
version = "1.8.0-dev.1"
authors = [
"Samuel Westrich <[email protected]>",
"Igor Markin <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion packages/dapi-grpc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dashevo/dapi-grpc",
"version": "1.7.0",
"version": "1.8.0-dev.1",
"description": "DAPI GRPC definition file and generated clients",
"browser": "browser.js",
"main": "node.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/dapi/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@dashevo/dapi",
"private": true,
"version": "1.7.0",
"version": "1.8.0-dev.1",
"description": "A decentralized API for the Dash network",
"scripts": {
"api": "node scripts/api.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/dash-spv/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dashevo/dash-spv",
"version": "2.7.0",
"version": "2.8.0-dev.1",
"description": "Repository containing SPV functions used by @dashevo",
"main": "index.js",
"scripts": {
Expand Down
3 changes: 3 additions & 0 deletions packages/dashmate/configs/getConfigFileMigrationsFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,9 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
Object.entries(configFile.configs)
.forEach(([, options]) => {
delete options.core.miner.mediantime;

options.platform.drive.abci.docker.image = 'dashpay/drive:1-dev';
options.platform.dapi.api.docker.image = 'dashpay/dapi:1-dev';
});
return configFile;
},
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dashmate",
"version": "1.7.0",
"version": "1.8.0-dev.1",
"description": "Distribution package for Dash node installation",
"scripts": {
"lint": "eslint .",
Expand Down
2 changes: 1 addition & 1 deletion packages/dashpay-contract/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "dashpay-contract"
description = "DashPay data contract schema and tools"
version = "1.7.0"
version = "1.8.0-dev.1"
edition = "2021"
rust-version.workspace = true
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion packages/dashpay-contract/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dashevo/dashpay-contract",
"version": "1.7.0",
"version": "1.8.0-dev.1",
"description": "Reference contract of the DashPay DPA on Dash Evolution",
"scripts": {
"lint": "eslint .",
Expand Down
2 changes: 1 addition & 1 deletion packages/data-contracts/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "data-contracts"
description = "Dash Platform system data contracts"
version = "1.7.0"
version = "1.8.0-dev.1"
edition = "2021"
rust-version.workspace = true
license = "MIT"
Expand Down
Loading

0 comments on commit 873627f

Please sign in to comment.