BIP141: Commitment structure and deployment

Includes a fix by Suhas Daftuar and LongShao007

src/miner.h

@@ -29,6 +29,7 @@ struct CBlockTemplate
     CBlock block;
     std::vector<CAmount> vTxFees;
     std::vector<int64_t> vTxSigOps;
+    std::vector<unsigned char> vchCoinbaseCommitment;
 };
 
 // Container for tracking updates to ancestor feerate as we include (parent)
@@ -139,6 +140,7 @@ private:
     CBlock* pblock;
 
     // Configuration parameters for the block size
+    bool fIncludeWitness;
     unsigned int nBlockMaxSize, nBlockMinSize;
 
     // Information on the current status of the block