diff options
| author | Max K <[email protected]> | 2019-07-14 19:35:30 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-07-14 19:35:30 +0200 |
| commit | cee13699a5676355487f8eb2d91985f63438eae4 (patch) | |
| tree | cf12be6180f950a25ee2ee7f3f2126542835d6e3 /src/miner.h | |
| parent | Correct build and test net seed (diff) | |
| parent | Handle legacy v2 block at #66064 (diff) | |
| download | discoin-1.17-dev.tar.xz discoin-1.17-dev.zip | |
Merge pull request #1546 from rnicoll/1.17-auxpow1.17-dev
1.17 AuxPoW support
Diffstat (limited to 'src/miner.h')
| -rw-r--r-- | src/miner.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/miner.h b/src/miner.h index 8cdcf7133..a2d6b6b5f 100644 --- a/src/miner.h +++ b/src/miner.h @@ -132,10 +132,12 @@ private: // Configuration parameters for the block size bool fIncludeWitness; unsigned int nBlockMaxWeight; + bool fNeedSizeAccounting; CFeeRate blockMinFeeRate; // Information on the current status of the block uint64_t nBlockWeight; + uint64_t nBlockSize; uint64_t nBlockTx; uint64_t nBlockSigOpsCost; CAmount nFees; @@ -196,5 +198,6 @@ private: /** Modify the extranonce in a block */ void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned int& nExtraNonce); int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev); +bool ProcessBlockFound(const CBlock* pblock, const CChainParams& chainParams); #endif // BITCOIN_MINER_H |