diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-07-01 18:38:23 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-07-01 18:38:48 +0200 |
| commit | 786ed114c2b4ff3c315476615b492ae7c7c9b51a (patch) | |
| tree | 5c8e0ff2ebbc89c965c4a5869332cae6b45489ea /src/rpcserver.cpp | |
| parent | Merge pull request #6354 (diff) | |
| parent | miner: rename UpdateRequestCount signal to ResetRequestCount (diff) | |
| download | discoin-786ed114c2b4ff3c315476615b492ae7c7c9b51a.tar.xz discoin-786ed114c2b4ff3c315476615b492ae7c7c9b51a.zip | |
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/rpcserver.cpp')
| -rw-r--r-- | src/rpcserver.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 2f2897158..840bf57c2 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -306,12 +306,10 @@ static const CRPCCommand vRPCCommands[] = { "mining", "prioritisetransaction", &prioritisetransaction, true }, { "mining", "submitblock", &submitblock, true }, -#ifdef ENABLE_WALLET /* Coin generation */ { "generating", "getgenerate", &getgenerate, true }, { "generating", "setgenerate", &setgenerate, true }, { "generating", "generate", &generate, true }, -#endif /* Raw transactions */ { "rawtransactions", "createrawtransaction", &createrawtransaction, true }, |