From 57dd4adae0f46e069f4236ca37897d4e1510ca8b Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 17:50:05 +0300 Subject: [PATCH] Test --- src/komodo_bitcoind.h | 2 +- src/rpcmisc.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index b94f87260..72eac6305 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -371,8 +371,8 @@ int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heig { if ( (item= jobj(json,(char *)"result")) != 0 ) { - *kmdnotarized_heightp = jint(item,(char *)"notarized"); height = jint(item,(char *)"blocks"); + *kmdnotarized_heightp = strcmp(dest,"KMD") == 0 ? jint(item,(char *)"notarized") : height; } free_json(json); } diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index e23a0bf1a..9135cd812 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -102,8 +102,9 @@ Value getinfo(const Array& params, bool fHelp) if ( txid_height > 0 ) obj.push_back(Pair("notarizedtxid_height", txid_height)); else obj.push_back(Pair("notarizedtxid_height", "mempool")); - obj.push_back(Pair(ASSETCHAINS_SYMBOL[0] == 0 ? "BTCnotarized_height" :"KMDnotarized_height", kmdnotarized_height)); - obj.push_back(Pair("notarized_confirms", txid_height < kmdnotarized_height ? (kmdnotarized_height - txid_height) : 0)); + if ( ASSETCHAINS_SYMBOL[0] != 0 ) + obj.push_back(Pair("KMDnotarized_height", kmdnotarized_height)); + obj.push_back(Pair("notarized_confirms", txid_height < kmdnotarized_height ? (kmdnotarized_height - txid_height + 1) : 0)); #ifdef ENABLE_WALLET if (pwalletMain) { obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));