diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-08-25 18:49:25 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-08-25 18:49:25 -0700 |
| commit | bb7d0fc12fcfbb2a91e39cb49f2a0873344dbae0 (patch) | |
| tree | 78ce02c824847489b87d7a76261f0b187c3f620e /src/miner.h | |
| parent | b62dc051aa44ee73e24b49dd9337de2434b89710 (diff) | |
| parent | f1dbed9233fb138026c646db0ac34e83ae2114f1 (diff) | |
| download | bitcoin-bb7d0fc12fcfbb2a91e39cb49f2a0873344dbae0.tar.xz | |
Merge pull request #2928 from jgarzik/cnb-txout
CreateNewBlock / getblocktemplate cleaning
Diffstat (limited to 'src/miner.h')
| -rw-r--r-- | src/miner.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/miner.h b/src/miner.h index 51d6a2e3ea..36d58be00f 100644 --- a/src/miner.h +++ b/src/miner.h @@ -11,7 +11,8 @@ /** Run the miner threads */ void GenerateBitcoins(bool fGenerate, CWallet* pwallet); /** Generate a new block, without valid proof-of-work */ -CBlockTemplate* CreateNewBlock(CReserveKey& reservekey); +CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn); +CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey); /** Modify the extranonce in a block */ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce); /** Do mining precalculation */ |