aboutsummaryrefslogtreecommitdiff
path: root/src/miner.h
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2015-11-06 01:42:38 +0100
committerPieter Wuille <pieter.wuille@gmail.com>2016-06-22 15:42:59 +0200
commit8b49040854be2e26b66366aeae1cba4716f93d93 (patch)
treeb217f3fb71bc0745c1f74ab239fbe0ebcf52a751 /src/miner.h
parent449f9b8debcceb61a92043bc7031528a53627c47 (diff)
downloadbitcoin-8b49040854be2e26b66366aeae1cba4716f93d93.tar.xz
BIP141: Commitment structure and deployment
Includes a fix by Suhas Daftuar and LongShao007
Diffstat (limited to 'src/miner.h')
-rw-r--r--src/miner.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/miner.h b/src/miner.h
index a9fea85304..8bfc1493db 100644
--- a/src/miner.h
+++ b/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