diff options
| author | Jeff Garzik <[email protected]> | 2013-08-24 00:33:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2013-08-24 00:33:46 -0400 |
| commit | 7e1701899534151972ddff3c08cc964a9db64bc5 (patch) | |
| tree | f8ec4db2675d980d98d0893046bc543c67efe09c /src/rpcmining.cpp | |
| parent | Merge pull request #2872 from Diapolo/GUI_wallet (diff) | |
| download | discoin-7e1701899534151972ddff3c08cc964a9db64bc5.tar.xz discoin-7e1701899534151972ddff3c08cc964a9db64bc5.zip | |
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/rpcmining.cpp')
| -rw-r--r-- | src/rpcmining.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 25111d378..8b562680a 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -149,7 +149,7 @@ Value getwork(const Array& params, bool fHelp) nStart = GetTime(); // Create new block - pblocktemplate = CreateNewBlock(*pMiningKey); + pblocktemplate = CreateNewBlockWithKey(*pMiningKey); if (!pblocktemplate) throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory"); vNewBlockTemplate.push_back(pblocktemplate); @@ -280,7 +280,7 @@ Value getblocktemplate(const Array& params, bool fHelp) delete pblocktemplate; pblocktemplate = NULL; } - pblocktemplate = CreateNewBlock(*pMiningKey); + pblocktemplate = CreateNewBlockWithKey(*pMiningKey); if (!pblocktemplate) throw JSONRPCError(RPC_OUT_OF_MEMORY, "Out of memory"); |