diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-06-06 18:50:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-06-06 18:51:00 +0200 |
| commit | 95d68c48d7ae45cb2a7303152816e9391cfbd0c9 (patch) | |
| tree | 0a25f1f328ca66177c79afcf4422ea99d221f981 /src/rpcserver.cpp | |
| parent | Merge pull request #4297 (diff) | |
| parent | estimatefee / estimatepriority RPC methods (diff) | |
| download | discoin-95d68c48d7ae45cb2a7303152816e9391cfbd0c9.tar.xz discoin-95d68c48d7ae45cb2a7303152816e9391cfbd0c9.zip | |
Merge pull request #3959
171ca77 estimatefee / estimatepriority RPC methods (Gavin Andresen)
0193fb8 Allow multiple regression tests to run at once (Gavin Andresen)
c6cb21d Type-safe CFeeRate class (Gavin Andresen)
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 2534a9dcf..72a7fe83e 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -268,6 +268,8 @@ static const CRPCCommand vRPCCommands[] = { "createmultisig", &createmultisig, true, true , false }, { "validateaddress", &validateaddress, true, false, false }, /* uses wallet if enabled */ { "verifymessage", &verifymessage, false, false, false }, + { "estimatefee", &estimatefee, true, true, false }, + { "estimatepriority", &estimatepriority, true, true, false }, #ifdef ENABLE_WALLET /* Wallet */ |