From d6202b40848c6c450c3f5c054baac19733e8bafd Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 19 Oct 2016 14:32:09 -0300 Subject: [PATCH] test --- src/komodo.h | 5 +++-- src/rpcmisc.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index a19f79e58..2221b7da0 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -180,7 +180,7 @@ const char *Notaries[64][2] = int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,NOTARIZED_HEIGHT,Num_nutxos; std::string NOTARY_PUBKEY; -uint256 NOTARIZED_HASH; +uint256 NOTARIZED_HASH,NOTARIZED_BTCHASH; struct nutxo_entry { uint256 txhash; uint64_t voutmask; int32_t notaryid; }; struct nutxo_entry NUTXOS[10000]; @@ -220,10 +220,10 @@ int32_t komodo_notaryfind(uint8_t *pubkey) // change to ADD_HASH() { for (k=0; k<64; k++) { - printf("k.%d (%s) (%s)\n",k,Notaries[k][0],Notaries[k][1]); if ( Notaries[k][0] == 0 || Notaries[k][1] == 0 || Notaries[k][0][0] == 0 || Notaries[k][1][0] == 0 ) break; decode_hex(notarypubs[k],33,(char *)Notaries[k][1]); + printf("k.%d (%s) (%s) ",k,Notaries[k][0],Notaries[k][1]); for (i=0; i<33; i++) printf("%02x",notarypubs[k][i]); printf(" notarypubs.[%d]\n",k); @@ -297,6 +297,7 @@ int32_t komodo_voutupdate(int32_t notaryid,uint8_t *scriptbuf,int32_t scriptlen, { NOTARIZED_HEIGHT = *notarizedheightp; NOTARIZED_HASH = kmdtxid; + NOTARIZED_BTCHASH = btctxid; } } } diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index bcce67bf4..063ae0603 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -41,7 +41,7 @@ using namespace std; **/ Value getinfo(const Array& params, bool fHelp) { - extern uint256 NOTARIZED_HASH; + extern uint256 NOTARIZED_HASH,NOTARIZED_BTCHASH; extern int32_t NOTARIZED_HEIGHT; if (fHelp || params.size() != 0) throw runtime_error( @@ -85,6 +85,7 @@ Value getinfo(const Array& params, bool fHelp) obj.push_back(Pair("protocolversion", PROTOCOL_VERSION)); obj.push_back(Pair("notarized", NOTARIZED_HEIGHT)); obj.push_back(Pair("notarizedhash", NOTARIZED_HASH.ToString())); + obj.push_back(Pair("notarizedbtc", NOTARIZED_BTCHASH.ToString())); #ifdef ENABLE_WALLET if (pwalletMain) { obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));