Merge remote-tracking branch 'origin/v1.7-dev' into feat/cpu-optimiza…

…tions
dashpay · Dec 13, 2024 · 30bb9a3 · 30bb9a3
2 parents 3943a2c + 19a4c6d
commit 30bb9a3
Show file tree

Hide file tree

Showing 54 changed files with 642 additions and 812 deletions.
diff --git a/.github/workflows/manage-runs.yml b/.github/workflows/manage-runs.yml
diff --git a/.github/workflows/prebuild-devcontainers.yml b/.github/workflows/prebuild-devcontainers.yml
@@ -19,7 +19,7 @@ jobs:
   build:
     name: Build and push devcontainer
     runs-on: ubuntu-24.04
-    timeout-minutes: 60
+    timeout-minutes: 240
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4

diff --git a/.github/workflows/tests-build-image.yml b/.github/workflows/tests-build-image.yml
@@ -18,6 +18,7 @@ jobs:
   build-image:
     name: Build ${{ inputs.name }} image
     runs-on: ubuntu-24.04
+    timeout-minutes: 30
     steps:
       - name: Check out repo
         uses: actions/checkout@v4

diff --git a/.github/workflows/tests-build-js.yml b/.github/workflows/tests-build-js.yml
@@ -5,6 +5,7 @@ jobs:
   build-js:
     name: Build JS
     runs-on: ubuntu-24.04
+    timeout-minutes: 10
     steps:
       - uses: softwareforgood/check-artifact-v4-existence@v0
         id: check-artifact

diff --git a/.github/workflows/tests-codeql.yml b/.github/workflows/tests-codeql.yml
@@ -5,6 +5,7 @@ jobs:
   codeql:
     name: Run Code QL
     runs-on: ubuntu-24.04
+    timeout-minutes: 15
     permissions:
       actions: read
       contents: read

diff --git a/.github/workflows/tests-js-package.yml b/.github/workflows/tests-js-package.yml
@@ -18,6 +18,7 @@ jobs:
   lint:
     name: Linting
     runs-on: ubuntu-24.04
+    timeout-minutes: 5
     permissions:
       id-token: write
       contents: read
@@ -40,6 +41,7 @@ jobs:
   test:
     name: Tests
     runs-on: ubuntu-24.04
+    timeout-minutes: 15
     permissions:
       id-token: write
       contents: read

diff --git a/.github/workflows/tests-rs-package.yml b/.github/workflows/tests-rs-package.yml
@@ -110,6 +110,7 @@ jobs:
 
   detect_structure_changes:
     name: Detect immutable structure changes
+    timeout-minutes: 10
     runs-on: ubuntu-24.04
     # FIXME: as we use `gh pr view` below, this check can only
     # run on pull requests. We should find a way to run it

diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/fsevents-patch-19706e7e35-10.zip b/.yarn/cache/fsevents-patch-19706e7e35-10.zip
diff --git a/.yarn/cache/nanoid-npm-3.3.1-bdd760bee0-306f2cb9e4.zip b/.yarn/cache/nanoid-npm-3.3.1-bdd760bee0-306f2cb9e4.zip
diff --git a/.yarn/cache/nanoid-npm-3.3.3-25d865be84-c703ed58a2.zip b/.yarn/cache/nanoid-npm-3.3.3-25d865be84-c703ed58a2.zip
diff --git a/.yarn/cache/nanoid-npm-3.3.8-d22226208b-2d1766606c.zip b/.yarn/cache/nanoid-npm-3.3.8-d22226208b-2d1766606c.zip
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package.json b/package.json
@@ -94,7 +94,8 @@
     "body-parser": "^1.20.3",
     "path-to-regexp": "^1.9.0",
     "cookie": "^0.7.0",
-    "cross-spawn": "^7.0.5"
+    "cross-spawn": "^7.0.5",
+    "nanoid": "^3.3.8"
   },
   "dependencies": {
     "node-gyp": "^10.0.1"

diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js
@@ -310,7 +310,7 @@ export default function getBaseConfigFactory() {
           tenderdash: {
             mode: 'full',
             docker: {
-              image: 'dashpay/tenderdash:1.3',
+              image: 'dashpay/tenderdash:1',
             },
             p2p: {
               host: '0.0.0.0',

diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js
@@ -1048,6 +1048,13 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs)
           });
         return configFile;
       },
+      '1.7.0': (configFile) => {
+        Object.entries(configFile.configs)
+          .forEach(([, options]) => {
+            options.platform.drive.tenderdash.docker.image = 'dashpay/tenderdash:1';
+          });
+        return configFile;
+      },
     };
   }
 

diff --git a/packages/dashmate/templates/core/dash.conf.dot b/packages/dashmate/templates/core/dash.conf.dot
@@ -108,7 +108,7 @@ devnet={{=it.core.devnet.name}}
 powtargetspacing={{=it.core.devnet.powTargetSpacing}}
 minimumdifficultyblocks={{=it.core.devnet.minimumDifficultyBlocks}}
 highsubsidyblocks=500
-highsubsidyfactor=10
+highsubsidyfactor=100
 llmqchainlocks={{=it.core.devnet.llmq.chainLocks}}
 llmqinstantsenddip0024={{=it.core.devnet.llmq.instantSend}}
 llmqplatform={{=it.core.devnet.llmq.platform}}

diff --git a/packages/rs-dapi-client/Cargo.toml b/packages/rs-dapi-client/Cargo.toml
@@ -37,5 +37,6 @@ lru = { version = "0.12.3" }
 serde = { version = "1.0.197", optional = true, features = ["derive"] }
 serde_json = { version = "1.0.120", optional = true }
 chrono = { version = "0.4.38", features = ["serde"] }
+
 [dev-dependencies]
 tokio = { version = "1.40", features = ["macros"] }