diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-23 13:32:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-23 13:33:13 +0200 |
| commit | 2a1090d4f55c307ddf50639cdedf329de1f5a02a (patch) | |
| tree | 5ffda2b4acac63c6ae9dad3785e7d0c312643eea /src/rpcblockchain.cpp | |
| parent | bf7c1958d1994c497387f8a2de678a06348f7874 (diff) | |
| parent | 65ef3723024881b7b21597bb784503094a323fb4 (diff) | |
Merge pull request #6351
65ef372 Add BIP65 to getblockchaininfo softforks list (Peter Todd)
cde7ab2 Add RPC tests for the CHECKLOCKTIMEVERIFY (BIP65) soft-fork (Peter Todd)
287f54f Add CHECKLOCKTIMEVERIFY (BIP65) soft-fork logic (Peter Todd)
Diffstat (limited to 'src/rpcblockchain.cpp')
| -rw-r--r-- | src/rpcblockchain.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 545ac12890..20c0c1fb2f 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -648,6 +648,7 @@ UniValue getblockchaininfo(const UniValue& params, bool fHelp) UniValue softforks(UniValue::VARR); softforks.push_back(SoftForkDesc("bip34", 2, tip, consensusParams)); softforks.push_back(SoftForkDesc("bip66", 3, tip, consensusParams)); + softforks.push_back(SoftForkDesc("bip65", 4, tip, consensusParams)); obj.push_back(Pair("softforks", softforks)); if (fPruneMode) |