Merge branch 'v1.0-dev' into v1.1-dev

dashpay · Aug 23, 2024 · 06414e8 · 06414e8
2 parents 4f32c35 + c3fd93c
commit 06414e8
Show file tree

Hide file tree

Showing 32 changed files with 967 additions and 116 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/@isaacs-fs-minipass-npm-4.0.1-677026e841-4412e9e671.zip b/.yarn/cache/@isaacs-fs-minipass-npm-4.0.1-677026e841-4412e9e671.zip
diff --git a/.yarn/cache/braces-npm-3.0.3-582c14023c-fad11a0d46.zip b/.yarn/cache/braces-npm-3.0.3-582c14023c-fad11a0d46.zip
diff --git a/.yarn/cache/chownr-npm-3.0.0-5275e85d25-b63cb1f73d.zip b/.yarn/cache/chownr-npm-3.0.0-5275e85d25-b63cb1f73d.zip
diff --git a/...iptic-npm-6.5.4-0ca8204a86-2cd7ff4b69.zip → ...iptic-npm-6.5.7-df8e79dc1f-fbad1fad0a.zip b/...iptic-npm-6.5.4-0ca8204a86-2cd7ff4b69.zip → ...iptic-npm-6.5.7-df8e79dc1f-fbad1fad0a.zip
diff --git a/.yarn/cache/fill-range-npm-7.1.1-bf491486db-a7095cb39e.zip b/.yarn/cache/fill-range-npm-7.1.1-bf491486db-a7095cb39e.zip
diff --git a/.yarn/cache/glob-npm-10.4.5-8c63175f05-698dfe1182.zip b/.yarn/cache/glob-npm-10.4.5-8c63175f05-698dfe1182.zip
diff --git a/.yarn/cache/micromatch-npm-4.0.4-9fdcbb7a0e-c499da5aad.zip b/.yarn/cache/micromatch-npm-4.0.4-9fdcbb7a0e-c499da5aad.zip
diff --git a/.yarn/cache/micromatch-npm-4.0.7-28fb7387ee-a11ed1cb67.zip b/.yarn/cache/micromatch-npm-4.0.7-28fb7387ee-a11ed1cb67.zip
diff --git a/.yarn/cache/minizlib-npm-3.0.1-4bdabd978f-622cb85f51.zip b/.yarn/cache/minizlib-npm-3.0.1-4bdabd978f-622cb85f51.zip
diff --git a/.yarn/cache/mkdirp-npm-3.0.1-f94bfa769e-16fd79c286.zip b/.yarn/cache/mkdirp-npm-3.0.1-f94bfa769e-16fd79c286.zip
diff --git a/.yarn/cache/package-json-from-dist-npm-1.0.0-961f0fcb3b-ac706ec856.zip b/.yarn/cache/package-json-from-dist-npm-1.0.0-961f0fcb3b-ac706ec856.zip
diff --git a/.yarn/cache/picomatch-npm-2.3.1-c782cfd986-60c2595003.zip b/.yarn/cache/picomatch-npm-2.3.1-c782cfd986-60c2595003.zip
diff --git a/.yarn/cache/rimraf-npm-5.0.10-d0c6647697-f3b8ce81ee.zip b/.yarn/cache/rimraf-npm-5.0.10-d0c6647697-f3b8ce81ee.zip
diff --git a/.yarn/cache/tar-npm-7.4.3-1dbbd1ffc3-12a2a4fc6d.zip b/.yarn/cache/tar-npm-7.4.3-1dbbd1ffc3-12a2a4fc6d.zip
diff --git a/.yarn/cache/yallist-npm-5.0.0-8732dd9f1c-1884d272d4.zip b/.yarn/cache/yallist-npm-5.0.0-8732dd9f1c-1884d272d4.zip
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -15,6 +15,7 @@ npmAuditExcludePackages:
   - "@humanwhocodes/config-array" # TODO: Update eslint
   - "@humanwhocodes/object-schema" # TODO: Update eslint
   - elliptic # TODO: Update elliptic when fix for 1098397 is released
+  - micromatch # TODO: remove when new micromatch will be released https://github.com/advisories/GHSA-952p-6rrq-rcjv
 
 packageExtensions:
   "@dashevo/protobufjs@*":

diff --git a/package.json b/package.json
@@ -67,10 +67,9 @@
     "packages/withdrawals-contract"
   ],
   "resolutions": {
-    "elliptic": "^6.5.4",
+    "elliptic": "6.5.7",
     "bn.js": "4.12.0",
     "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",
@@ -84,7 +83,6 @@
     "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",

diff --git a/packages/dashmate/README.md b/packages/dashmate/README.md
@@ -340,6 +340,29 @@ DESCRIPTION
   Reindex Core data
 ```
 
+### Full node
+It is also possible to start a full node instead of a masternode. Modify the config setting as follows:
+```bash
+dashmate config set core.masternode.enable false
+```
+### Doctor
+
+The `doctor` command collects all useful debugging info into a .tar archive in your current working directory.
+
+Archive will contain all core and platform debugging data and logs for each running service.
+
+```
+USAGE
+  $ dashmate doctor [--config <value>] [-v]
+
+FLAGS
+  -v, --verbose         use verbose mode for output
+      --config=<value>  configuration name to use
+
+DESCRIPTION
+  Generate a report about masternode
+```
+
 ### Full node
 It is also possible to start a full node instead of a masternode. Modify the config setting as follows:
 ```bash

diff --git a/packages/dashmate/package.json b/packages/dashmate/package.json
@@ -93,6 +93,7 @@
     "semver": "^7.5.3",
     "systeminformation": "^5.22.11",
     "table": "^6.8.1",
+    "tar": "7.4.3",
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {