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
2016-10-19 14:32:09 -03:00
parent 21cc1d3e47
commit d6202b4084
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/komodo.h
View File

@@ -180,7 +180,7 @@ const char *Notaries[64][2] =
int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,NOTARIZED_HEIGHT,Num_nutxos; int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,NOTARIZED_HEIGHT,Num_nutxos;
std::string NOTARY_PUBKEY; 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 { uint256 txhash; uint64_t voutmask; int32_t notaryid; };
struct nutxo_entry NUTXOS[10000]; 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++) 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 ) if ( Notaries[k][0] == 0 || Notaries[k][1] == 0 || Notaries[k][0][0] == 0 || Notaries[k][1][0] == 0 )
break; break;
decode_hex(notarypubs[k],33,(char *)Notaries[k][1]); 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++) for (i=0; i<33; i++)
printf("%02x",notarypubs[k][i]); printf("%02x",notarypubs[k][i]);
printf(" notarypubs.[%d]\n",k); 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_HEIGHT = *notarizedheightp;
NOTARIZED_HASH = kmdtxid; NOTARIZED_HASH = kmdtxid;
NOTARIZED_BTCHASH = btctxid;
} }
} }
} }

3
src/rpcmisc.cpp
View File

@@ -41,7 +41,7 @@ using namespace std;
**/ **/
Value getinfo(const Array& params, bool fHelp) Value getinfo(const Array& params, bool fHelp)
{ {
extern uint256 NOTARIZED_HASH; extern uint256 NOTARIZED_HASH,NOTARIZED_BTCHASH;
extern int32_t NOTARIZED_HEIGHT; extern int32_t NOTARIZED_HEIGHT;
if (fHelp || params.size() != 0) if (fHelp || params.size() != 0)
throw runtime_error( 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("protocolversion", PROTOCOL_VERSION));
obj.push_back(Pair("notarized", NOTARIZED_HEIGHT)); obj.push_back(Pair("notarized", NOTARIZED_HEIGHT));
obj.push_back(Pair("notarizedhash", NOTARIZED_HASH.ToString())); obj.push_back(Pair("notarizedhash", NOTARIZED_HASH.ToString()));
obj.push_back(Pair("notarizedbtc", NOTARIZED_BTCHASH.ToString()));
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
if (pwalletMain) { if (pwalletMain) {
obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));