From 43cc3df6572d135b3a196fac6f58882e10a76a3e Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 13:53:22 +0300 Subject: [PATCH] Test --- src/komodo_bitcoind.h | 4 ++-- src/komodo_utils.h | 2 +- src/rpcmisc.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index b6edcd2fa..e7d53313b 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -376,15 +376,15 @@ int32_t notarizedtxid_height(char *txidstr,int32_t *kmdnotarized_heightp) if ( (item= jobj(json,(char *)"result")) != 0 ) { txid_confirmations = jint(item,(char *)"confirmations"); - printf("height.%d tconfs.%d\n",height,txid_confirmations); if ( txid_confirmations > 0 && height > txid_confirmations ) txid_height = height - txid_confirmations; + printf("height.%d tconfs.%d txid_height.%d\n",height,txid_confirmations,txid_height); } free_json(json); } free(jsonstr); } - } else printf("no KMDUSERPASS\n"); + } return(txid_height); } diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 418eb7226..1131302df 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1355,7 +1355,7 @@ void komodo_configfile(char *symbol,uint16_t port) komodo_userpass(username,password,fp); sprintf(KMDUSERPASS,"%s:%s",username,password); fclose(fp); -printf("KOMODO.(%s) -> userpass.(%s)\n",fname,KMDUSERPASS); +//printf("KOMODO.(%s) -> userpass.(%s)\n",fname,KMDUSERPASS); } else printf("couldnt open.(%s)\n",fname); } diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 1d20e8f22..adbc27449 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -105,7 +105,7 @@ Value getinfo(const Array& params, bool fHelp) txid_height = notarizedtxid_height((char *)notarized_desttxid.ToString().c_str(),&kmdnotarized_height); obj.push_back(Pair("notarizedtxid_height", txid_height)); obj.push_back(Pair("kmdnotarized_height", kmdnotarized_height)); - obj.push_back(Pair("notarized_confirms", kmdnotarized_height)); + obj.push_back(Pair("notarized_confirms", kmdnotarized_height > txid_height ? (txid_height - txid_height) : 0)); } #ifdef ENABLE_WALLET if (pwalletMain) {