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-03 09:02:29 -03:00
parent de8d24ddc7
commit fa9f227180
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/miner.cpp
View File

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