aboutsummaryrefslogtreecommitdiff
path: root/src/miner.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@bitpay.com>2013-08-24 00:33:46 -0400
committerJeff Garzik <jgarzik@bitpay.com>2013-08-24 00:33:46 -0400
commit7e1701899534151972ddff3c08cc964a9db64bc5 (patch)
treef8ec4db2675d980d98d0893046bc543c67efe09c /src/miner.h
parentb60012f2b6770105557db2af40dc34947e884330 (diff)
downloadbitcoin-7e1701899534151972ddff3c08cc964a9db64bc5.tar.xz
CreateNewBlock() now takes scriptPubKey argument,
rather than a key. CreateNewBlockWithKey() helper is added to restore existing functionality, making this an equivalent-transformation change.
Diffstat (limited to 'src/miner.h')
-rw-r--r--src/miner.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/miner.h b/src/miner.h
index 51d6a2e3ea..0bc76be104 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(CScript& scriptPubKeyIn);
+CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey);
/** Modify the extranonce in a block */
void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
/** Do mining precalculation */