Merge branch 'testmaster' into beta

2018-04-16 03:29:05 +03:00
parent 80d1414870 6107175727
commit a5f848c45a
10 changed files with 23 additions and 34 deletions
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -52,6 +52,7 @@ extern int32_t KOMODO_LASTMINED,JUMBLR_PAUSE;
 extern char ASSETCHAINS_SYMBOL[];
 int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heightp);
 #define KOMODO_VERSION "0.1.1"
+uint32_t komodo_chainactive_timestamp();

 UniValue getinfo(const UniValue& params, bool fHelp)
 {