X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Frpcmining.cpp;h=a8022fc882f232ab26ad5012198d2a7a745c0a8f;hb=e139f822c0ce224199682781c91ca75a793bdc42;hp=103b933173d82824f12ce5315105d1bc64e386a6;hpb=dbb5ff777ee200bbe90cf72196bf7a842bf7665c;p=novacoin.git diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 103b933..a8022fc 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -204,8 +204,11 @@ Value getworkex(const Array& params, bool fHelp) pblock->hashMerkleRoot = pblock->BuildMerkleTree(); - if (!pblock->SignBlock(*pwalletMain)) - throw JSONRPCError(-100, "Unable to sign block, wallet locked?"); + if (!fTestNet && pblock->GetBlockTime() < CHAINCHECKS_SWITCH_TIME) + { + if (!pblock->SignBlock(*pwalletMain)) + throw JSONRPCError(-100, "Unable to sign block, wallet locked?"); + } return CheckWork(pblock, *pwalletMain, reservekey); } @@ -320,8 +323,11 @@ Value getwork(const Array& params, bool fHelp) pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second; pblock->hashMerkleRoot = pblock->BuildMerkleTree(); - if (!pblock->SignBlock(*pwalletMain)) - throw JSONRPCError(-100, "Unable to sign block, wallet locked?"); + if (!fTestNet && pblock->GetBlockTime() < CHAINCHECKS_SWITCH_TIME) + { + if (!pblock->SignBlock(*pwalletMain)) + throw JSONRPCError(-100, "Unable to sign block, wallet locked?"); + } return CheckWork(pblock, *pwalletMain, reservekey); } @@ -504,8 +510,11 @@ Value submitblock(const Array& params, bool fHelp) throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed"); } - if (!block.SignBlock(*pwalletMain)) - throw JSONRPCError(-100, "Unable to sign block, wallet locked?"); + if (!fTestNet && block.GetBlockTime() < CHAINCHECKS_SWITCH_TIME) + { + if (!block.SignBlock(*pwalletMain)) + throw JSONRPCError(-100, "Unable to sign block, wallet locked?"); + } bool fAccepted = ProcessBlock(NULL, &block); if (!fAccepted)