dashpay · shumkov · Feb 6, 2024 · Nov 21, 2023 · Nov 22, 2023 · Nov 22, 2023
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@dashevo-dashcore-lib-npm-0.21.0-1997e852e6-fb4419623f.zip b/.yarn/cache/@dashevo-dashcore-lib-npm-0.21.0-1997e852e6-fb4419623f.zip
diff --git a/.yarn/cache/@dashevo-dashcore-lib-npm-0.21.1-2fe9b7647d-68502e4078.zip b/.yarn/cache/@dashevo-dashcore-lib-npm-0.21.1-2fe9b7647d-68502e4078.zip
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/bench-suite/package.json b/packages/bench-suite/package.json
@@ -8,7 +8,7 @@
     "lint": ""
   },
   "dependencies": {
-    "@dashevo/dashcore-lib": "~0.21.0",
+    "@dashevo/dashcore-lib": "~0.21.1",
     "@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
@@ -30,7 +30,7 @@ tonic = { version = "0.9.2", features = [
 ], default-features = false }
 serde = { version = "1.0.171", optional = true, features = ["derive"] }
 serde_bytes = { version = "0.11.12", optional = true }
-tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", rev = "251386f9e4109c89ca628226c981c489b80aed80" }
+tenderdash-proto = { git = "https://github.com/dashpay/rs-tenderdash-abci", version = "0.14.0-dev.6" }
 dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
 platform-version = { path = "../rs-platform-version" }
 

diff --git a/packages/dapi/package.json b/packages/dapi/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@dashevo/bls": "~1.2.9",
     "@dashevo/dapi-grpc": "workspace:*",
-    "@dashevo/dashcore-lib": "~0.21.0",
+    "@dashevo/dashcore-lib": "~0.21.1",
     "@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
@@ -14,7 +14,7 @@
   "dependencies": {
     "@dashevo/dark-gravity-wave": "^1.1.1",
     "@dashevo/dash-util": "^2.0.3",
-    "@dashevo/dashcore-lib": "~0.21.0",
+    "@dashevo/dashcore-lib": "~0.21.1",
     "levelup": "^4.4.0",
     "memdown": "^5.1.0",
     "wasm-x11-hash": "~0.0.2"

diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js
@@ -72,7 +72,7 @@ export default function getBaseConfigFactory(homeDir) {
           port: 3001,
         },
         docker: {
-          image: 'dashpay/dashd:20.1.0-devpr5806.a1814ce2', commandArgs: [],
+          image: 'dashpay/dashd:20', commandArgs: [],
         },
         p2p: {
           host: '0.0.0.0',

diff --git a/packages/dashmate/configs/defaults/getLocalConfigFactory.js b/packages/dashmate/configs/defaults/getLocalConfigFactory.js
@@ -24,6 +24,9 @@ export default function getLocalConfigFactory(getBaseConfig) {
         },
       },
       core: {
+        docker: {
+          image: 'dashpay/dashd:20.1.0-devpr5855.4d19698f', commandArgs: [],
+        },
         p2p: {
           port: 20001,
         },

diff --git a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js
@@ -24,6 +24,9 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) {
         },
       },
       core: {
+        docker: {
+          image: 'dashpay/dashd:20.1.0-devpr5855.4d19698f', commandArgs: [],
+        },
         p2p: {
           port: 19999,
         },

diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js
@@ -23,6 +23,22 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
     const base = defaultConfigs.get('base');
     const testnet = defaultConfigs.get('testnet');
 
+    /**
+     * @param {string} name
+     * @param {string} group
+     * @return {Config}
+     */
+    function getDefaultConfigByNameOrGroup(name, group) {
+      let baseConfigName = name;
+      if (group !== null && defaultConfigs.has(group)) {
+        baseConfigName = group;
+      } else if (!defaultConfigs.has(baseConfigName)) {
+        baseConfigName = 'base';
+      }
+
+      return defaultConfigs.get(baseConfigName);
+    }
+
     return {
       '0.24.0': (configFile) => {
         Object.entries(configFile.configs)
@@ -426,6 +442,17 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
 
         return configFile;
       },
+      '1.0.0-dev.4': (configFile) => {
+        Object.entries(configFile.configs)
+          .forEach(([name, options]) => {
+            const defaultConfig = getDefaultConfigByNameOrGroup(name, options.group);
+            options.core.docker.image = defaultConfig.get('core.docker.image');
+
+            options.platform.drive.tenderdash.docker.image = defaultConfig.get('platform.drive.tenderdash.docker.image');
+          });
+
+        return configFile;
+      },
     };
   }
 

diff --git a/packages/dashmate/package.json b/packages/dashmate/package.json
@@ -58,7 +58,7 @@
     "@babel/eslint-parser": "^7.23.3",
     "@dashevo/bls": "~1.2.9",
     "@dashevo/dapi-client": "workspace:*",
-    "@dashevo/dashcore-lib": "~0.21.0",
+    "@dashevo/dashcore-lib": "~0.21.1",
     "@dashevo/dashd-rpc": "^18.2.0",
     "@dashevo/dashpay-contract": "workspace:*",
     "@dashevo/docker-compose": "^0.24.4",

diff --git a/packages/dashmate/src/core/CoreService.js b/packages/dashmate/src/core/CoreService.js
@@ -8,6 +8,7 @@ export default class CoreService {
   constructor(config, rpcClient, dockerContainer) {
     this.config = config;
     this.rpcClient = rpcClient;
+    rpcClient.setTimeout(240 * 1000);
     this.dockerContainer = dockerContainer;
   }
 

diff --git a/packages/js-dapi-client/package.json b/packages/js-dapi-client/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@dashevo/dapi-grpc": "workspace:*",
     "@dashevo/dash-spv": "workspace:*",
-    "@dashevo/dashcore-lib": "~0.21.0",
+    "@dashevo/dashcore-lib": "~0.21.1",
     "@dashevo/grpc-common": "workspace:*",
     "@dashevo/wasm-dpp": "workspace:*",
     "bs58": "^4.0.1",

diff --git a/packages/js-dash-sdk/package.json b/packages/js-dash-sdk/package.json
@@ -41,13 +41,14 @@
     "@dashevo/bls": "~1.2.9",
     "@dashevo/dapi-client": "workspace:*",
     "@dashevo/dapi-grpc": "workspace:*",
-    "@dashevo/dashcore-lib": "~0.21.0",
+    "@dashevo/dashcore-lib": "~0.21.1",
     "@dashevo/dashpay-contract": "workspace:*",
     "@dashevo/dpns-contract": "workspace:*",
     "@dashevo/grpc-common": "workspace:*",
     "@dashevo/masternode-reward-shares-contract": "workspace:*",
     "@dashevo/wallet-lib": "workspace:*",
     "@dashevo/wasm-dpp": "workspace:*",
+    "@dashevo/withdrawals-contract": "workspace:*",
     "bs58": "^4.0.1",
     "node-inspect-extracted": "^1.0.8",
     "winston": "^3.2.1"
-Original file line number
+Diff line change
@@ Expand Up @@
             },
           },
           core: {
+            docker: {
+              image: 'dashpay/dashd:20.1.0-devpr5855.4d19698f', commandArgs: [],
+            },
             p2p: {
               port: 20001,
             },
@@ Expand Down @@