From fa9f2271804486d2be246e7decff15bdb1fca44b Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 3 Oct 2016 09:02:29 -0300 Subject: [PATCH] test --- src/miner.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index c049dc548..dd5595711 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -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 //