Merge remote-tracking branch 'refs/remotes/origin/master' into feat/d…

…ashmate-dkg-check # Conflicts: # .pnp.cjs # CHANGELOG.md # Cargo.lock # package.json # packages/bench-suite/package.json # packages/dapi-grpc/Cargo.toml # packages/dapi-grpc/package.json # packages/dapi/package.json # packages/dash-spv/package.json # packages/dashmate/configs/defaults/getTestnetConfigFactory.js # packages/dashmate/configs/getConfigFileMigrationsFactory.js # packages/dashmate/docker-compose.yml # packages/dashmate/package.json # packages/dashmate/src/listr/tasks/platform/waitForNodeToBeReadyTaskFactory.js # packages/dashpay-contract/Cargo.toml # packages/dashpay-contract/package.json # packages/data-contracts/Cargo.toml # packages/dpns-contract/Cargo.toml # packages/dpns-contract/package.json # packages/feature-flags-contract/Cargo.toml # packages/feature-flags-contract/package.json # packages/js-dapi-client/package.json # packages/js-dash-sdk/package.json # packages/js-grpc-common/package.json # packages/masternode-reward-shares-contract/Cargo.toml # packages/masternode-reward-shares-contract/package.json # packages/platform-test-suite/package.json # packages/rs-dapi-client/Cargo.toml # packages/rs-dapi-grpc-macros/Cargo.toml # packages/rs-dpp/Cargo.toml # packages/rs-drive-abci/Cargo.toml # packages/rs-drive-proof-verifier/Cargo.toml # packages/rs-drive/Cargo.toml # packages/rs-platform-serialization-derive/Cargo.toml # packages/rs-platform-serialization/Cargo.toml # packages/rs-platform-value-convertible/Cargo.toml # packages/rs-platform-value/Cargo.toml # packages/rs-platform-version/Cargo.toml # packages/rs-platform-versioning/Cargo.toml # packages/rs-sdk/Cargo.toml # packages/simple-signer/Cargo.toml # packages/strategy-tests/Cargo.toml # packages/wallet-lib/package.json # packages/wasm-dpp/Cargo.toml # packages/wasm-dpp/package.json # packages/withdrawals-contract/Cargo.toml # packages/withdrawals-contract/package.json # yarn.lock
dashpay · May 4, 2024 · 630e208 · 630e208
2 parents a2422f4 + b143aee
commit 630e208
Show file tree

Hide file tree

Showing 48 changed files with 3,062 additions and 2,423 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/platform",
-  "version": "1.0.0-dev.12",
+  "version": "0.25.22",
   "private": true,
   "scripts": {
     "setup": "yarn install && yarn run build && yarn run configure",
@@ -71,7 +71,6 @@
     "bn.js": "4.12.0",
     "ejs": "^3.1.7",
     "fast-json-patch": "^3.1.1",
-    "node-tar": "^6.2.1",
     "[email protected]": "patch:oclif@npm:3.4.2#.yarn/patches/oclif-npm-3.4.2-a655d32eed.patch",
     "qs": "^6.7.3",
     "engine.io": "^6.4.2",
@@ -85,13 +84,10 @@
     "browserify-sign": "4.2.2",
     "istanbul-lib-processinfo": "2.0.3",
     "@babel/core": "7.23.3",
-    "tar": "^6.2.1",
     "tsconfig-paths": "4.2.0",
     "ansi-regex": "5.0.1",
     "cacache": "18.0.0",
-    "node-gyp": "10.0.1",
-    "follow-redirects": "^1.15.5",
-    "socks": "^2.8.1"
+    "node-gyp": "10.0.1"
   },
   "dependencies": {
     "node-gyp": "^10.0.1"

diff --git a/packages/bench-suite/package.json b/packages/bench-suite/package.json
@@ -1,14 +1,14 @@
 {
   "name": "@dashevo/bench-suite",
   "private": true,
-  "version": "1.0.0-dev.12",
+  "version": "0.25.22",
   "description": "Dash Platform benchmark tool",
   "scripts": {
     "bench": "node ./bin/bench.js",
     "lint": ""
   },
   "dependencies": {
-    "@dashevo/dashcore-lib": "~0.21.1",
+    "@dashevo/dashcore-lib": "~0.21.0",
     "@dashevo/dpns-contract": "workspace:*",
     "@dashevo/wallet-lib": "workspace:*",
     "@dashevo/wasm-dpp": "workspace:*",

diff --git a/packages/dapi-grpc/Cargo.toml b/packages/dapi-grpc/Cargo.toml
@@ -1,51 +1,36 @@
 [package]
 name = "dapi-grpc"
 description = "GRPC client for Dash Platform"
-version = "1.0.0-dev.12"
+version = "0.25.22"
 authors = [
-  "Samuel Westrich <[email protected]>",
-  "Igor Markin <[email protected]>",
-  "Łukasz Klimek <[email protected]>",
-  "Anton Suprunchuk <[email protected]>",
-  "Ivan Shumkov <[email protected]>",
+    "Samuel Westrich <[email protected]>",
+    "Igor Markin <[email protected]>",
+    "Łukasz Klimek <[email protected]>",
+    "Anton Suprunchuk <[email protected]>",
+    "Ivan Shumkov <[email protected]>",
 ]
 edition = "2021"
-rust-version = "1.76"
+rust-version = "1.73"
 license = "MIT"
 
 [features]
-# Enable all features by default, otherwise different crates
-# triggier bulding proto with different feature set that overwrites
-# previous results and causes build errors
-default = ["core", "platform", "client", "serde", "server"]
+default = ["core", "platform", "client", "serde"]
 core = []
 platform = []
 # Re-export Dash Platform protobuf types as `dapi_grpc::platform::proto`
-# Note: client needs tls and tls-roots to connect to testnet which uses TLS.
 tenderdash-proto = []
-client = [
-  "tonic/channel",
-  "tonic/transport",
-  "tonic/tls",
-  "tonic/tls-roots",
-  "tonic/tls-webpki-roots",
-  "platform",
-]
-server = ["tonic/channel", "tonic/transport", "platform"]
+client = ["tonic/channel", "tonic/tls", "tonic/tls-roots", "platform"]
 serde = ["dep:serde", "dep:serde_bytes"]
-mocks = ["dep:serde_json"]
 
 [dependencies]
-prost = { version = "0.12.3" }
-futures-core = "0.3.30"
-tonic = { version = "0.11", features = [
-  "codegen",
-  "prost",
+prost = { version = "0.11.9" }
+tonic = { version = "0.9.2", features = [
+    "codegen",
+    "prost",
 ], default-features = false }
-serde = { version = "1.0.197", optional = true, features = ["derive"] }
+serde = { version = "1.0.171", optional = true, features = ["derive"] }
 serde_bytes = { version = "0.11.12", optional = true }
-serde_json = { version = "1.0", optional = true }
-tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "0.14.0-dev.12", default-features = false }
+tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci" }
 dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
 platform-version = { path = "../rs-platform-version" }
 
@@ -64,4 +49,4 @@ name = "platform_example"
 path = "clients/platform/v0/rust/platform_example.rs"
 
 [package.metadata.cargo-machete]
-ignored = ["platform-version", "serde_bytes", "futures-core"]
+ignored = ["platform-version", "serde_bytes"]
diff --git a/packages/dapi-grpc/package.json b/packages/dapi-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-grpc",
-  "version": "1.0.0-dev.12",
+  "version": "0.25.22",
   "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
@@ -1,7 +1,7 @@
 {
   "name": "@dashevo/dapi",
   "private": true,
-  "version": "1.0.0-dev.12",
+  "version": "0.25.22",
   "description": "A decentralized API for the Dash network",
   "scripts": {
     "api": "node scripts/api.js",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@dashevo/bls": "~1.2.9",
     "@dashevo/dapi-grpc": "workspace:*",
-    "@dashevo/dashcore-lib": "~0.21.1",
+    "@dashevo/dashcore-lib": "~0.21.0",
     "@dashevo/dashd-rpc": "^18.2.0",
     "@dashevo/grpc-common": "workspace:*",
     "@dashevo/wasm-dpp": "workspace:*",

diff --git a/packages/dash-spv/package.json b/packages/dash-spv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dash-spv",
-  "version": "1.0.0-dev.12",
+  "version": "0.25.22",
   "description": "Repository containing SPV functions used by @dashevo",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,7 @@
   "dependencies": {
     "@dashevo/dark-gravity-wave": "^1.1.1",
     "@dashevo/dash-util": "^2.0.3",
-    "@dashevo/dashcore-lib": "~0.21.1",
+    "@dashevo/dashcore-lib": "~0.21.0",
     "levelup": "^4.4.0",
     "memdown": "^5.1.0",
     "wasm-x11-hash": "~0.0.2"

diff --git a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js
@@ -24,10 +24,6 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
         },
       },
       core: {
-        docker: {
-          image: 'dashpay/dashd:20.1.0',
-          commandArgs: [],
-        },
         p2p: {
           port: 19999,
         },
@@ -57,11 +53,6 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
             validatorSet: {
               llmqType: 6,
             },
-            chainLock: {
-              llmqType: 1,
-              dkgInterval: 24,
-              llmqSize: 50,
-            },
           },
           tenderdash: {
             p2p: {
@@ -79,15 +70,8 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
               ],
               port: 36656,
             },
-            mempool: {
-              timeoutCheckTx: '1s',
-              txEnqueueTimeout: '10ms',
-              txSendRateLimit: 10,
-              txRecvRateLimit: 12,
-            },
             rpc: {
               port: 36657,
-              timeoutBroadcastTx: '1s',
             },
             pprof: {
               port: 36060,
@@ -96,10 +80,39 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
               port: 36660,
             },
             genesis: {
-              genesis_time: '2024-03-07T13:26:00.000Z',
-              chain_id: 'dash-testnet-39',
+              genesis_time: '2023-11-02T10:18:00.000Z',
+              chain_id: 'dash-testnet-37',
+              initial_core_chain_locked_height: 918609,
+              consensus_params: {
+                timeout: {
+                  propose: '50000000000',
+                  propose_delta: '10000000000',
+                  vote: '500000000',
+                  vote_delta: '100000000',
+                  commit: '1000000000',
+                  bypass_commit_timeout: false,
+                },
+                block: {
+                  max_bytes: '22020096',
+                  max_gas: '-1',
+                  time_iota_ms: '5000',
+                },
+                evidence: {
+                  max_age: '100000',
+                  max_age_num_blocks: '100000',
+                  max_age_duration: '172800000000000',
+                },
+                validator: {
+                  pub_key_types: [
+                    'bls12381',
+                  ],
+                },
+                version: {
+                  app_version: '1',
+                },
+              },
               validator_quorum_type: 6,
-              initial_core_chain_locked_height: 984306,
+              initial_core_chain_locked_height: 918609,
             },
           },
         },
@@ -127,8 +140,7 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
       network: NETWORK_TESTNET,
     };
 
-    return new Config('testnet', lodashMerge({}, getBaseConfig()
-      .getOptions(), options));
+    return new Config('testnet', lodashMerge({}, getBaseConfig().getOptions(), options));
   }
 
   return getTestnetConfig;