Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

src/consensus/consensus.h

@@ -9,7 +9,11 @@
 /** The minimum allowed block version (network rule) */
 static const int32_t MIN_BLOCK_VERSION = 4;
 /** The minimum allowed transaction version (network rule) */
-static const int32_t MIN_TX_VERSION = 1;
+static const int32_t SPROUT_MIN_TX_VERSION = 1;
+/** The minimum allowed transaction version (network rule) */
+static const int32_t OVERWINTER_MIN_TX_VERSION = 3;
+/** The maximum allowed transaction version (network rule) */
+static const int32_t OVERWINTER_MAX_TX_VERSION = 3;
 /** The maximum allowed size for a serialized block, in bytes (network rule) */
 static const unsigned int MAX_BLOCK_SIZE = 2000000;
 /** The maximum allowed number of signature check operations in a block (network rule) */
@@ -18,6 +22,8 @@ static const unsigned int MAX_BLOCK_SIGOPS = 20000;
 static const unsigned int MAX_TX_SIZE = 100000;
 /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
 extern int COINBASE_MATURITY;
+/** The minimum value which is invalid for expiry height, used by CTransaction and CMutableTransaction */
+static constexpr uint32_t TX_EXPIRY_HEIGHT_THRESHOLD = 500000000;
 
 /** Flags for LockTime() */
 enum {

src/consensus/params.h

@@ -9,6 +9,54 @@
 #include "uint256.h"
 
 namespace Consensus {
+
+/**
+ * Index into Params.vUpgrades and NetworkUpgradeInfo
+ *
+ * Being array indices, these MUST be numbered consecutively.
+ *
+ * The order of these indices MUST match the order of the upgrades on-chain, as
+ * several functions depend on the enum being sorted.
+ */
+enum UpgradeIndex {
+    // Sprout must be first
+    BASE_SPROUT,
+    UPGRADE_TESTDUMMY,
+    UPGRADE_OVERWINTER,
+    // NOTE: Also add new upgrades to NetworkUpgradeInfo in upgrades.cpp
+    MAX_NETWORK_UPGRADES
+};
+
+struct NetworkUpgrade {
+    /**
+     * The first protocol version which will understand the new consensus rules
+     */
+    int nProtocolVersion;
+
+    /**
+     * Height of the first block for which the new consensus rules will be active
+     */
+    int nActivationHeight;
+
+    /**
+     * Special value for nActivationHeight indicating that the upgrade is always active.
+     * This is useful for testing, as it means tests don't need to deal with the activation
+     * process (namely, faking a chain of somewhat-arbitrary length).
+     *
+     * New blockchains that want to enable upgrade rules from the beginning can also use
+     * this value. However, additional care must be taken to ensure the genesis block
+     * satisfies the enabled rules.
+     */
+    static constexpr int ALWAYS_ACTIVE = 0;
+
+    /**
+     * Special value for nActivationHeight indicating that the upgrade will never activate.
+     * This is useful when adding upgrade code that has a testnet activation height, but
+     * should remain disabled on mainnet.
+     */
+    static constexpr int NO_ACTIVATION_HEIGHT = -1;
+};
+
 /**
  * Parameters that influence chain consensus.
  */
@@ -39,9 +87,10 @@ struct Params {
     int nMajorityEnforceBlockUpgrade;
     int nMajorityRejectBlockOutdated;
     int nMajorityWindow;
+    int fPowAllowMinDifficultyBlocks;
+    NetworkUpgrade vUpgrades[MAX_NETWORK_UPGRADES];
     /** Proof of work parameters */
     uint256 powLimit;
-    bool fPowAllowMinDifficultyBlocks;
     int64_t nPowAveragingWindow;
     int64_t nPowMaxAdjustDown;
     int64_t nPowMaxAdjustUp;

src/consensus/upgrades.cpp

@@ -0,0 +1,126 @@
+// Copyright (c) 2018 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "consensus/upgrades.h"
+
+/**
+ * General information about each network upgrade.
+ * Ordered by Consensus::UpgradeIndex.
+ */
+const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
+    {
+        /*.nBranchId =*/ 0,
+        /*.strName =*/ "Sprout",
+        /*.strInfo =*/ "The Zcash network at launch",
+    },
+    {
+        /*.nBranchId =*/ 0x74736554,
+        /*.strName =*/ "Test dummy",
+        /*.strInfo =*/ "Test dummy info",
+    },
+    {
+        /*.nBranchId =*/ 0x5ba81b19,
+        /*.strName =*/ "Overwinter",
+        /*.strInfo =*/ "See https://z.cash/upgrade/overwinter.html for details.",
+    }
+};
+
+const uint32_t SPROUT_BRANCH_ID = NetworkUpgradeInfo[Consensus::BASE_SPROUT].nBranchId;
+
+UpgradeState NetworkUpgradeState(
+    int nHeight,
+    const Consensus::Params& params,
+    Consensus::UpgradeIndex idx)
+{
+    assert(nHeight >= 0);
+    assert(idx >= Consensus::BASE_SPROUT && idx < Consensus::MAX_NETWORK_UPGRADES);
+    auto nActivationHeight = params.vUpgrades[idx].nActivationHeight;
+
+    if (nActivationHeight == Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) {
+        return UPGRADE_DISABLED;
+    } else if (nHeight >= nActivationHeight) {
+        // From ZIP 200:
+        //
+        // ACTIVATION_HEIGHT
+        //     The non-zero block height at which the network upgrade rules will come
+        //     into effect, and be enforced as part of the blockchain consensus.
+        //
+        //     For removal of ambiguity, the block at height ACTIVATION_HEIGHT - 1 is
+        //     subject to the pre-upgrade consensus rules, and would be the last common
+        //     block in the event of a persistent pre-upgrade branch.
+        return UPGRADE_ACTIVE;
+    } else {
+        return UPGRADE_PENDING;
+    }
+}
+
+bool NetworkUpgradeActive(
+    int nHeight,
+    const Consensus::Params& params,
+    Consensus::UpgradeIndex idx)
+{
+    return NetworkUpgradeState(nHeight, params, idx) == UPGRADE_ACTIVE;
+}
+
+int CurrentEpoch(int nHeight, const Consensus::Params& params) {
+    for (auto idxInt = Consensus::MAX_NETWORK_UPGRADES - 1; idxInt >= Consensus::BASE_SPROUT; idxInt--) {
+        if (NetworkUpgradeActive(nHeight, params, Consensus::UpgradeIndex(idxInt))) {
+            return idxInt;
+        }
+    }
+}
+
+uint32_t CurrentEpochBranchId(int nHeight, const Consensus::Params& params) {
+    return NetworkUpgradeInfo[CurrentEpoch(nHeight, params)].nBranchId;
+}
+
+bool IsActivationHeight(
+    int nHeight,
+    const Consensus::Params& params,
+    Consensus::UpgradeIndex idx)
+{
+    assert(idx >= Consensus::BASE_SPROUT && idx < Consensus::MAX_NETWORK_UPGRADES);
+
+    // Don't count Sprout as an activation height
+    if (idx == Consensus::BASE_SPROUT) {
+        return false;
+    }
+
+    return nHeight >= 0 && nHeight == params.vUpgrades[idx].nActivationHeight;
+}
+
+bool IsActivationHeightForAnyUpgrade(
+    int nHeight,
+    const Consensus::Params& params)
+{
+    if (nHeight < 0) {
+        return false;
+    }
+
+    // Don't count Sprout as an activation height
+    for (int idx = Consensus::BASE_SPROUT + 1; idx < Consensus::MAX_NETWORK_UPGRADES; idx++) {
+        if (nHeight == params.vUpgrades[idx].nActivationHeight)
+            return true;
+    }
+
+    return false;
+}
+
+boost::optional<int> NextActivationHeight(
+    int nHeight,
+    const Consensus::Params& params)
+{
+    if (nHeight < 0) {
+        return boost::none;
+    }
+
+    // Don't count Sprout as an activation height
+    for (auto idx = Consensus::BASE_SPROUT + 1; idx < Consensus::MAX_NETWORK_UPGRADES; idx++) {
+        if (NetworkUpgradeState(nHeight, params, Consensus::UpgradeIndex(idx)) == UPGRADE_PENDING) {
+            return params.vUpgrades[idx].nActivationHeight;
+        }
+    }
+
+    return boost::none;
+}

src/consensus/upgrades.h

@@ -0,0 +1,90 @@
+// Copyright (c) 2018 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef ZCASH_CONSENSUS_UPGRADES_H
+#define ZCASH_CONSENSUS_UPGRADES_H
+
+#include "consensus/params.h"
+
+#include <boost/optional.hpp>
+
+enum UpgradeState {
+    UPGRADE_DISABLED,
+    UPGRADE_PENDING,
+    UPGRADE_ACTIVE
+};
+
+struct NUInfo {
+    /** Branch ID (a random non-zero 32-bit value) */
+    uint32_t nBranchId;
+    /** User-facing name for the upgrade */
+    std::string strName;
+    /** User-facing information string about the upgrade */
+    std::string strInfo;
+};
+
+extern const struct NUInfo NetworkUpgradeInfo[];
+
+// Consensus branch id to identify pre-overwinter (Sprout) consensus rules.
+extern const uint32_t SPROUT_BRANCH_ID;
+
+/**
+ * Checks the state of a given network upgrade based on block height.
+ * Caller must check that the height is >= 0 (and handle unknown heights).
+ */
+UpgradeState NetworkUpgradeState(
+    int nHeight,
+    const Consensus::Params& params,
+    Consensus::UpgradeIndex idx);
+
+/**
+ * Returns true if the given network upgrade is active as of the given block
+ * height. Caller must check that the height is >= 0 (and handle unknown
+ * heights).
+ */
+bool NetworkUpgradeActive(
+    int nHeight,
+    const Consensus::Params& params,
+    Consensus::UpgradeIndex idx);
+
+/**
+ * Returns the index of the most recent upgrade as of the given block height
+ * (corresponding to the current "epoch"). Consensus::BASE_SPROUT is the
+ * default value if no upgrades are active. Caller must check that the height
+ * is >= 0 (and handle unknown heights).
+ */
+int CurrentEpoch(int nHeight, const Consensus::Params& params);
+
+/**
+ * Returns the branch ID of the most recent upgrade as of the given block height
+ * (corresponding to the current "epoch"), or 0 if no upgrades are active.
+ * Caller must check that the height is >= 0 (and handle unknown heights).
+ */
+uint32_t CurrentEpochBranchId(int nHeight, const Consensus::Params& params);
+
+/**
+ * Returns true if the given block height is the activation height for the given
+ * upgrade.
+ */
+bool IsActivationHeight(
+    int nHeight,
+    const Consensus::Params& params,
+    Consensus::UpgradeIndex upgrade);
+
+/**
+ * Returns true if the given block height is the activation height for any upgrade.
+ */
+bool IsActivationHeightForAnyUpgrade(
+    int nHeight,
+    const Consensus::Params& params);
+
+/**
+ * Returns the activation height for the next upgrade after the given block height,
+ * or boost::none if there are no more known upgrades.
+ */
+boost::optional<int> NextActivationHeight(
+    int nHeight,
+    const Consensus::Params& params);
+
+#endif // ZCASH_CONSENSUS_UPGRADES_H

src/consensus/validation.h

@@ -17,6 +17,7 @@ static const unsigned char REJECT_NONSTANDARD = 0x40;
 static const unsigned char REJECT_DUST = 0x41;
 static const unsigned char REJECT_INSUFFICIENTFEE = 0x42;
 static const unsigned char REJECT_CHECKPOINT = 0x43;
+static const unsigned char REJECT_HAVEBETTER = 0x44;
 
 /** Capture information about block/transaction validation */
 class CValidationState {