diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-12-02 11:58:39 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-12-02 11:59:41 -0500 |
| commit | 1c7e09f0b9341c0ae7c00bf23baa407bbdc96a6e (patch) | |
| tree | 1ee0a668ea3b6d4faff25639014474675741ed19 /src/rpcserver.cpp | |
| parent | 90f7aa777865864d5cf7d1f12af8ef37d851faab (diff) | |
| parent | b2d0162ba48557c585822cabda41fe238420fabe (diff) | |
| download | bitcoin-1c7e09f0b9341c0ae7c00bf23baa407bbdc96a6e.tar.xz | |
Merge pull request #5369
b2d0162 Test resurrecting memory pool transactions during chain re-org (Gavin Andresen)
3dd8ed7 Delay writing block indexes in invalidate/reconsider (Pieter Wuille)
798faec Add 'invalidateblock' and 'reconsiderblock' RPC commands. (Pieter Wuille)
Diffstat (limited to 'src/rpcserver.cpp')
| -rw-r--r-- | src/rpcserver.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index 8512212185..90695611f2 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -269,6 +269,8 @@ static const CRPCCommand vRPCCommands[] = { "blockchain", "gettxout", &gettxout, true, false, false }, { "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true, false, false }, { "blockchain", "verifychain", &verifychain, true, false, false }, + { "blockchain", "invalidateblock", &invalidateblock, true, true, false }, + { "blockchain", "reconsiderblock", &reconsiderblock, true, true, false }, /* Mining */ { "mining", "getblocktemplate", &getblocktemplate, true, false, false }, |