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

setpubkey fix

Browse Source
This commit is contained in:
blackjok3r
2019-02-19 10:16:31 +08:00
parent 986488d139
commit 8003443417
2 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/komodo.h
View File

@@ -878,7 +878,6 @@ int32_t komodo_connectblock(bool fJustCheck, CBlockIndex *pindex,CBlock& block)
break; break;
} }
// Notary pay chains need notarisation in position 1, ignore the rest on validation. Check notarisation is 1 on check. // Notary pay chains need notarisation in position 1, ignore the rest on validation. Check notarisation is 1 on check.
// make sure for first 3 notarizations, that we check all tx in block!
if ( !fJustCheck && i > 1 && ASSETCHAINS_NOTARY_PAY[0] != 0 ) if ( !fJustCheck && i > 1 && ASSETCHAINS_NOTARY_PAY[0] != 0 )
break; break;
txhash = block.vtx[i].GetHash(); txhash = block.vtx[i].GetHash();

66
src/wallet/rpcwallet.cpp
View File

@@ -5430,50 +5430,54 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
LOCK2(cs_main, pwalletMain ? &pwalletMain->cs_wallet : NULL); LOCK2(cs_main, pwalletMain ? &pwalletMain->cs_wallet : NULL);
char Raddress[18]; char Raddress[64];
uint8_t pubkey33[33]; uint8_t pubkey33[33];
if ( NOTARY_PUBKEY33[0] == 0 ) { if ( NOTARY_PUBKEY33[0] == 0 )
if (strlen(params[0].get_str().c_str()) == 66) { {
if (strlen(params[0].get_str().c_str()) == 66)
{
decode_hex(pubkey33,33,(char *)params[0].get_str().c_str()); decode_hex(pubkey33,33,(char *)params[0].get_str().c_str());
pubkey2addr((char *)Raddress,(uint8_t *)pubkey33); pubkey2addr((char *)Raddress,(uint8_t *)pubkey33);
if (strcmp("RRmWExvapDM9YbLT9X9xAyzDgxomYf63ng",Raddress) == 0) { CBitcoinAddress address(Raddress);
result.push_back(Pair("error", "pubkey entered is invalid.")); bool isValid = address.IsValid();
} else { if (isValid)
CBitcoinAddress address(Raddress); {
bool isValid = address.IsValid(); CTxDestination dest = address.Get();
if (isValid) isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : ISMINE_NO;
if ( mine == ISMINE_NO )
result.push_back(Pair("WARNING", "privkey for this pubkey is not imported to wallet!"));
else
{ {
CTxDestination dest = address.Get(); result.push_back(Pair("ismine", "true"));
isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : ISMINE_NO; std::string notaryname;
if ( mine == ISMINE_NO ) { if ( (IS_STAKED_NOTARY= StakedNotaryID(notaryname, Raddress)) > -1 )
result.push_back(Pair("WARNING", "privkey for this pubkey is not imported to wallet!")); {
} else { result.push_back(Pair("IsNotary", notaryname));
result.push_back(Pair("ismine", "true")); IS_KOMODO_NOTARY = 0;
std::string notaryname;
if ( (IS_STAKED_NOTARY= StakedNotaryID(notaryname, Raddress)) > -1 ) {
result.push_back(Pair("IsNotary", notaryname));
IS_KOMODO_NOTARY = 0;
}
} }
NOTARY_PUBKEY = params[0].get_str();
decode_hex(NOTARY_PUBKEY33,33,(char *)NOTARY_PUBKEY.c_str());
USE_EXTERNAL_PUBKEY = 1;
NOTARY_ADDRESS = address.ToString();
} else {
result.push_back(Pair("error", "pubkey entered is invalid."));
} }
NOTARY_PUBKEY = params[0].get_str();
decode_hex(NOTARY_PUBKEY33,33,(char *)NOTARY_PUBKEY.c_str());
USE_EXTERNAL_PUBKEY = 1;
NOTARY_ADDRESS = address.ToString();
} }
} else { else
result.push_back(Pair("error", "pubkey is wrong length, must be 66 char hex string.")); result.push_back(Pair("error", "pubkey entered is invalid."));
} }
} else { else
if ( NOTARY_ADDRESS.empty() ) { result.push_back(Pair("error", "pubkey is wrong length, must be 66 char hex string."));
}
else
{
if ( NOTARY_ADDRESS.empty() )
{
pubkey2addr((char *)Raddress,(uint8_t *)NOTARY_PUBKEY33); pubkey2addr((char *)Raddress,(uint8_t *)NOTARY_PUBKEY33);
NOTARY_ADDRESS.assign(Raddress); NOTARY_ADDRESS.assign(Raddress);
} }
result.push_back(Pair("error", "Can only set pubkey once, to change it you need to restart your daemon.")); result.push_back(Pair("error", "Can only set pubkey once, to change it you need to restart your daemon."));
} }
if ( NOTARY_PUBKEY33[0] != 0 && !NOTARY_ADDRESS.empty() ) { if ( NOTARY_PUBKEY33[0] != 0 && !NOTARY_ADDRESS.empty() )
{
result.push_back(Pair("address", NOTARY_ADDRESS)); result.push_back(Pair("address", NOTARY_ADDRESS));
result.push_back(Pair("pubkey", NOTARY_PUBKEY)); result.push_back(Pair("pubkey", NOTARY_PUBKEY));
} }