diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-01 18:38:23 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-01 18:38:48 +0200 |
| commit | 786ed114c2b4ff3c315476615b492ae7c7c9b51a (patch) | |
| tree | 5c8e0ff2ebbc89c965c4a5869332cae6b45489ea /src/miner.h | |
| parent | da77a6f7611f71443914e1c71df1e52468cf507d (diff) | |
| parent | a7b9623d189eb4a7d37ff7ad706d6385c3a38e80 (diff) | |
| download | bitcoin-786ed114c2b4ff3c315476615b492ae7c7c9b51a.tar.xz | |
Merge pull request #5994
a7b9623 miner: rename UpdateRequestCount signal to ResetRequestCount (Jonas Schnelli)
5496253 add CReserveScript to allow modular script keeping/returning (Jonas Schnelli)
087e65d fix GetScriptForMining() CReserveKey::keepKey() issue (Jonas Schnelli)
d0fc10a detach wallet from miner (Jonas Schnelli)
Diffstat (limited to 'src/miner.h')
| -rw-r--r-- | src/miner.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/miner.h b/src/miner.h index 96a6b70ecd..777a091967 100644 --- a/src/miner.h +++ b/src/miner.h @@ -11,6 +11,7 @@ #include <stdint.h> class CBlockIndex; +class CChainParams; class CReserveKey; class CScript; class CWallet; @@ -24,10 +25,9 @@ struct CBlockTemplate }; /** Run the miner threads */ -void GenerateBitcoins(bool fGenerate, CWallet* pwallet, int nThreads); +void GenerateBitcoins(bool fGenerate, int nThreads, const CChainParams& chainparams); /** Generate a new block, without valid proof-of-work */ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn); -CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey); /** Modify the extranonce in a block */ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce); void UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev); |