From 715bda82cf8c710559432f72947ab68cbe1ee593 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 17:18:20 +0300 Subject: [PATCH 1/6] Test --- src/komodo_bitcoind.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index a3526bdcc..84b476b09 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -366,7 +366,7 @@ int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heig { if ( (jsonstr= komodo_issuemethod(userpass,(char *)"getinfo",params,port)) != 0 ) { - //printf("(%s)\n",jsonstr); + printf("(%s)\n",jsonstr); if ( (json= cJSON_Parse(jsonstr)) != 0 ) { if ( (item= jobj(json,(char *)"result")) != 0 ) @@ -381,7 +381,7 @@ int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heig sprintf(params,"[\"%s\", 1]",txidstr); if ( (jsonstr= komodo_issuemethod(userpass,(char *)"getrawtransaction",params,port)) != 0 ) { - //printf("(%s)\n",jsonstr); + printf("(%s)\n",jsonstr); if ( (json= cJSON_Parse(jsonstr)) != 0 ) { if ( (item= jobj(json,(char *)"result")) != 0 ) From 7ea5a37187894f2f56de97c438207d04b198ca11 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 17:22:49 +0300 Subject: [PATCH 2/6] Test --- src/rpcmisc.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 766ba125f..b6208ba47 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -52,8 +52,7 @@ int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heig Value getinfo(const Array& params, bool fHelp) { - uint256 notarized_hash,notarized_desttxid; - int32_t notarized_height,longestchain; + uint256 notarized_hash,notarized_desttxid; int32_t notarized_height,longestchain,kmdnotarized_height,txid_height; if (fHelp || params.size() != 0) throw runtime_error( "getinfo\n" @@ -99,14 +98,10 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("notarized", notarized_height)); obj.push_back(Pair("notarizedhash", notarized_hash.ToString())); obj.push_back(Pair("notarizedtxid", notarized_desttxid.ToString())); - if ( ASSETCHAINS_SYMBOL[0] != 0 ) - { - int32_t kmdnotarized_height,txid_height; - txid_height = notarizedtxid_height(ASSETCHAINS_SYMBOL[0] != 0 ? (char *)"KMD" : (char *)"BTC",(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", txid_height < kmdnotarized_height ? (kmdnotarized_height - txid_height) : 0)); - } + txid_height = notarizedtxid_height(ASSETCHAINS_SYMBOL[0] != 0 ? (char *)"KMD" : (char *)"BTC",(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", txid_height < kmdnotarized_height ? (kmdnotarized_height - txid_height) : 0)); #ifdef ENABLE_WALLET if (pwalletMain) { obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); From 66c5b6ae4d85ff5cde7b30746d0a4d346ee5a04d Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 17:31:57 +0300 Subject: [PATCH 3/6] Test --- src/komodo_bitcoind.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 84b476b09..ef75f8e2a 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -389,6 +389,7 @@ int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heig txid_confirmations = jint(item,(char *)"confirmations"); if ( txid_confirmations > 0 && height > txid_confirmations ) txid_height = height - txid_confirmations; + else txid_height = height+1; //printf("height.%d tconfs.%d txid_height.%d\n",height,txid_confirmations,txid_height); } free_json(json); From 70d8393432ba487d46e47cedcad37500a1e398b0 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 17:36:57 +0300 Subject: [PATCH 4/6] Test --- src/komodo_bitcoind.h | 4 ++-- src/rpcmisc.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index ef75f8e2a..9c212f50a 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -366,7 +366,7 @@ int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heig { if ( (jsonstr= komodo_issuemethod(userpass,(char *)"getinfo",params,port)) != 0 ) { - printf("(%s)\n",jsonstr); + //printf("(%s)\n",jsonstr); if ( (json= cJSON_Parse(jsonstr)) != 0 ) { if ( (item= jobj(json,(char *)"result")) != 0 ) @@ -381,7 +381,7 @@ int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heig sprintf(params,"[\"%s\", 1]",txidstr); if ( (jsonstr= komodo_issuemethod(userpass,(char *)"getrawtransaction",params,port)) != 0 ) { - printf("(%s)\n",jsonstr); + //printf("(%s)\n",jsonstr); if ( (json= cJSON_Parse(jsonstr)) != 0 ) { if ( (item= jobj(json,(char *)"result")) != 0 ) diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index b6208ba47..e23a0bf1a 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -99,8 +99,10 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("notarizedhash", notarized_hash.ToString())); obj.push_back(Pair("notarizedtxid", notarized_desttxid.ToString())); txid_height = notarizedtxid_height(ASSETCHAINS_SYMBOL[0] != 0 ? (char *)"KMD" : (char *)"BTC",(char *)notarized_desttxid.ToString().c_str(),&kmdnotarized_height); - obj.push_back(Pair("notarizedtxid_height", txid_height)); - obj.push_back(Pair("kmdnotarized_height", kmdnotarized_height)); + 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)); #ifdef ENABLE_WALLET if (pwalletMain) { From 198571952beb32b9a9648206d837f78196a5668e Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 17:42:34 +0300 Subject: [PATCH 5/6] Test --- src/komodo_bitcoind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 9c212f50a..b94f87260 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -389,7 +389,7 @@ int32_t notarizedtxid_height(char *dest,char *txidstr,int32_t *kmdnotarized_heig txid_confirmations = jint(item,(char *)"confirmations"); if ( txid_confirmations > 0 && height > txid_confirmations ) txid_height = height - txid_confirmations; - else txid_height = height+1; + else txid_height = height; //printf("height.%d tconfs.%d txid_height.%d\n",height,txid_confirmations,txid_height); } free_json(json); From 57dd4adae0f46e069f4236ca37897d4e1510ca8b Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Mar 2017 17:50:05 +0300 Subject: [PATCH 6/6] 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()));