backport:

.cirrus.yml

@@ -29,15 +29,15 @@ task:
   functional_test_script:
     - ./test/functional/test_runner.py --jobs 9 --ci --extended --exclude feature_dbcrash --combinedlogslen=1000 --quiet --failfast
 task:
-  name: "x86_64 Linux  [GOAL: install]  [bionic]  [Using ./ci/ system]"
+  name: "x86_64 Linux  [GOAL: install]  [focal]  [Using ./ci/ system]"
   container:
-    image: ubuntu:18.04
+    image: ubuntu:focal
     cpu: 8
     memory: 8G
   timeout_in: 60m
   env:
     MAKEJOBS: "-j9"
-    RUN_CI_ON_HOST: "1"
+    DANGER_RUN_CI_ON_HOST: "1"
     CCACHE_SIZE: "200M"
     CCACHE_DIR: "/tmp/ccache_dir"
   ccache_cache:

.fuzzbuzz.yml

@@ -1,4 +1,4 @@
-base: ubuntu:16.04
+base: ubuntu:focal
 language: c++
 engine: libFuzzer
 environment:

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: Bug
+assignees: ''
+
+---
+
+<!-- This issue tracker is only for technical issues related to Dash Core.
+
+General dash questions and/or support requests are best directed to the Dash Forum at https://www.dash.org/forum/
+
+For reporting security issues, please read instructions at https://www.dash.org/bug-bounty/
+
+If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->
+
+<!-- Describe the issue -->
+
+**Expected behavior**
+
+<!--- What behavior did you expect? -->
+
+**Actual behavior**
+
+<!--- What was the actual behavior (provide screenshots if the issue is GUI-related)? -->
+
+**To reproduce**
+
+<!--- How reliably can you reproduce the issue, what are the steps to do so? -->
+
+**System information**
+
+<!-- What version of Dash Core are you using, where did you get it (website, self-compiled, etc)? -->
+
+<!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->
+
+<!-- GUI-related issue? What is your operating system and its version? If Linux, what is your desktop environment and graphical shell? -->
+
+<!-- Any extra information that might be useful in the debugging process. -->
+<!--- This is normally the contents of a `debug.log` or `config.log` file. Raw text or a link to a pastebin type site are preferred. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: Feature
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/good_first_issue.md

@@ -2,11 +2,13 @@
 name: Good first issue
 about: '(Regular devs only): Suggest a new good first issue'
 title: ''
-labels: good first issue
+labels: ''
 assignees: ''
 
 ---
 
+<!-- Needs the label "good first issue" assigned manually before or after opening -->
+
 
 #### Useful skills:
 

.github/workflows/guix-build.yml

@@ -0,0 +1,69 @@
+name: Guix Build
+
+on:
+  pull_request:
+    types: [ labeled ]
+
+jobs:
+  build:
+    runs-on: self-hosted
+    if: contains(github.event.pull_request.labels.*.name, 'guix-build')
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Commit variables
+        id: dockerfile
+        run: |
+          echo "hash=$(sha256sum ./contrib/containers/guix/Dockerfile | cut -d ' ' -f1)" >> $GITHUB_OUTPUT
+          echo "host_user_id=$(id -u)" >> $GITHUB_OUTPUT
+          echo "host_group_id=$(id -g)" >> $GITHUB_OUTPUT
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ steps.dockerfile.outputs.hash }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: ${{ github.workspace }}
+          build-args: |
+            USER_ID=${{ steps.dockerfile.outputs.host_user_id }}
+            GROUP_ID=${{ steps.dockerfile.outputs.host_group_id }}
+          build-contexts: |
+            docker_root=${{ github.workspace }}/contrib/containers/guix
+          file: ./contrib/containers/guix/Dockerfile
+          load: true
+          tags: guix_ubuntu:latest
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
+      - name: Run Guix build
+        run: |
+          docker run --privileged -d --rm -t \
+            --name guix-daemon \
+            -e ADDITIONAL_GUIX_COMMON_FLAGS="--max-jobs=$(nproc --all)" \
+            -v ${{ github.workspace }}:/src/dash \
+            -w /src/dash \
+            guix_ubuntu:latest && \
+          docker exec guix-daemon bash -c '/usr/local/bin/guix-start'
+
+      - name: Ensure build passes
+        run: |
+          if [[ $? != 0 ]]; then
+            echo "Guix build failed!"
+            exit 1
+          fi
+
+      - name: Compute SHA256 checksums
+        run: |
+          ./contrib/containers/guix/scripts/guix-check ${{ github.workspace }}

.github/workflows/handle_potential_conflicts.py

@@ -1,23 +1,37 @@
-# Copyright (c) 2022 The Dash Core developers
+#!/usr/bin/env python3
+# Copyright (c) 2022-2023 The Dash Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+"""
+
+Usage:
+    $ ./handle_potential_conflicts.py <conflicts>
+
+Where <conflicts> is a json string which looks like
+    {   pull_number: 26,
+        conflictPrs:
+            [ { number: 15,
+                files: [ 'testfile1', `testfile2` ],
+                conflicts: [ 'testfile1' ] },
+                ...
+            ]}
+"""
+
 import sys
 import requests
 
 # need to install via pip
 import hjson
 
-'''Looks like'''
-'''{ pull_number: 26,
-    conflictPrs:
-        [ { number: 25,
-            files: [ '.github/workflows/testfile' ],
-            conflicts: [ '.github/workflows/testfile' ] }
-        { number: 24,
-            files: [ '.github/workflows/testfile' ],
-            conflicts: [ '.github/workflows/testfile' ] } ] }'''
+def get_label(pr_num):
+    return requests.get(f'https://api.github.com/repos/dashpay/dash/pulls/{pr_num}').json()['head']['label']
 
 def main():
+    if len(sys.argv) != 2:
+        print(f'Usage: {sys.argv[0]} <conflicts>', file=sys.stderr)
+        sys.exit(1)
+
     input = sys.argv[1]
     print(input)
     j_input = hjson.loads(input)
@@ -58,10 +72,5 @@ def main():
         sys.exit(1)
 
 
-
-def get_label(pr_num):
-    return requests.get(f'https://api.github.com/repos/dashpay/dash/pulls/{pr_num}').json()['head']['label']
-
-
 if __name__ == "__main__":
     main()

.github/workflows/predict-conflicts.yml

@@ -21,8 +21,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: check for potential conflicts
-        uses: PastaPastaPasta/potential-conflicts-checker-action@0.1.9
+        uses: PastaPastaPasta/potential-conflicts-checker-action@v0.1.10
         with:
           ghToken: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Checkout
+        uses: actions/checkout@v2
       - name: validate potential conflicts
-        run: wget https://raw.githubusercontent.com/dashpay/dash/develop/.github/workflows/handle_potential_conflicts.py && pip3 install hjson && python3 handle_potential_conflicts.py "$conflicts"
+        run: pip3 install hjson && .github/workflows/handle_potential_conflicts.py "$conflicts"

.gitignore

@@ -95,8 +95,6 @@ Makefile
 !depends/Makefile
 dash-qt
 Dash-Qt.app
-background.tiff*
-!/depends/Makefile
 
 # Qt Creator
 Makefile.am.user
@@ -157,12 +155,11 @@ cmake-build-debug
 
 osx_volname
 dist/
-*.background.tiff
 
 /guix-build-*
 
 # cppcheck cache-directory
-.cppcheck/*
+test/lint/.cppcheck/*
 
 # flake8 cache location
 .cache/*