Merge branch 'develop' of https://github.com/dashpay/dash into develop

dashpay · Aug 19, 2024 · 34d5563 · 34d5563
2 parents 318716e + d8fca38
commit 34d5563
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -58,10 +58,26 @@ jobs:
     needs: build-image
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         include:
         - build_target: arm-linux
           host: arm-linux-gnueabihf
+        - build_target: linux64
+          host: x86_64-pc-linux-gnu
+        - build_target: linux64_tsan
+          host: x86_64-pc-linux-gnu
+        - build_target: linux64_ubsan
+          host: x86_64-pc-linux-gnu
+        - build_target: linux64_fuzz
+          host: x86_64-pc-linux-gnu
+        - build_target: linux64_cxx20
+          host: x86_64-pc-linux-gnu
+        - build_target: linux64_sqlite
+          host: x86_64-pc-linux-gnu
+        - build_target: linux64_nowallet
+          host: x86_64-pc-linux-gnu
+
     container:
       image: ghcr.io/${{ needs.build-image.outputs.repo-name }}/dashcore-ci-runner:${{ needs.build-image.outputs.image-tag }}
       options: --user root
@@ -91,11 +107,25 @@ jobs:
     needs: [build-image, build-depends]
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         include:
           - build_target: arm-linux
             host: arm-linux-gnueabihf
-            dep_opts: DEBUG=1
+          - build_target: linux64
+            host: x86_64-pc-linux-gnu
+          - build_target: linux64_tsan
+            host: x86_64-pc-linux-gnu
+          - build_target: linux64_ubsan
+            host: x86_64-pc-linux-gnu
+          - build_target: linux64_fuzz
+            host: x86_64-pc-linux-gnu
+          - build_target: linux64_cxx20
+            host: x86_64-pc-linux-gnu
+          - build_target: linux64_sqlite
+            host: x86_64-pc-linux-gnu
+          - build_target: linux64_nowallet
+            host: x86_64-pc-linux-gnu
     container:
       image: ghcr.io/${{ needs.build-image.outputs.repo-name }}/dashcore-ci-runner:${{ needs.build-image.outputs.image-tag }}
       options: --user root
@@ -144,7 +174,7 @@ jobs:
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: build-artifacts
+          name: build-artifacts-${{ matrix.build_target }}
           path: |
             /output
 

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
@@ -224,6 +224,8 @@ void OptionsModel::Init(bool resetSettings)
     // CoinJoin
     if (!settings.contains("nCoinJoinSessions"))
         settings.setValue("nCoinJoinSessions", DEFAULT_COINJOIN_SESSIONS);
+    if (!gArgs.SoftSetArg("-coinjoinsessions", settings.value("nCoinJoinSessions").toString().toStdString()))
+        addOverriddenOption("-coinjoinsessions");
 
     if (!settings.contains("nCoinJoinRounds"))
         settings.setValue("nCoinJoinRounds", DEFAULT_COINJOIN_ROUNDS);
@@ -247,9 +249,13 @@ void OptionsModel::Init(bool resetSettings)
 
     if (!settings.contains("nCoinJoinDenomsGoal"))
         settings.setValue("nCoinJoinDenomsGoal", DEFAULT_COINJOIN_DENOMS_GOAL);
+    if (!gArgs.SoftSetArg("-coinjoindenomsgoal", settings.value("nCoinJoinDenomsGoal").toString().toStdString()))
+        addOverriddenOption("-coinjoindenomsgoal");
 
     if (!settings.contains("nCoinJoinDenomsHardCap"))
         settings.setValue("nCoinJoinDenomsHardCap", DEFAULT_COINJOIN_DENOMS_HARDCAP);
+    if (!gArgs.SoftSetArg("-coinjoindenomshardcap", settings.value("nCoinJoinDenomsHardCap").toString().toStdString()))
+        addOverriddenOption("-coinjoindenomshardcap");
 #endif
 
     // Network

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4063,7 +4063,7 @@ bool CVerifyDB::VerifyDB(
     int reportDone = 0;
     LogPrintf("[0%%]..."); /* Continued */
 
-    const bool is_snapshot_cs{!chainstate.m_from_snapshot_blockhash};
+    const bool is_snapshot_cs{chainstate.m_from_snapshot_blockhash};
 
     for (pindex = chainstate.m_chain.Tip(); pindex && pindex->pprev; pindex = pindex->pprev) {
         const int percentageDone = std::max(1, std::min(99, (int)(((double)(chainstate.m_chain.Height() - pindex->nHeight)) / (double)nCheckDepth * (nCheckLevel >= 4 ? 50 : 100))));