DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Test

Browse Source
This commit is contained in:
jl777
2017-03-26 13:35:37 +03:00
parent 9e1bde7e24
commit 1e2a41f6c1
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/komodo_bitcoind.h
View File

@@ -355,6 +355,7 @@ int32_t notarizedtxid_height(char *txidstr,int32_t *kmdnotarized_heightp)
{ {
if ( (jsonstr= komodo_issuemethod(KMDUSERPASS,(char *)"getinfo",params,7771)) != 0 ) if ( (jsonstr= komodo_issuemethod(KMDUSERPASS,(char *)"getinfo",params,7771)) != 0 )
{ {
printf("(%s)\n",jsonstr);
if ( (json= cJSON_Parse(jsonstr)) != 0 ) if ( (json= cJSON_Parse(jsonstr)) != 0 )
{ {
*kmdnotarized_heightp = jint(json,(char *)"notarized"); *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); sprintf(params,"[\"%s\", 1]",txidstr);
if ( (jsonstr= komodo_issuemethod(KMDUSERPASS,(char *)"getrawtransaction",params,7771)) != 0 ) if ( (jsonstr= komodo_issuemethod(KMDUSERPASS,(char *)"getrawtransaction",params,7771)) != 0 )
{ {
printf("(%s)\n",jsonstr);
if ( (json= cJSON_Parse(jsonstr)) != 0 ) if ( (json= cJSON_Parse(jsonstr)) != 0 )
{ {
txid_confirmations = jint(json,(char *)"confirmations"); txid_confirmations = jint(json,(char *)"confirmations");
printf("height.%d tconfs.%d\n",height,txid_confirmations);
if ( txid_confirmations > 0 && height > txid_confirmations ) if ( txid_confirmations > 0 && height > txid_confirmations )
txid_height = height - txid_confirmations; txid_height = height - txid_confirmations;
free_json(json); free_json(json);

12
src/rpcmisc.cpp
View File

@@ -139,11 +139,13 @@ Value getinfo(const Array& params, bool fHelp)
obj.push_back(Pair("errors", GetWarnings("statusbar"))); obj.push_back(Pair("errors", GetWarnings("statusbar")));
{ {
char pubkeystr[65]; int32_t notaryid; char pubkeystr[65]; int32_t notaryid;
notaryid = komodo_whoami(pubkeystr,(int32_t)chainActive.Tip()->nHeight); if ( (notaryid= komodo_whoami(pubkeystr,(int32_t)chainActive.Tip()->nHeight)) >= 0 )
obj.push_back(Pair("notaryid", notaryid)); {
obj.push_back(Pair("pubkey", pubkeystr)); obj.push_back(Pair("notaryid", notaryid));
if ( KOMODO_LASTMINED != 0 ) obj.push_back(Pair("pubkey", pubkeystr));
obj.push_back(Pair("lastmined", KOMODO_LASTMINED)); if ( KOMODO_LASTMINED != 0 )
obj.push_back(Pair("lastmined", KOMODO_LASTMINED));
}
} }
return obj; return obj;
} }