From 1e2a41f6c1b204792adc7efd876dc722acec97a8 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 13:35:37 +0300 Subject: [PATCH] Test --- src/komodo_bitcoind.h | 3 +++ src/rpcmisc.cpp | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 5fb9f223f..11e9e8823 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -355,6 +355,7 @@ int32_t notarizedtxid_height(char *txidstr,int32_t *kmdnotarized_heightp) { if ( (jsonstr= komodo_issuemethod(KMDUSERPASS,(char *)"getinfo",params,7771)) != 0 ) { + printf("(%s)\n",jsonstr); if ( (json= cJSON_Parse(jsonstr)) != 0 ) { *kmdnotarized_heightp = jint(json,(char *)"notarized"); @@ -366,9 +367,11 @@ int32_t notarizedtxid_height(char *txidstr,int32_t *kmdnotarized_heightp) sprintf(params,"[\"%s\", 1]",txidstr); if ( (jsonstr= komodo_issuemethod(KMDUSERPASS,(char *)"getrawtransaction",params,7771)) != 0 ) { + printf("(%s)\n",jsonstr); if ( (json= cJSON_Parse(jsonstr)) != 0 ) { txid_confirmations = jint(json,(char *)"confirmations"); + printf("height.%d tconfs.%d\n",height,txid_confirmations); if ( txid_confirmations > 0 && height > txid_confirmations ) txid_height = height - txid_confirmations; free_json(json); diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 40380d3cb..1d20e8f22 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -139,11 +139,13 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("errors", GetWarnings("statusbar"))); { char pubkeystr[65]; int32_t notaryid; - notaryid = komodo_whoami(pubkeystr,(int32_t)chainActive.Tip()->nHeight); - obj.push_back(Pair("notaryid", notaryid)); - obj.push_back(Pair("pubkey", pubkeystr)); - if ( KOMODO_LASTMINED != 0 ) - obj.push_back(Pair("lastmined", KOMODO_LASTMINED)); + if ( (notaryid= komodo_whoami(pubkeystr,(int32_t)chainActive.Tip()->nHeight)) >= 0 ) + { + obj.push_back(Pair("notaryid", notaryid)); + obj.push_back(Pair("pubkey", pubkeystr)); + if ( KOMODO_LASTMINED != 0 ) + obj.push_back(Pair("lastmined", KOMODO_LASTMINED)); + } } return obj; }