Merging develop to Master for 4.3.2 release

Author: Mark Ney

.github/scripts/05-binary-checks.sh

@@ -3,7 +3,8 @@
 OS=${1}
 GITHUB_WORKSPACE=${2}
 
-export BOOST_TEST_LOG_LEVEL=error
+# "all" is too much log information. This will increase from verbosity from error"
+#export BOOST_TEST_LOG_LEVEL=all
 
 if [[ ${OS} == "windows" ]]; then
     echo "----------------------------------------"

.github/workflows/build-raven.yml

@@ -6,6 +6,7 @@ on:
       - release*
   pull_request:
     branches:
+      - master
       - develop
       - release*
     paths-ignore:

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 3)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)

src/Makefile.qt.include

@@ -310,6 +310,8 @@ RES_ICONS = \
   qt/res/icons/editcopy.png \
   qt/res/icons/editpaste.png \
   qt/res/icons/export.png \
+  qt/res/icons/external_link.png \
+  qt/res/icons/external_link_dark.png \
   qt/res/icons/eye.png \
   qt/res/icons/eye_minus.png \
   qt/res/icons/eye_plus.png \

src/chainparamsseeds.h

@@ -65,7 +65,9 @@
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <boost/bind.hpp>
+// Fixing Boost 1.73 compile errors
+#include <boost/bind/bind.hpp>
+using namespace boost::placeholders;
 #include <boost/interprocess/sync/file_lock.hpp>
 #include <boost/thread.hpp>
 #include <openssl/crypto.h>

src/init.cpp

@@ -18,12 +18,12 @@ class AssetRecord
 public:
 
     AssetRecord():
-            name(""), quantity(0), units(0), fIsAdministrator(false)
+            name(""), quantity(0), units(0), fIsAdministrator(false), ipfshash("")
     {
     }
 
-    AssetRecord(const std::string _name, const CAmount& _quantity, const int _units, const bool _fIsAdministrator):
-            name(_name), quantity(_quantity), units(_units), fIsAdministrator(_fIsAdministrator)
+    AssetRecord(const std::string _name, const CAmount& _quantity, const int _units, const bool _fIsAdministrator, const std::string _ipfshash):
+            name(_name), quantity(_quantity), units(_units), fIsAdministrator(_fIsAdministrator), ipfshash(_ipfshash)
     {
     }
 
@@ -48,6 +48,7 @@ class AssetRecord
     CAmount quantity;
     int units;
     bool fIsAdministrator;
+    std::string ipfshash;
     /**@}*/
 
 };

src/qt/assetrecord.h

@@ -55,6 +55,7 @@ class AssetTablePriv {
                     // retrieve units for asset
                     uint8_t units = OWNER_UNITS;
                     bool fIsAdministrator = true;
+                    std::string ipfsHash = "";
 
                     if (setAssetsToSkip.count(bal->first))
                         continue;
@@ -67,6 +68,7 @@ class AssetTablePriv {
                             return;
                         }
                         units = assetData.units;
+                        ipfsHash = assetData.strIPFSHash;
                         // If we have the administrator asset, add it to the skip listå
                         if (balances.count(bal->first + OWNER_TAG)) {
                             setAssetsToSkip.insert(bal->first + OWNER_TAG);
@@ -82,7 +84,7 @@ class AssetTablePriv {
                             continue;
                         }
                     }
-                    cachedBalances.append(AssetRecord(bal->first, bal->second, units, fIsAdministrator));
+                    cachedBalances.append(AssetRecord(bal->first, bal->second, units, fIsAdministrator, EncodeAssetData(ipfsHash)));
                 }
             }
         }
@@ -158,8 +160,25 @@ QVariant AssetTableModel::data(const QModelIndex &index, int role) const
         case FormattedAmountRole:
             return QString::fromStdString(rec->formattedQuantity());
         case AdministratorRole:
-        {
             return rec->fIsAdministrator;
+        case AssetIPFSHashRole:
+            return QString::fromStdString(rec->ipfshash);
+        case AssetIPFSHashDecorationRole:
+        {
+            if (index.column() == Quantity)
+                return QVariant();
+
+            if (rec->ipfshash.size() == 0)
+                return QVariant();
+
+            QPixmap pixmap;
+
+            if (darkModeEnabled)
+                pixmap = QPixmap::fromImage(QImage(":/icons/external_link_dark"));
+            else
+                pixmap = QPixmap::fromImage(QImage(":/icons/external_link"));
+
+            return pixmap;
         }
         case Qt::DecorationRole:
         {
@@ -235,7 +254,7 @@ QModelIndex AssetTableModel::index(int row, int column, const QModelIndex &paren
 
 QString AssetTableModel::formatTooltip(const AssetRecord *rec) const
 {
-    QString tooltip = formatAssetName(rec) + QString("\n") + formatAssetQuantity(rec);
+    QString tooltip = formatAssetName(rec) + QString("\n") + formatAssetQuantity(rec) + QString("\n") + formatAssetData(rec);
     return tooltip;
 }
 
@@ -247,4 +266,9 @@ QString AssetTableModel::formatAssetName(const AssetRecord *wtx) const
 QString AssetTableModel::formatAssetQuantity(const AssetRecord *wtx) const
 {
     return QString::fromStdString(wtx->formattedQuantity());
+}
+
+QString AssetTableModel::formatAssetData(const AssetRecord *wtx) const
+{
+    return QString::fromStdString(wtx->ipfshash);
 }

src/qt/assettablemodel.cpp

@@ -43,7 +43,11 @@ class AssetTableModel : public QAbstractTableModel
         /** Formatted amount, without brackets when unconfirmed */
             FormattedAmountRole = 102,
         /** AdministratorRole */
-            AdministratorRole = 103
+            AdministratorRole = 103,
+        /** RVN or name of an asset */
+            AssetIPFSHashRole = 104,
+        /** IPFS Decoration Role */
+            AssetIPFSHashDecorationRole = 105
     };
 
     int rowCount(const QModelIndex &parent) const;
@@ -52,6 +56,7 @@ class AssetTableModel : public QAbstractTableModel
     QVariant headerData(int section, Qt::Orientation orientation, int role) const;
     QModelIndex index(int row, int column, const QModelIndex & parent = QModelIndex()) const;
     QString formatTooltip(const AssetRecord *rec) const;
+    QString formatAssetData(const AssetRecord *wtx) const;
     QString formatAssetName(const AssetRecord *wtx) const;
     QString formatAssetQuantity(const AssetRecord *wtx) const;
 

src/qt/assettablemodel.h

@@ -26,6 +26,9 @@
 #include <QDebug>
 #include <QTimer>
 
+// Fixing Boost 1.73 compile errors
+#include <boost/bind/bind.hpp>
+using namespace boost::placeholders;
 class CBlockIndex;
 
 static int64_t nLastHeaderTipUpdateNotification = 0;