Merge branch 'v0.22-dev' into v0.23-dev

CHANGELOG.md

@@ -1,4 +1,52 @@
-### [0.21.7](https://github.com/dashevo/platform/compare/v0.21.6...v0.21.7) (2022-01-17)
+## [0.21.8](https://github.com/dashevo/platform/compare/v0.21.7...v0.21.8) (2022-02-15)
+
+
+### Bug Fixes
+
+* sorting unconfirmed tx as oldest ([#206](https://github.com/dashevo/platform/issues/206))
+* **wallet-lib:** get transaction history missing txs ([#246](https://github.com/dashevo/platform/issues/246))
+
+
+### Tests
+
+* **platform-suite:** add -b flag to abort after first error ([#222](https://github.com/dashevo/platform/issues/222))
+
+
+### Miscellaneous Chores
+
+* updates @dashevo/dashcore-lib to v0.19.30 ([#238](https://github.com/dashevo/platform/issues/238))
+
+
+## [0.22.0-dev.7](https://github.com/dashevo/platform/compare/v0.21.7...v0.22.0-dev.7) (2022-01-19)
+
+
+### Features
+
+* added WalletStore ([#197](https://github.com/dashevo/platform/issues/197))
+* **drive:** allow using `in` and `startsWith` only in last `where` condition ([#201](https://github.com/dashevo/platform/issues/201))
+* **drive:** allow using `orderBy` for fields having `in` and `startsWith` in last `where` clause ([#199](https://github.com/dashevo/platform/issues/199))
+* register system contracts on `initChain` ([#182](https://github.com/dashevo/platform/issues/182))
+* **wallet-lib:** ChainStore ([#196](https://github.com/dashevo/platform/issues/196))
+
+
+### Bug Fixes
+
+* **sdk:** system contract ids were hardcoded in SDKs Client module ([#192](https://github.com/dashevo/platform/issues/192))
+
+
+### Build System
+
+* fix configure test suite script for grep 2.5.1 ([#187](https://github.com/dashevo/platform/issues/187))
+
+
+### Miscellaneous Chores
+
+* **dashmate:** update tenderdash to 0.7.0-dev ([#188](https://github.com/dashevo/platform/issues/188))
+* remove `fixCumulativeFeesBug` feature flag ([#191](https://github.com/dashevo/platform/issues/191))
+
+
+
+## [0.21.7](https://github.com/dashevo/platform/compare/v0.21.6...v0.21.7) (2022-01-17)
 
 
 ### ⚠ BREAKING CHANGES
@@ -161,7 +209,7 @@
 * undefined "-w" argument in restart script ([#85](https://github.com/dashevo/platform/issues/85))
 
 
-### [0.21.6](https://github.com/dashevo/platform/compare/v0.21.5...v0.21.6) (2021-12-13)
+## [0.21.6](https://github.com/dashevo/platform/compare/v0.21.5...v0.21.6) (2021-12-13)
 
 
 ### Bug Fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/platform",
-  "version": "0.22.0-dev.6",
+  "version": "0.22.0-dev.7",
   "private": true,
   "scripts": {
     "setup": "yarn install && yarn run build && yarn run configure",

packages/dapi-grpc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-grpc",
-  "version": "0.22.0-dev.6",
+  "version": "0.22.0-dev.7",
   "description": "DAPI GRPC definition file and generated clients",
   "browser": "browser.js",
   "main": "node.js",

packages/dapi/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashevo/dapi",
   "private": true,
-  "version": "0.22.0-dev.6",
+  "version": "0.22.0-dev.7",
   "description": "A decentralized API for the Dash network",
   "scripts": {
     "api": "node scripts/api.js",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@dashevo/dapi-grpc": "workspace:~",
-    "@dashevo/dashcore-lib": "~0.19.29",
+    "@dashevo/dashcore-lib": "~0.19.30",
     "@dashevo/dashd-rpc": "^2.3.2",
     "@dashevo/dpp": "workspace:~",
     "@dashevo/grpc-common": "workspace:~",
@@ -50,7 +50,7 @@
     "request": "^2.87.0",
     "request-promise-native": "^1.0.5",
     "ws": "^7.5.3",
-    "zeromq": "5.2.0"
+    "zeromq": "^5.2.8"
   },
   "devDependencies": {
     "@dashevo/dapi-client": "workspace:~",

packages/dashmate/configs/migrations.js

@@ -303,8 +303,15 @@ module.exports = {
           config.platform.masternodeRewardShares = systemConfigs.base.platform
             .masternodeRewardShares;
         }
+
+        config.docker = systemConfigs[config.group || 'base'].docker;
       });
 
+    // Update docker subnet settings
+    configFile.base.docker = systemConfigs.base.docker;
+    configFile.testnet.docker = systemConfigs.testnet.docker;
+    configFile.mainnet.docker = systemConfigs.mainnet.docker;
+
     // Update contracts
     configFile.configs.testnet.platform.drive.tenderdash.genesis = systemConfigs.testnet.platform
       .drive.tenderdash.genesis;

packages/dashmate/configs/schema/configJsonSchema.js

@@ -86,6 +86,23 @@ module.exports = {
     group: {
       type: ['string', 'null'],
     },
+    docker: {
+      type: 'object',
+      properties: {
+        network: {
+          type: 'object',
+          properties: {
+            subnet: {
+              type: 'string',
+            },
+          },
+          additionalProperties: false,
+          required: ['subnet'],
+        },
+      },
+      additionalProperties: false,
+      required: ['network'],
+    },
     core: {
       type: 'object',
       properties: {

packages/dashmate/configs/system/base.js

@@ -26,6 +26,11 @@ const {
 module.exports = {
   description: 'base config for use as template',
   group: null,
+  docker: {
+    network: {
+      subnet: '172.24.24.0/24',
+    },
+  },
   core: {
     docker: {
       image: 'dashpay/dashd:0.17',

packages/dashmate/configs/system/local.js

@@ -8,6 +8,11 @@ const baseConfig = require('./base');
 
 module.exports = lodashMerge({}, baseConfig, {
   description: 'template for local configs',
+  docker: {
+    network: {
+      subnet: '172.24.24.0/24',
+    },
+  },
   platform: {
     dapi: {
       envoy: {

packages/dashmate/configs/system/mainnet.js

@@ -8,6 +8,11 @@ const baseConfig = require('./base');
 
 const mainnetConfig = lodashMerge({}, baseConfig, {
   description: 'node with mainnet configuration',
+  docker: {
+    network: {
+      subnet: '172.26.24.0/24',
+    },
+  },
   core: {
     p2p: {
       port: 9999,

packages/dashmate/configs/system/testnet.js

@@ -10,6 +10,11 @@ const baseConfig = require('./base');
 
 module.exports = lodashMerge({}, baseConfig, {
   description: 'node with testnet configuration',
+  docker: {
+    network: {
+      subnet: '172.25.24.0/24',
+    },
+  },
   core: {
     p2p: {
       port: 19999,

packages/dashmate/docker-compose.yml

@@ -16,3 +16,9 @@ services:
 
 volumes:
   core_data:
+
+networks:
+  default:
+    ipam:
+      config:
+        - subnet: ${DOCKER_NETWORK_SUBNET:?err}

packages/dashmate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashmate",
-  "version": "0.22.0-dev.6",
+  "version": "0.22.0-dev.7",
   "description": "Distribution package for Dash Masternode installation",
   "main": "src/index.js",
   "scripts": {
@@ -46,7 +46,7 @@
   },
   "homepage": "https://github.com/dashevo/dashmate#readme",
   "dependencies": {
-    "@dashevo/dashcore-lib": "~0.19.29",
+    "@dashevo/dashcore-lib": "~0.19.30",
     "@dashevo/dashd-rpc": "^2.3.2",
     "@dashevo/dashpay-contract": "workspace:~",
     "@dashevo/dpns-contract": "workspace:~",

packages/dashmate/src/listr/tasks/setup/setupLocalPresetTaskFactory.js

@@ -141,6 +141,8 @@ function setupLocalPresetTaskFactory(
                 config.set('core.rpc.port', 20002 + (i * 100));
                 config.set('externalIp', hostDockerInternalIp);
 
+                config.set('docker.network.subnet', `172.24.${nodeIndex}.0/24`);
+
                 // Setup Core debug logs
                 if (ctx.debugLogs) {
                   config.set('core.debug', 1);

packages/dashpay-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dashpay-contract",
-  "version": "0.22.0-dev.6",
+  "version": "0.22.0-dev.7",
   "description": "Reference contract of the DashPay DPA on Dash Evolution",
   "scripts": {
     "lint": "eslint .",

packages/dpns-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dpns-contract",
-  "version": "0.22.0-dev.6",
+  "version": "0.22.0-dev.7",
   "description": "A contract and helper scripts for DPNS DApp",
   "scripts": {
     "lint": "eslint .",

packages/feature-flags-contract/lib/featureFlagTypes.js

@@ -4,11 +4,8 @@
  * @name FeatureFlagTypes
  * @class
  *
- * @property {string} FeatureFlagTypes.FIX_CUMULATIVE_FEES
  * @property {string} FeatureFlagTypes.UPDATE_CONSENSUS_PARAMS
- * @property {string} FeatureFlagTypes.VERIFY_LLMQ_SIGS_WITH_CORE
  */
 module.exports = {
-  FIX_CUMULATIVE_FEES: 'fixCumulativeFeesBug',
   UPDATE_CONSENSUS_PARAMS: 'updateConsensusParams',
 };

packages/feature-flags-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/feature-flags-contract",
-  "version": "0.22.0-dev.6",
+  "version": "0.22.0-dev.7",
   "description": "Data Contract to store Dash Platform feature flags",
   "scripts": {
     "build": "",

packages/feature-flags-contract/schema/feature-flags-documents.json

@@ -87,33 +87,5 @@
     "minProperties": 3,
     "additionalProperties": false,
     "required": ["$createdAt", "enableAtHeight"]
-  },
-  "fixCumulativeFeesBug": {
-    "description": "Defines if cumulative fees should be processed in an old way or new one",
-    "type": "object",
-    "indices": [
-      {
-        "name": "enableAtHeight",
-        "properties": [
-          {
-            "enableAtHeight": "desc"
-          }
-        ],
-        "unique": true
-      }
-    ],
-    "properties": {
-      "enabled": {
-        "description": "Switch to determine if feature should be enabled",
-        "type": "boolean"
-      },
-      "enableAtHeight": {
-        "description": "Block height on which flag will be applied",
-        "type": "integer",
-        "minimum": 1
-      }
-    },
-    "additionalProperties": false,
-    "required": ["$createdAt", "enableAtHeight", "enabled"]
   }
 }