gridcoin-community · ikolomiko · Dec 11, 2023 · Dec 11, 2023 · Dec 11, 2023 · Dec 26, 2023
diff --git a/ci/test_run_all.sh b/ci/test_run_all.sh
@@ -6,9 +6,14 @@
 
 export LC_ALL=C.UTF-8
 
+# latest_stage.log will contain logs for a silenced stage if it
+# fails.
+trap "cat latest_stage.log" EXIT
+
 set -o errexit; source ./ci/test/00_setup_env.sh
 set -o errexit; source ./ci/test/03_before_install.sh
-set -o errexit; source ./ci/test/04_install.sh &> 04.log || (cat 04.log && exit 1)
-set -o errexit; source ./ci/test/05_before_script.sh &> 05.log || (cat 05.log && exit 1)
+set -o errexit; source ./ci/test/04_install.sh &> latest_stage.log
+set -o errexit; source ./ci/test/05_before_script.sh &> latest_stage.log
+echo -n > latest_stage.log
 set -o errexit; source ./ci/test/06_script_a.sh
 set -o errexit; source ./ci/test/06_script_b.sh
diff --git a/configure.ac b/configure.ac
@@ -3,9 +3,9 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 5)
 define(_CLIENT_VERSION_MINOR, 4)
 define(_CLIENT_VERSION_REVISION, 5)
-define(_CLIENT_VERSION_BUILD, 4)
+define(_CLIENT_VERSION_BUILD, 6)
 define(_CLIENT_VERSION_IS_RELEASE, false)
-define(_COPYRIGHT_YEAR, 2023)
+define(_COPYRIGHT_YEAR, 2024)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Gridcoin]])
 AC_INIT([Gridcoin],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/gridcoin/Gridcoin-Research/issues],[gridcoin],[https://gridcoin.us/])
@@ -664,7 +664,8 @@ if test "$use_hardening" != "no"; then
 
   case $host in
     *mingw*)
-      dnl stack-clash-protection doesn't currently work, and likely should just be skipped for Windows.
+      dnl stack-clash-protection doesn't compile with GCC 10 and earlier.
+      dnl In any case, it is a no-op for Windows.
       dnl See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90458 for more details.
       ;;
     *)

diff --git a/contrib/build-flatpak.sh b/contrib/build-flatpak.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+export LC_ALL=C
+set -e
+SECONDS=0
+
+gc_platform="org.kde.Platform//5.15-23.08"
+gc_sdk="org.kde.Sdk//5.15-23.08"
+gc_id="us.gridcoin.Gridcoin-Research"
+gc_output_file="Gridcoin-Research.flatpak"
+gc_repo_root="$(realpath "$(dirname "$0")/..")"
+gc_builddir="$gc_repo_root/build"
+
+# Add the required flathub.org repo to the list of local repos, if it wasn't added earlier.
+flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+
+# Check if the required SDK and runtime are installed. If not, install them.
+flatpak info "$gc_platform" &>/dev/null || flatpak install --noninteractive -y flathub "$gc_platform"
+flatpak info "$gc_sdk" &>/dev/null || flatpak install --noninteractive -y flathub "$gc_sdk"
+
+echo "Started building the Gridcoin-Research Flatpak bundle..."
+mkdir -p "$gc_builddir"
+flatpak-builder --state-dir="$gc_builddir/flatpak-cache" "$gc_builddir/flatpak-build" "$gc_repo_root/contrib/flatpak-manifest.json" --force-clean
+flatpak build-export "$gc_builddir/gridcoin-flatpak" "$gc_builddir/flatpak-build"
+flatpak build-bundle "$gc_builddir/gridcoin-flatpak" "$gc_builddir/$gc_output_file" "$gc_id"
+
+relative_output="$(realpath --relative-to="$PWD" "$gc_builddir/$gc_output_file")"
+echo ""
+echo "Took $SECONDS seconds to build the Flatpak bundle. You can find the output in $relative_output"
+echo "To install it, run the command below:"
+echo "flatpak install $relative_output"
diff --git a/contrib/flatpak-manifest.json b/contrib/flatpak-manifest.json
@@ -0,0 +1,76 @@
+{
+    "id": "us.gridcoin.Gridcoin-Research",
+    "branch": "main",
+    "runtime": "org.kde.Platform",
+    "runtime-version": "5.15-23.08",
+    "sdk": "org.kde.Sdk",
+    "command": "gridcoinresearch",
+    "rename-desktop-file": "gridcoinresearch.desktop",
+    "rename-icon": "gridcoinresearch",
+    "finish-args": [
+        "--share=ipc",
+        "--share=network",
+        "--socket=wayland",
+        "--socket=fallback-x11",
+        "--device=dri",
+        "--talk-name=org.kde.StatusNotifierWatcher",
+        "--talk-name=org.freedesktop.Notifications",
+        "--filesystem=~/.var/app/edu.berkeley.BOINC:ro",
+        "--filesystem=/var/lib/boinc-client:ro",
+        "--filesystem=/var/lib/boinc:ro"
+    ],
+    "cleanup": [
+        "*.la",
+        "*.a"
+    ],
+    "modules": [
+        {
+            "name": "libzip",
+            "cleanup": [
+                "/bin",
+                "/share"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://nih.at/libzip/libzip-1.1.3.tar.xz",
+                    "sha256": "729a295a59a9fd6e5b9fe9fd291d36ae391a9d2be0b0824510a214cfaa05ceee"
+                }
+            ]
+        },
+        {
+            "name": "boost",
+            "buildsystem": "simple",
+            "build-commands": [
+                "./bootstrap.sh --prefix=/app --with-libraries=system,filesystem,thread,iostreams,test",
+                "./b2 -j $FLATPAK_BUILDER_N_JOBS install"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2",
+                    "sha256": "8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc"
+                }
+            ]
+        },
+        {
+            "name": "Gridcoin-Research",
+            "buildsystem": "autotools",
+            "config-opts": [
+                "--with-boost-libdir=/app/lib"
+            ],
+            "sources": [
+                {
+                    "type": "dir",
+                    "path": ".."
+                },
+                {
+                    "type": "shell",
+                    "commands": [
+                        "./autogen.sh"
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/depends/packages/zlib.mk b/depends/packages/zlib.mk
@@ -1,8 +1,8 @@
 package=zlib
-$(package)_version=1.3
+$(package)_version=1.3.1
 $(package)_download_path=https://www.zlib.net
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
+$(package)_sha256_hash=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
 
 define $(package)_set_vars
 $(package)_config_opts= CC="$($(package)_cc)"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -135,6 +135,7 @@ add_library(gridcoin_util STATIC
     gridcoin/scraper/scraper.cpp
     gridcoin/scraper/scraper_net.cpp
     gridcoin/scraper/scraper_registry.cpp
+    gridcoin/sidestake.cpp
     gridcoin/staking/difficulty.cpp
     gridcoin/staking/exceptions.cpp
     gridcoin/staking/kernel.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -129,6 +129,7 @@ GRIDCOIN_CORE_H = \
     gridcoin/scraper/scraper.h \
     gridcoin/scraper/scraper_net.h \
     gridcoin/scraper/scraper_registry.h \
+    gridcoin/sidestake.h \
     gridcoin/staking/chain_trust.h \
     gridcoin/staking/difficulty.h \
     gridcoin/staking/exceptions.h \
@@ -258,6 +259,7 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     gridcoin/scraper/scraper.cpp \
     gridcoin/scraper/scraper_net.cpp \
     gridcoin/scraper/scraper_registry.cpp \
+    gridcoin/sidestake.cpp \
     gridcoin/staking/difficulty.cpp \
     gridcoin/staking/exceptions.cpp \
     gridcoin/staking/kernel.cpp \

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -82,6 +82,7 @@ QT_FORMS_UI = \
   qt/forms/consolidateunspentwizardsendpage.ui \
   qt/forms/diagnosticsdialog.ui \
   qt/forms/editaddressdialog.ui \
+  qt/forms/editsidestakedialog.ui \
   qt/forms/favoritespage.ui \
   qt/forms/intro.ui \
   qt/forms/mrcrequestpage.ui \
@@ -143,6 +144,7 @@ QT_MOC_CPP = \
   qt/moc_csvmodelwriter.cpp \
   qt/moc_diagnosticsdialog.cpp \
   qt/moc_editaddressdialog.cpp \
+  qt/moc_editsidestakedialog.cpp \
   qt/moc_favoritespage.cpp \
   qt/moc_guiutil.cpp \
   qt/moc_intro.cpp \
@@ -161,6 +163,7 @@ QT_MOC_CPP = \
   qt/moc_rpcconsole.cpp \
   qt/moc_sendcoinsdialog.cpp \
   qt/moc_sendcoinsentry.cpp \
+  qt/moc_sidestaketablemodel.cpp \
   qt/moc_signverifymessagedialog.cpp \
   qt/moc_trafficgraphwidget.cpp \
   qt/moc_transactiondesc.cpp \
@@ -249,6 +252,7 @@ GRIDCOINRESEARCH_QT_H = \
   qt/decoration.h \
   qt/diagnosticsdialog.h \
   qt/editaddressdialog.h \
+  qt/editsidestakedialog.h \
   qt/favoritespage.h \
   qt/guiconstants.h \
   qt/guiutil.h \
@@ -285,6 +289,7 @@ GRIDCOINRESEARCH_QT_H = \
   qt/rpcconsole.h \
   qt/sendcoinsdialog.h \
   qt/sendcoinsentry.h \
+  qt/sidestaketablemodel.h \
   qt/signverifymessagedialog.h \
   qt/trafficgraphwidget.h \
   qt/transactiondesc.h \
@@ -340,6 +345,7 @@ GRIDCOINRESEARCH_QT_CPP = \
   qt/decoration.cpp \
   qt/diagnosticsdialog.cpp \
   qt/editaddressdialog.cpp \
+  qt/editsidestakedialog.cpp \
   qt/favoritespage.cpp \
   qt/guiutil.cpp \
   qt/intro.cpp \
@@ -372,6 +378,7 @@ GRIDCOINRESEARCH_QT_CPP = \
   qt/rpcconsole.cpp \
   qt/sendcoinsdialog.cpp \
   qt/sendcoinsentry.cpp \
+  qt/sidestaketablemodel.cpp \
   qt/signverifymessagedialog.cpp \
   qt/trafficgraphwidget.cpp \
   qt/transactiondesc.cpp \

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -56,6 +56,7 @@ GRIDCOIN_TESTS =\
 	test/gridcoin/protocol_tests.cpp \
 	test/gridcoin/researcher_tests.cpp \
 	test/gridcoin/scraper_registry_tests.cpp \
+	test/gridcoin/sidestake_tests.cpp \
 	test/gridcoin/superblock_tests.cpp \
 	test/key_tests.cpp \
 	test/merkle_tests.cpp \

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -74,6 +74,8 @@ class CMainParams : public CChainParams {
         consensus.InitialMRCFeeFractionPostZeroInterval = Fraction(2, 5);
         // Zero day interval is 14 days on mainnet
         consensus.MRCZeroPaymentInterval = 14 * 24 * 60 * 60;
+        // The maximum ratio of rewards that can be allocated to all of the mandatory sidestakes.
+        consensus.MaxMandatorySideStakeTotalAlloc = Fraction(1, 4);
         // The "standard" contract replay lookback for those contract types
         // that do not have a registry db.
         consensus.StandardContractReplayLookback = 180 * 24 * 60 * 60;
@@ -187,6 +189,8 @@ class CTestNetParams : public CChainParams {
         consensus.InitialMRCFeeFractionPostZeroInterval = Fraction(2, 5);
         // Zero day interval is 10 minutes on testnet. The very short interval facilitates testing.
         consensus.MRCZeroPaymentInterval = 10 * 60;
+        // The maximum ratio of rewards that can be allocated to all of the mandatory sidestakes.
+        consensus.MaxMandatorySideStakeTotalAlloc = Fraction(1, 4);
         // The "standard" contract replay lookback for those contract types
         // that do not have a registry db.
         consensus.StandardContractReplayLookback = 180 * 24 * 60 * 60;

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -47,6 +47,10 @@ struct Params {
       * forfeiture of fees to the staker and/or foundation. Only consensus critical at BlockV12Height or above.
       */
     int64_t MRCZeroPaymentInterval;
+    /**
+     * @brief The maximum allocation (as a Fraction) that can be used by all of the mandatory sidestakes
+     */
+    Fraction MaxMandatorySideStakeTotalAlloc;
 
     int64_t StandardContractReplayLookback;
 

diff --git a/src/gridcoin/beacon.cpp b/src/gridcoin/beacon.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2023 The Gridcoin developers
+// Copyright (c) 2014-2024 The Gridcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or https://opensource.org/licenses/mit-license.php.
 

diff --git a/src/gridcoin/beacon.h b/src/gridcoin/beacon.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2023 The Gridcoin developers
+// Copyright (c) 2014-2024 The Gridcoin developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or https://opensource.org/licenses/mit-license.php.