This commit is contained in:
jl777
2016-10-03 09:02:29 -03:00
parent de8d24ddc7
commit fa9f227180

View File

@@ -411,14 +411,12 @@ extern std::string NOTARY_PUBKEY;
CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey)
{
CPubKey pubkey; CScript scriptPubKey;
if ( IS_KOMODO_NOTARY == 0 )
{
if (!reservekey.GetReservedKey(pubkey))
return NULL;
scriptPubKey = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
}
else
if (!reservekey.GetReservedKey(pubkey))
return NULL;
scriptPubKey = CScript() << ToByteVector(pubkey) << OP_CHECKSIG;
if ( IS_KOMODO_NOTARY != 0 )
{
fprintf(stderr,"use notary pubkey\n");
scriptPubKey = CScript() << ParseHex(NOTARY_PUBKEY) << OP_CHECKSIG;
}
return CreateNewBlock(scriptPubKey);
@@ -497,7 +495,7 @@ void static BitcoinMiner(CWallet *pwallet)
} while (true);
fprintf(stderr,"Found peers\n");
}
//fprintf(stderr,"create new block\n");
fprintf(stderr,"create new block\n");
//
// Create new block
//