Upgrade version to 0.13.4.1. Fixed znode payment checking. Added miss…

…ing resource to qt
firoorg · Dec 6, 2017 · 9114101 · 9114101
1 parent 27aadcb
commit 9114101
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 13)
 define(_CLIENT_VERSION_REVISION, 4)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2017)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

diff --git a/contrib/bitcoin-qt.pro b/contrib/bitcoin-qt.pro
@@ -16,6 +16,7 @@ FORMS += \
     ../src/qt/forms/sendcoinsentry.ui \
     ../src/qt/forms/signverifymessagedialog.ui \
     ../src/qt/forms/transactiondescdialog.ui \
+    ../src/qt/forms/znodelist.ui \
     ../src/qt/forms/zerocoinpage.ui \
 
 RESOURCES += \

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -247,6 +247,7 @@ RES_ICONS = \
   qt/res/icons/bitcoin.png \
   qt/res/icons/zcoin.png \
   qt/res/icons/zerocoin.png \
+  qt/res/icons/znodes.png \
   qt/res/icons/qrcode.png \
   qt/res/icons/chevron.png \
   qt/res/icons/clock1.png \

diff --git a/src/main.cpp b/src/main.cpp
@@ -1373,8 +1373,7 @@ bool CheckTransaction(const CTransaction &tx, CValidationState &state, uint256 h
             bool found_3 = false;
             bool found_4 = false;
             bool found_5 = false;
-            int total_payment_tx = 0;
-            bool found_znode_payment = true; // no more than 1 output for payment
+            int total_payment_tx = 0; // no more than 1 output for payment
             CScript FOUNDER_1_SCRIPT;
             CScript FOUNDER_2_SCRIPT;
             CScript FOUNDER_3_SCRIPT;
@@ -1468,9 +1467,7 @@ bool CheckTransaction(const CTransaction &tx, CValidationState &state, uint256 h
                         found_5 = true;
                         continue;
                     }
-                    if (znodePayment != output.nValue) {
-                        found_znode_payment = false;
-                    } else {
+                    if (znodePayment == output.nValue) {
                         total_payment_tx = total_payment_tx + 1;
                     }
                 }
@@ -1481,7 +1478,7 @@ bool CheckTransaction(const CTransaction &tx, CValidationState &state, uint256 h
                                  "CTransaction::CheckTransaction() : founders reward missing");
             }
 
-            if (!found_znode_payment || total_payment_tx > 1) {
+            if (total_payment_tx > 1) {
                 return state.DoS(100, false, REJECT_INVALID_ZNODE_PAYMENT,
                                  "CTransaction::CheckTransaction() : invalid znode payment");
             }