Merge branch 'libscottFIX' into fixgettransactioncrash

2018-11-03 20:58:06 +08:00
parent 0779df5d51 e955c22d23
commit 969689713d
46 changed files with 1779 additions and 1167 deletions
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -65,6 +65,7 @@ extern std::string NOTARY_PUBKEY; extern uint8_t NOTARY_PUBKEY33[];
 UniValue getinfo(const UniValue& params, bool fHelp)
 {
    uint256 notarized_hash,notarized_desttxid; int32_t prevMoMheight,notarized_height,longestchain,kmdnotarized_height,txid_height;
+    extern std::string NOTARY_PUBKEY; extern uint8_t NOTARY_PUBKEY33[];
    if (fHelp || params.size() != 0)
        throw runtime_error(
            "getinfo\n"