Merge branch 'development' into remove-merkle-branch

Author: jamescowens

doc/build-unix.md

@@ -64,6 +64,7 @@ These dependencies are required:
  libdb4.8    | Berkeley DB      | Wallet storage (only needed when wallet enabled)
  qt          | GUI              | GUI toolkit (only needed when GUI enabled)
  libqrencode | QR codes in GUI  | Optional for generating QR codes (only needed when GUI enabled)
+ libzip      | Zip Compression  | For Zip Compression and Decompression for snapshot and scraper related functions
 
 For the versions used in the release, see [release-process.md](release-process.md) under *Fetch and build inputs*.
 
@@ -81,7 +82,7 @@ Dependency Build Instructions: Ubuntu & Debian
 ----------------------------------------------
 Build requirements:
 
-    sudo apt-get install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils
+    sudo apt-get install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils libzip-dev libfreetype-dev
 
 Options when installing required Boost library files:
 
@@ -98,13 +99,22 @@ install necessary parts of boost:
 BerkeleyDB is required for the wallet.
 
 **For Ubuntu only:** db4.8 packages are available [here](https://launchpad.net/~bitcoin/+archive/bitcoin).
+
 You can add the repository and install using the following commands:
 
+**For Ubuntu 18.04 and earlier versions**
+
     sudo apt-get install software-properties-common
     sudo add-apt-repository ppa:bitcoin/bitcoin
     sudo apt-get update
     sudo apt-get install libdb4.8-dev libdb4.8++-dev
 
+**For Ubuntu 20.04+**
+
+    For Ubuntu 20.04+ users the db4.8 is not available on the official PPA. Use the script in contrib/install_db4.sh
+    to compile and install db4.8. You can use the script in your build location. For example if your build
+    location is Gridcoin-Research/ then `./contrib/install_db4.sh $PWD`
+
 Ubuntu and Debian have their own libdb-dev and libdb++-dev packages, but these will install
 BerkeleyDB 5.1 or later, which break binary wallet compatibility with the distributed executables which
 are based on BerkeleyDB 4.8. If you do not care about wallet compatibility,

src/Makefile.am

@@ -75,6 +75,7 @@ GRIDCOIN_CORE_H = \
     consensus/consensus.h \
     consensus/merkle.h \
     consensus/params.h \
+    consensus/tx_verify.h \
     crypter.h \
     fs.h \
     fwd.h \
@@ -128,6 +129,8 @@ GRIDCOIN_CORE_H = \
     gridcoin/voting/result.h \
     gridcoin/voting/vote.h \
     hash.h \
+    index/disktxpos.h \
+    index/txindex.h \
     init.h \
     key.h \
     keystore.h \
@@ -138,7 +141,10 @@ GRIDCOIN_CORE_H = \
     netbase.h \
     net.h \
     pbkdf2.h \
+    policy/fees.h \
+    policy/policy.h \
     prevector.h \
+    primitives/transaction.h \
     protocol.h \
     reverselock.h \
     rpc/blockchain.h \
@@ -168,6 +174,7 @@ GRIDCOIN_CORE_H = \
     util/threadnames.h \
     util/time.h \
     util.h \
+    validation.h \
     version.h \
     wallet/coincontrol.h \
     wallet/db.h \
@@ -184,6 +191,7 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     chainparamsbase.cpp \
     checkpoints.cpp \
     consensus/merkle.cpp \
+    consensus/tx_verify.cpp \
     crypter.cpp \
     fs.cpp \
     gridcoin/appcache.cpp \
@@ -209,6 +217,7 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     gridcoin/superblock.cpp \
     gridcoin/support/block_finder.cpp \
     gridcoin/tally.cpp \
+    gridcoin/tx_message.cpp \
     gridcoin/upgrade.cpp \
     gridcoin/voting/builders.cpp \
     gridcoin/voting/claims.cpp \
@@ -226,6 +235,8 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     net.cpp \
     noui.cpp \
     pbkdf2.cpp \
+    policy/policy.cpp \
+    primitives/transaction.cpp \
     protocol.cpp \
     rpc/blockchain.cpp \
     rpc/client.cpp \
@@ -251,6 +262,7 @@ GRIDCOIN_CORE_CPP = addrdb.cpp \
     util/threadnames.cpp \
     util/time.cpp \
     util.cpp \
+    validation.cpp \
     version.cpp \
     wallet/db.cpp \
     wallet/rpcdump.cpp \

src/Makefile.qt.include

@@ -368,7 +368,9 @@ RES_ICONS = \
   qt/res/icons/icons_light/transactions.svg \
   qt/res/icons/icons_native/transactions.svg \
   qt/res/icons/icons_light/chevron_down.svg \
-  qt/res/icons/icons_dark/chevron_down.svg
+  qt/res/icons/icons_light/chevron_up.svg \
+  qt/res/icons/icons_dark/chevron_down.svg \
+  qt/res/icons/icons_dark/chevron_up.svg
 
 RES_IMAGES = \
   qt/res/images/about.svg \

src/chainparams.h

@@ -145,3 +145,8 @@ inline int GetNewbieSnapshotFixHeight()
 {
     return fTestNet ? 1480000 : 2197000;
 }
+
+inline unsigned int GetMinimumConnectionsRequiredForStaking()
+{
+    return fTestNet ? 1 : 3;
+}

src/consensus/consensus.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "amount.h"
+
 static const int LAST_POW_BLOCK = 2050;
 static const int CONSENSUS_LOOKBACK = 5;  //Amount of blocks to go back from best block, to avoid counting forked blocks
 static const int BLOCK_GRANULARITY = 10;  //Consensus block divisor
@@ -20,6 +22,6 @@ static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100;
 /** The maximum number of entries in an 'inv' protocol message */
 static const unsigned int MAX_INV_SZ = 50000;
 /** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */
-static const int64_t MIN_TX_FEE = 10000;
+static const CAmount MIN_TX_FEE = 10000;
 /** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */
-static const int64_t MIN_RELAY_TX_FEE = MIN_TX_FEE;
+static const CAmount MIN_RELAY_TX_FEE = MIN_TX_FEE;

src/consensus/tx_verify.cpp

@@ -0,0 +1,54 @@
+// Copyright (c) 2017-2020 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <consensus/tx_verify.h>
+
+#include <primitives/transaction.h>
+
+bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
+{
+    AssertLockHeld(cs_main);
+    // Time based nLockTime implemented in 0.1.6
+    if (tx.nLockTime == 0)
+        return true;
+    if (nBlockHeight == 0)
+        nBlockHeight = nBestHeight;
+    if (nBlockTime == 0)
+        nBlockTime = GetAdjustedTime();
+    if ((int64_t)tx.nLockTime < ((int64_t)tx.nLockTime < LOCKTIME_THRESHOLD ? (int64_t)nBlockHeight : nBlockTime))
+        return true;
+    for (auto const& txin : tx.vin)
+        if (!txin.IsFinal())
+            return false;
+    return true;
+}
+
+unsigned int GetLegacySigOpCount(const CTransaction& tx)
+{
+    unsigned int nSigOps = 0;
+    for (auto const& txin : tx.vin)
+    {
+        nSigOps += txin.scriptSig.GetSigOpCount(false);
+    }
+    for (auto const& txout : tx.vout)
+    {
+        nSigOps += txout.scriptPubKey.GetSigOpCount(false);
+    }
+    return nSigOps;
+}
+
+unsigned int GetP2SHSigOpCount(const CTransaction& tx, const MapPrevTx& inputs)
+{
+    if (tx.IsCoinBase())
+        return 0;
+
+    unsigned int nSigOps = 0;
+    for (unsigned int i = 0; i < tx.vin.size(); i++)
+    {
+        const CTxOut& prevout = GetOutputFor(tx.vin[i], inputs);
+        if (prevout.scriptPubKey.IsPayToScriptHash())
+            nSigOps += prevout.scriptPubKey.GetSigOpCount(tx.vin[i].scriptSig);
+    }
+    return nSigOps;
+}

src/consensus/tx_verify.h

@@ -0,0 +1,33 @@
+// Copyright (c) 2017-2020 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_CONSENSUS_TX_VERIFY_H
+#define BITCOIN_CONSENSUS_TX_VERIFY_H
+
+#include "main.h"
+
+class CTransaction;
+
+/** Count ECDSA signature operations the old-fashioned (pre-0.6) way
+    @param[in] tx The transaction to count
+    @return number of sigops tx's outputs will produce when spent
+    @see FetchInputs
+*/
+unsigned int GetLegacySigOpCount(const CTransaction& tx);
+
+/** Count ECDSA signature operations in pay-to-script-hash inputs.
+    @param[in] tx The transaction to count
+    @param[in] mapInputs	Map of previous transactions that have outputs tx is spending
+    @return maximum number of sigops required to validate tx's inputs
+    @see FetchInputs
+*/
+unsigned int GetP2SHSigOpCount(const CTransaction& tx, const MapPrevTx& inputs);
+
+/**
+ * Check if transaction is final and can be included in a block with the
+ * specified height and time. Consensus critical.
+ */
+bool IsFinalTx(const CTransaction &tx, int nBlockHeight = 0, int64_t nBlockTime = 0);
+
+#endif // BITCOIN_CONSENSUS_TX_VERIFY_H

src/gridcoin/gridcoin.cpp

@@ -406,12 +406,12 @@ void ScheduleUpdateChecks(CScheduler& scheduler)
     LogPrintf("Gridcoin: checking for updates every %" PRId64 " hours", hours);
 
     scheduler.scheduleEvery([]{
-        g_UpdateChecker->CheckForLatestUpdate();
+        g_UpdateChecker->ScheduledUpdateCheck();
     }, hours * 60 * 60 * 1000);
 
     // Schedule a start-up check one minute from now:
     scheduler.scheduleFromNow([]{
-        g_UpdateChecker->CheckForLatestUpdate();
+        g_UpdateChecker->ScheduledUpdateCheck();
     }, 60 * 1000);
 }
 
@@ -429,6 +429,7 @@ void ScheduleBeaconDBPassivation(CScheduler& scheduler)
 
 std::unique_ptr<Upgrade> g_UpdateChecker;
 bool fSnapshotRequest = false;
+bool fResetBlockchainRequest = false;
 
 // -----------------------------------------------------------------------------
 // Functions

src/gridcoin/tx_message.cpp

@@ -0,0 +1,27 @@
+// Copyright (c) 2014-2020 The Gridcoin developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <string>
+
+#include "gridcoin/support/xml.h"
+#include "gridcoin/tx_message.h"
+
+std::string GetMessage(const CTransaction& tx)
+{
+    if (tx.nVersion <= 1) {
+        return ExtractXML(tx.hashBoinc, "<MESSAGE>", "</MESSAGE>");
+    }
+
+    if (tx.vContracts.empty()) {
+        return std::string();
+    }
+
+    if (tx.vContracts.front().m_type != GRC::ContractType::MESSAGE) {
+        return std::string();
+    }
+
+    const auto payload = tx.vContracts.front().SharePayloadAs<GRC::TxMessage>();
+
+    return payload->m_message;
+} 

src/gridcoin/tx_message.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "gridcoin/contract/payload.h"
+#include "primitives/transaction.h"
 
 #include <string>
 
@@ -103,3 +104,8 @@ class TxMessage : public IContractPayload
     }
 }; // TxMessage
 }
+
+//!
+//! \brief Get the custom, user-supplied transaction message, if any.
+//!
+std::string GetMessage(const CTransaction& tx);