Merge pull request dashpay#16 from watto-engineer/protocolv5-02

Update gitian, snapcraft, governance icon

contrib/gitian-build.py

@@ -36,7 +36,7 @@ def setup():
     if not os.path.isdir('wagerr'):
         subprocess.check_call(['git', 'clone', 'https://github.com/wagerr/wagerr.git'])
     os.chdir('gitian-builder')
-    make_image_prog = ['bin/make-base-vm', '--distro', 'debian' '--suite', 'buster', '--arch', 'amd64']
+    make_image_prog = ['bin/make-base-vm', '--distro', 'debian' '--suite', 'bullseye', '--arch', 'amd64']
     if args.docker:
         make_image_prog += ['--docker']
     elif args.lxc:

contrib/gitian-descriptors/gitian-linux.yml

@@ -3,7 +3,7 @@ name: "wagerr-linux-5.0.99"
 enable_cache: true
 distro: "debian"
 suites:
-- "buster"
+- "bullseye"
 architectures:
 - "amd64"
 packages:
@@ -16,24 +16,24 @@ packages:
 - "ca-certificates"
 - "curl"
 - "faketime"
-- "g++-8"
-- "gcc-8"
+- "g++-9"
+- "gcc-9"
 - "git"
 - "libtool"
 - "patch"
 - "pkg-config"
 - "python3"
 - "libxkbcommon0"
-- "g++-8-multilib"
-- "gcc-8-multilib"
+- "g++-9-multilib"
+- "gcc-9-multilib"
 - "binutils-gold"
 # Cross compilation HOSTS:
 #  - aarch64-linux-gnu
 - "binutils-aarch64-linux-gnu"
-- "g++-8-aarch64-linux-gnu"
+- "g++-9-aarch64-linux-gnu"
 #  - arm-linux-gnueabihf
 - "binutils-arm-linux-gnueabihf"
-- "g++-8-arm-linux-gnueabihf"
+- "g++-9-arm-linux-gnueabihf"
 remotes:
 - "url": "https://github.com/wagerr/wagerr.git"
   "dir": "wagerr"
@@ -79,11 +79,11 @@ script: |
   function create_per-host_faketime_wrappers {
   for i in $HOSTS; do
     for prog in ${FAKETIME_HOST_PROGS}; do
-        if which ${i}-${prog}-8
+        if which ${i}-${prog}-9
         then
             echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
             echo "# GCCVERSION=${GCCVERSION}" >> ${WRAP_DIR}/${i}-${prog}
-            echo "REAL=\`which -a ${i}-${prog}-8 | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
+            echo "REAL=\`which -a ${i}-${prog}-9 | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
             echo "export LD_PRELOAD='/usr/\$LIB/faketime/libfaketime.so.1'" >> ${WRAP_DIR}/${i}-${prog}
             echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
             echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
@@ -104,7 +104,7 @@ script: |
   BASEPREFIX="${PWD}/depends"
   # Build dependencies for each host
   for i in $HOSTS; do
-    make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}" CC=${i}-gcc-8 CXX=${i}-g++-8
+    make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}" CC=${i}-gcc-9 CXX=${i}-g++-9
   done
 
   # Faketime for binaries
@@ -141,7 +141,7 @@ script: |
     tar --strip-components=1 -xf "${GIT_ARCHIVE}"
 
     ./autogen.sh
-    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" CC=${i}-gcc-8 CXX=${i}-g++-8
+    CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" CC=${i}-gcc-9 CXX=${i}-g++-9
     make ${MAKEOPTS}
     make ${MAKEOPTS} -C src check-security
     # make check-symbols no longer works

contrib/gitian-descriptors/gitian-osx-signer.yml

@@ -2,7 +2,7 @@
 name: "wagerr-dmg-signer"
 distro: "debian"
 suites:
-- "buster"
+- "bullseye"
 architectures:
 - "amd64"
 packages:

contrib/gitian-descriptors/gitian-osx.yml

@@ -3,7 +3,7 @@ name: "wagerr-osx-5.0.99"
 enable_cache: true
 distro: "debian"
 suites:
-- "buster"
+- "bullseye"
 architectures:
 - "amd64"
 packages:

contrib/gitian-descriptors/gitian-win-signer.yml

@@ -2,7 +2,7 @@
 name: "wagerr-win-signer"
 distro: "debian"
 suites:
-- "buster"
+- "bullseye"
 architectures:
 - "amd64"
 packages:

contrib/gitian-descriptors/gitian-win.yml

@@ -3,12 +3,12 @@ name: "wagerr-win-5.0.99"
 enable_cache: true
 distro: "debian"
 suites:
-- "buster"
+- "bullseye"
 architectures:
 - "amd64"
 packages:
 - "curl"
-- "g++"
+- "g++-9"
 - "git"
 - "pkg-config"
 - "autoconf"

snap/local/patches/X001-default_data_dir.patch

@@ -1,6 +1,17 @@
---- a/src/util.cpp	2021-07-16 14:05:25.916474113 +0100
-+++ b/src/util.cpp	2021-07-16 14:08:16.343511483 +0100
-@@ -671,7 +671,7 @@
+From 4ddf8880768f27a58961863cde2931a42a906646 Mon Sep 17 00:00:00 2001
+From: wagerr-builder <104495875+wagerr-builder@users.noreply.github.com>
+Date: Fri, 13 Jan 2023 13:22:18 +0000
+Subject: [PATCH] default data dir
+
+---
+ src/util/system.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/system.cpp b/src/util/system.cpp
+index b6484ab39..859029a6f 100644
+--- a/src/util/system.cpp
++++ b/src/util/system.cpp
+@@ -719,7 +719,7 @@ fs::path GetDefaultDataDir()
      return GetSpecialFolderPath(CSIDL_APPDATA) / "Wagerrcoin";
  #else
      fs::path pathRet;
@@ -9,3 +20,6 @@
      if (pszHome == nullptr || strlen(pszHome) == 0)
          pathRet = fs::path("/");
      else
+-- 
+2.25.1
+

snap/local/patches/X003-fix-use-snap-instead-of-dirty.patch

@@ -1,11 +1,25 @@
---- a/share/genbuild.sh	2021-07-02 14:42:34.929275467 +0100
-+++ b/share/genbuild.sh	2021-07-02 14:43:24.141157299 +0100
-@@ -36,7 +36,7 @@
+From 3d62f4d11246fd536343b14ae37681f9f7083b91 Mon Sep 17 00:00:00 2001
+From: wagerr-builder <104495875+wagerr-builder@users.noreply.github.com>
+Date: Fri, 13 Jan 2023 13:30:15 +0000
+Subject: [PATCH] genbuild
+
+---
+ share/genbuild.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/share/genbuild.sh b/share/genbuild.sh
+index 804d56eff..95503e9e3 100755
+--- a/share/genbuild.sh
++++ b/share/genbuild.sh
+@@ -32,7 +32,7 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$
 
      # otherwise generate suffix from git, i.e. string like "59887e8-dirty"
-     SUFFIX=$(git rev-parse --short HEAD)
--    git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
-+    git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-snap"
+     GIT_COMMIT=$(git rev-parse --short HEAD)
+-    git diff-index --quiet HEAD -- || GIT_COMMIT="$GIT_COMMIT-dirty"
++    git diff-index --quiet HEAD -- || GIT_COMMIT="$GIT_COMMIT-snap"
  fi
 
- if [ -n "$DESC" ]; then
+ if [ -n "$GIT_TAG" ]; then
+-- 
+2.25.1
+

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 # Copyright (c) 2018-2021 The Wagerr developers
 name: wagerr
-base: core18
+base: core20
 version: 5.0.0
 summary:   wagerr, digital currency for media content
 description: |
@@ -29,71 +29,71 @@ description: |
   - twitter (https://twitter.com/wagerr)
   - instagram (https://www.instagram.com/wagerr/)
   - facebook (https://www.facebook.com/wagerr)
-grade: devel
+grade: stable
 confinement: strict
 apps:
   daemon:
-    command: wagerrd
+    command: bin/wagerrd
     plugs: [network, network-bind, home, removable-media]
     #desktop: wagerrd.desktop
     environment:
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
   daemon-testnet:
-    command: wagerrd --testnet
+    command: bin/wagerrd --testnet
     plugs: [network, network-bind, home, removable-media]
     #desktop: wagerrd_testnet.desktop
     environment:
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
   daemon-regtest:
-    command: wagerrd --regtest
+    command: bin/wagerrd --regtest
     plugs: [network, network-bind, home, removable-media]
     #desktop: wagerrd_regtest.desktop
     environment:
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
   qt:
-    command: wagerr-qt
+    command: bin/wagerr-qt
     plugs: [network, network-bind, network-status, unity7, desktop, desktop-legacy, wayland, x11, mir, opengl, home, gsettings, removable-media, screen-inhibit-control, pulseaudio, media-hub]
     desktop: wagerr-qt.desktop
     environment:
       QT_XKB_CONFIG_ROOT: $SNAP_USER_DATA:$SNAP/usr/share:$QT_XKB_CONFIG_ROOT
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
   qt-testnet:
-    command: wagerr-qt --testnet
+    command: bin/wagerr-qt --testnet
     plugs: [network, network-bind, network-status, unity7, desktop, desktop-legacy, wayland, x11, mir, opengl, home, gsettings, removable-media, screen-inhibit-control, pulseaudio, media-hub]
     desktop: wagerr-qt_testnet.desktop
     environment:
       QT_XKB_CONFIG_ROOT: $SNAP_USER_DATA:$SNAP/usr/share:$QT_XKB_CONFIG_ROOT
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
   qt-regtest:
-    command: wagerr-qt --regtest
+    command: bin/wagerr-qt --regtest
     plugs: [network, network-bind, network-status, unity7, desktop, desktop-legacy, wayland, x11, mir, opengl, home, gsettings, removable-media, screen-inhibit-control, pulseaudio, media-hub]
     desktop: wagerr-qt_regtest.desktop
     environment:
       QT_XKB_CONFIG_ROOT: $SNAP_USER_DATA:$SNAP/usr/share:$QT_XKB_CONFIG_ROOT
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
   cli:
-    command: wagerr-cli
+    command: bin/wagerr-cli
     plugs: [network, network-bind, home, removable-media]
     environment:
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
   cli-testnet:
-    command: wagerr-cli --testnet
+    command: bin/wagerr-cli --testnet
     plugs: [network, network-bind, home, removable-media]
     environment:
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
   cli-regtest:
-    command: wagerr-cli --regtest
+    command: bin/wagerr-cli --regtest
     plugs: [network, network-bind, home, removable-media]
     environment:
       XDG_DATA_DIRS: $SNAP_USER_DATA:$SNAP/usr/share:$XDG_DATA_DIRS
   tx:
-    command: wagerr-tx
+    command: bin/wagerr-tx
     plugs: [home]
   test:
-    command: test_wagerr
+    command: bin/test_wagerr
     plugs: [home]
   testqt:
-    command: test_wagerr-qt
+    command: bin/test_wagerr-qt
     plugs: [home]
 parts:
   wagerr:
@@ -270,10 +270,8 @@ parts:
     build-packages:
       - curl
       - wget
-      - gcc
-      - gcc-8
-      - g++
-      - g++-8
+      - gcc-9
+      - g++-9
       - make
       - autoconf
       - automake
@@ -294,7 +292,7 @@ parts:
       - light-themes
       - shared-mime-info
       - libqt5gui5
-      - libgdk-pixbuf2.0-0
+      - libgtk2.0-0
       - libqt5svg5 # for loading icon themes which are svg
       - locales-all
       - qtwayland5

src/Makefile.qt.include

@@ -184,6 +184,7 @@ RES_ICONS = \
   qt/res/icons/connect2_16.png \
   qt/res/icons/connect3_16.png \
   qt/res/icons/connect4_16.png \
+  qt/res/icons/governance.png \
   qt/res/icons/overview.png \
   qt/res/icons/send.png \
   qt/res/icons/receive.png \

src/qt/bitcoingui.cpp

@@ -700,7 +700,9 @@ void BitcoinGUI::createToolBars()
 
         if (settings.value("fShowGovernanceTab").toBool()) {
             governanceButton = new QToolButton(this);
-            governanceButton->setText(tr("&Governance"));
+            governanceButton->setToolButtonStyle( Qt::ToolButtonTextUnderIcon);
+            governanceButton->setText(tr("Governance"));
+            governanceButton->setIcon(QIcon(":/icons/governance"));
             governanceButton->setStatusTip(tr("View Governance Proposals"));
             tabGroup->addButton(governanceButton);
             connect(governanceButton, &QToolButton::clicked, this, &BitcoinGUI::gotoGovernancePage);

src/qt/wagerr.qrc

@@ -7,6 +7,7 @@
         <file alias="connect_2">res/icons/connect2_16.png</file>
         <file alias="connect_3">res/icons/connect3_16.png</file>
         <file alias="connect_4">res/icons/connect4_16.png</file>
+        <file alias="governance">res/icons/governance.png</file>
         <file alias="overview">res/icons/overview.png</file>
         <file alias="send">res/icons/send.png</file>
         <file alias="receive">res/icons/receive.png</file>