Merge remote-tracking branch 'origin' into release-0.7

.travis.yml

@@ -38,27 +38,27 @@ matrix:
         script:
           - ./scripts/debuild.sh
       #cross compile windows
-      - os: linux
-        services: docker
-        env:
-          - V=windows-Dockerfile-wheezy
-        script:
-          - ./archive.sh
-          - travis_wait 60 docker build -f scripts/docker/windows-crosscompile/Dockerfile-wheezy .
-      - os: linux
-        services: docker
-        env:
-          - V=windows-Dockerfile-xenial
-        script:
-          - ./archive.sh
-          - travis_wait 60 docker build -f scripts/docker/windows-crosscompile/Dockerfile-xenial .
-      - os: linux
-        services: docker
-        env:
-          - V=windows-Dockerfile-trusty
-        script:
-          - ./archive.sh
-          - travis_wait 60 docker build -f scripts/docker/windows-crosscompile/Dockerfile-trusty .
+      #- os: linux
+      #  services: docker
+      #  env:
+      #    - V=windows-Dockerfile-wheezy
+      #  script:
+      #    - ./archive.sh
+      #    - travis_wait 60 docker build -f scripts/docker/windows-crosscompile/Dockerfile-wheezy .
+      #- os: linux
+      #  services: docker
+      #  env:
+      #    - V=windows-Dockerfile-xenial
+      #  script:
+      #    - ./archive.sh
+      #    - travis_wait 60 docker build -f scripts/docker/windows-crosscompile/Dockerfile-xenial .
+      #- os: linux
+      #  services: docker
+      #  env:
+      #    - V=windows-Dockerfile-trusty
+      #  script:
+      #    - ./archive.sh
+      #    - travis_wait 60 docker build -f scripts/docker/windows-crosscompile/Dockerfile-trusty .
       #- os: linux
       #  sudo: required
       #  env:
@@ -71,7 +71,7 @@ matrix:
       #  install: true
       #  script:
       #    - travis_wait 60 ./scripts/windows-crosscompile/compile-peercoin.sh
-      #osx     
+      #osx
       - os: osx
         osx_image: xcode9.2
         before_script:

README.md

@@ -5,13 +5,13 @@ Peercoin Official Development Repo
 [![Build Status](https://travis-ci.org/peercoin/peercoin.svg?branch=master)](https://travis-ci.org/peercoin/peercoin)
 
 ### What is Peercoin?
-[Peercoin](https://peercoin.net) (abbreviated PPC), previously known as PPCoin, is the first [cryptocurrency](https://en.wikipedia.org/wiki/Cryptocurrency) design introducing [proof-of-stake consensus](https://peercoin.net/assets/paper/peercoin-paper.pdf) as a security model, with a combined [proof-of-stake](https://peercoin.net/assets/paper/peercoin-paper.pdf)/[proof-of-work](https://en.wikipedia.org/wiki/Proof-of-work_system) minting system. Peercoin is based on [Bitcoin](https://bitcoin.org), while introducing many important innovations to cryptocurrency field including new security model, energy efficiency, better minting model and more adaptive response to rapid change in network computation power.
+[Peercoin](https://peercoin.net) (abbreviated PPC), previously known as PPCoin, is the first [cryptocurrency](https://en.wikipedia.org/wiki/Cryptocurrency) design introducing [proof-of-stake consensus](https://peercoin.net/resources.html#whitepaper) as a security model, with a combined [proof-of-stake](https://peercoin.net/resources.html#whitepaper)/[proof-of-work](https://en.wikipedia.org/wiki/Proof-of-work_system) minting system. Peercoin is based on [Bitcoin](https://bitcoin.org), while introducing many important innovations to cryptocurrency field including new security model, energy efficiency, better minting model and more adaptive response to rapid change in network computation power.
 
 ### Peercoin Resources
 * Client and Source:
-[Client Binaries](https://peercoin.net/download),
+[Client Binaries](https://peercoin.net/wallet.html),
 [Source Code](https://github.com/peercoin/peercoin)
-* Documentation: [Peercoin Whitepaper](https://peercoin.net/whitepaper),
+* Documentation: [Peercoin Whitepaper](https://peercoin.net/resources.html#whitepaper),
 [Peercoin Wiki](https://github.com/peercoin/peercoin/wiki)
 * Help: 
 [Forum](https://talk.peercoin.net),

bitcoin-qt.pro

@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = peercoin-qt
 macx:TARGET = "Peercoin-Qt"
-VERSION = 0.7.0
+VERSION = 0.7.1
 INCLUDEPATH += src src/json src/qt
 QT += network core
 greaterThan(QT_MAJOR_VERSION, 4):QT+=widgets

contrib/debian/changelog

@@ -1,3 +1,9 @@
+peercoin (0.7.1-1) stable; urgency=low
+
+  * v0.7.1 release.
+
+ -- Peerchemist <peerchemist@protonmail.ch>  Mon, 4 Feb 2019 10:44:20 +0000
+
 peercoin (0.7.0-1) stable; urgency=low
 
   * v0.7 release.

contrib/debian/manpages/peercoind.1

@@ -1,4 +1,4 @@
-.TH PEERCOIND "1" "January 2019" "peercoind 0.7.0"
+.TH PEERCOIND "1" "February 2019" "peercoind 0.7.1"
 .SH NAME
 peercoind \- peer-to-peer network based digital currency
 .SH SYNOPSIS

doc/README.md

@@ -1,4 +1,4 @@
-Peercoin 0.7.0 BETA
+Peercoin 0.7.1 BETA
 
 Copyright (c) 2011-2019 Peercoin Developers
 Distributed under the MIT/X11 software license, see the accompanying

doc/README_windows.txt

@@ -1,4 +1,4 @@
-Peercoin 0.7.0 BETA
+Peercoin 0.7.1 BETA
 
 Copyright (c) 2011-2019 Peercoin Developers
 Distributed under the MIT/X11 software license, see the accompanying

doc/build-unix.md

@@ -13,7 +13,7 @@ To build in Terminal on Debian based Linux
 
 	git clone https://github.com/peercoin/peercoin
 	cd peercoin
-	git checkout v0.7.0ppc
+	git checkout v0.7.1ppc
 	./contrib/vagrant/install.sh
 
 

share/setup.nsi.in

@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.7.0
+!define VERSION 0.7.1
 !define COMPANY "Peercoin project"
 !define URL http://github.com/peercoin/peercoin/
 
@@ -51,7 +51,7 @@ CRCCheck on
 XPStyle on
 BrandingText " "
 ShowInstDetails show
-VIProductVersion 0.7.0.0
+VIProductVersion 0.7.1.0
 VIAddVersionKey ProductName Peercoin
 VIAddVersionKey ProductVersion "${VERSION}"
 VIAddVersionKey CompanyName "${COMPANY}"

src/clientversion.h

@@ -22,7 +22,7 @@
 // ppcoin version - intended for display purpose ONLY
 #define PEERCOIN_VERSION_MAJOR       0
 #define PEERCOIN_VERSION_MINOR       7
-#define PEERCOIN_VERSION_REVISION    0
+#define PEERCOIN_VERSION_REVISION    1
 #define PEERCOIN_VERSION_BUILD       0
 
 // Copyright year (2009-this)

src/main.cpp

@@ -3065,12 +3065,12 @@ bool static LoadBlockIndexDB()
         pindex->nChainTrust = (pindex->pprev ? pindex->pprev->nChainTrust : 0) + pindex->GetBlockTrust().getuint256();
         // ppcoin: calculate stake modifier checksum
         pindex->nStakeModifierChecksum = GetStakeModifierChecksum(pindex);
-        if (!CheckStakeModifierCheckpoints(pindex->nHeight, pindex->nStakeModifierChecksum))
-            return error("LoadBlockIndexDB() : Failed stake modifier checkpoint height=%d, modifier=0x%016" PRI64x, pindex->nHeight, pindex->nStakeModifier);
-
-        pindex->nChainTx = (pindex->pprev ? pindex->pprev->nChainTx : 0) + pindex->nTx;
-        if ((pindex->nStatus & BLOCK_VALID_MASK) >= BLOCK_VALID_TRANSACTIONS && !(pindex->nStatus & BLOCK_FAILED_MASK))
-            setBlockIndexValid.insert(pindex);
+        if (CheckStakeModifierCheckpoints(pindex->nHeight, pindex->nStakeModifierChecksum)) {
+            pindex->nChainTx = (pindex->pprev ? pindex->pprev->nChainTx : 0) + pindex->nTx;
+            if ((pindex->nStatus & BLOCK_VALID_MASK) >= BLOCK_VALID_TRANSACTIONS && !(pindex->nStatus & BLOCK_FAILED_MASK))
+                setBlockIndexValid.insert(pindex);
+            }
+        else printf("LoadBlockIndexDB() : Failed stake modifier checkpoint height=%d, modifier=0x%016" PRI64x ", sum=0x%016" PRI64x, pindex->nHeight, pindex->nStakeModifier, pindex->nStakeModifierChecksum);
     }
 
     // Load block file info

src/qt/bitcoingui.cpp

@@ -74,7 +74,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) :
 {
     restoreWindowGeometry();
     setWindowTitle(tr("Peercoin") + " - " + tr("Wallet"));
-    
+
     QFontDatabase::addApplicationFont(":/fonts/notosans-regular");
     QFile styleFile(":/themes/default");
     styleFile.open(QFile::ReadOnly);
@@ -140,7 +140,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent) :
     // Override style sheet for progress bar for styles that have a segmented progress bar,
     // as they make the text unreadable (workaround for issue #1071)
     // See https://qt-project.org/doc/qt-4.8/gallery.html
-    progressBar->setStyleSheet("QProgressBar { background-color: #333333; text-align: center; color: white; border: 1px solid #4b4b4b; } QProgressBar::chunk { background: #3cb054; margin: 0px; }");
+    progressBar->setStyleSheet("QProgressBar { background-color: #8C8C8C; text-align: center; color: white; border: 1px solid #4b4b4b; } QProgressBar::chunk { background: #3cb054; margin: 0px; }");
 
     statusBar()->addWidget(progressBarLabel);
     statusBar()->addWidget(progressBar);
@@ -214,6 +214,9 @@ void BitcoinGUI::createActions()
 
     multisigAction = new QAction(QIcon(":/icons/multisig"), tr("&Multisig"), this);
     multisigAction->setStatusTip(tr("UI to create multisig addresses"));
+    multisigAction->setToolTip(multisigAction->statusTip());
+    multisigAction->setCheckable(true);
+    multisigAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_7));
     tabGroup->addAction(multisigAction);
 
     connect(overviewAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
@@ -266,7 +269,7 @@ void BitcoinGUI::createActions()
     openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console"));
 
     openChatroomAction = new QAction(QIcon(":/icons/peercoin"), tr("&Chatroom"), this);
-    openChatroomAction->setStatusTip(tr("Open https://peercoin.chat in a web browser."));
+    openChatroomAction->setStatusTip(tr("Open the Peercoin Discord in a web browser."));
 
     openForumAction = new QAction(QIcon(":/icons/peercoin"), tr("&Forum"), this);
     openForumAction->setStatusTip(tr("Open https://talk.peercoin.net in a web browser."));
@@ -338,6 +341,7 @@ void BitcoinGUI::createToolBars()
     toolbar->addAction(mintingAction);
 #endif // DISABLE_MINING
     toolbar->addAction(addressBookAction);
+    toolbar->addAction(multisigAction);
 }
 
 void BitcoinGUI::setClientModel(ClientModel *clientModel)
@@ -548,7 +552,7 @@ void BitcoinGUI::gotoVerifyMessageTab(QString addr)
 }
 
 void BitcoinGUI::openChatroom() {
-    QDesktopServices::openUrl(QUrl("https://peercoin.chat"));
+    QDesktopServices::openUrl(QUrl("https://discord.gg/XPxfwtG"));
 }
 
 void BitcoinGUI::openForum() {

src/qt/forms/aboutdialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>593</width>
-    <height>319</height>
+    <width>600</width>
+    <height>420</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -126,9 +126,12 @@
         <string>
 This is experimental software.
 
-Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or https://www.opensource.org/licenses/mit-license.php.
+
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
+
+More information can be found on the Peercoin official website: https://peercoin.net/.</string>
 
-This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</string>
        </property>
        <property name="wordWrap">
         <bool>true</bool>

src/qt/forms/overviewpage.ui

@@ -20,7 +20,7 @@
       <bool>false</bool>
      </property>
      <property name="styleSheet">
-      <string notr="true">background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0, stop:0 #F0D0A0, stop:1 #F8D488); color:#000000;</string>
+      <string notr="true">background-color: #3cb054; color:#ffffff;</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>

src/qt/guiconstants.h

@@ -14,15 +14,15 @@ static const int STATUSBAR_ICONSIZE = 16;
 #define STYLE_INVALID "background:#FF8080"
 
 /* Transaction list -- unconfirmed transaction */
-#define COLOR_UNCONFIRMED QColor(128, 128, 128)
+#define COLOR_UNCONFIRMED QColor(140, 140, 140)
 /* Transaction list -- negative amount */
-#define COLOR_NEGATIVE QColor(136, 0, 21)
+#define COLOR_NEGATIVE QColor(255, 58, 66)
 /* Table List -- negative amount */
-#define COLOR_NEGATIVE_TABLE QColor(224, 0, 0)
+#define COLOR_NEGATIVE_TABLE QColor(255, 58, 66)
 /* Transaction list -- positive amount */
-#define COLOR_POSITIVE QColor(0x3c, 0xb0, 0x54)
+#define COLOR_POSITIVE QColor(60, 176, 84)
 /* Transaction list -- bare address (without label) */
-#define COLOR_BAREADDRESS QColor(140, 140, 140)
+#define COLOR_BAREADDRESS QColor(121, 121, 121)
 
 /* Tooltips longer than this (in characters) are converted into rich text,
    so that they can be word-wrapped.
@@ -36,8 +36,8 @@ static const int MAX_URI_LENGTH = 255;
 #define EXPORT_IMAGE_SIZE 256
 
 /* Colors for minting tab for each coin age group */
-#define COLOR_MINT_YOUNG QColor(128, 64, 64)
-#define COLOR_MINT_MATURE QColor(64, 128, 64)
-#define COLOR_MINT_OLD QColor(26, 77, 26)
+#define COLOR_MINT_YOUNG QColor(255, 224, 226)
+#define COLOR_MINT_MATURE QColor(204, 255, 207)
+#define COLOR_MINT_OLD QColor(111, 252, 141)
 
 #endif // GUICONSTANTS_H

src/qt/locale/bitcoin_af_ZA.ts

@@ -17,9 +17,11 @@
         <source>
 This is experimental software.
 
-Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
-This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
+
+More information can be found on the Peercoin official website: https://peercoin.net/.</source>
         <translation type="unfinished"/>
     </message>
     <message>

src/qt/locale/bitcoin_ar.ts

@@ -17,9 +17,11 @@
         <source>
 This is experimental software.
 
-Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
-This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
+
+More information can be found on the Peercoin official website: https://peercoin.net/.</source>
         <translation type="unfinished"/>
     </message>
     <message>

src/qt/locale/bitcoin_bg.ts

@@ -17,9 +17,11 @@
         <source>
 This is experimental software.
 
-Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
-This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
+
+More information can be found on the Peercoin official website: https://peercoin.net/.</source>
         <translation>
 Това е експериментален софтуер.
 

src/qt/locale/bitcoin_bs.ts

@@ -17,9 +17,11 @@
         <source>
 This is experimental software.
 
-Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
-This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
+
+More information can be found on the Peercoin official website: https://peercoin.net/.</source>
         <translation type="unfinished"/>
     </message>
     <message>

src/qt/locale/bitcoin_ca.ts

@@ -17,9 +17,11 @@
         <source>
 This is experimental software.
 
-Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
-This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
+
+More information can be found on the Peercoin official website: https://peercoin.net/.</source>
         <translation type="unfinished"/>
     </message>
     <message>

src/qt/locale/bitcoin_ca_ES.ts

@@ -17,9 +17,11 @@
         <source>
 This is experimental software.
 
-Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php.
+Distributed under the MIT/X11 software license, see the accompanying file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
-This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</source>
+This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (https://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
+
+More information can be found on the Peercoin official website: https://peercoin.net/.</source>
         <translation>\n Aquest és software experimental.\n\n Distribuït sota llicència de software MIT/11, veure l&apos;arxiu COPYING o http://www.opensource.org/licenses/mit-license.php.\n\nAquest producte inclou software desarrollat pel projecte OpenSSL per a l&apos;ús de OppenSSL Toolkit (http://www.openssl.org/) i de softwqre criptogràfic escrit per l&apos;Eric Young (eay@cryptsoft.com) i software UPnP escrit per en Thomas Bernard.</translation>
     </message>
     <message>