diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-03 16:20:30 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-03 16:20:58 +0200 |
| commit | 9d6060244429c4591e6ca62749f4f73cd981f247 (patch) | |
| tree | cab29a59fa4c190a4159fb651d244eeac36b4a13 /src/rpcmining.cpp | |
| parent | 9d67b100916e9f407b4de6648ad93b8535a270b3 (diff) | |
| parent | aa8c827968a68a3adc4df5f126635e37a71a7fbb (diff) | |
| download | bitcoin-9d6060244429c4591e6ca62749f4f73cd981f247.tar.xz | |
Merge pull request #5875
aa8c827 P2P regression test for new AcceptBlock behavior (Suhas Daftuar)
9be0e68 Be stricter in processing unrequested blocks (Suhas Daftuar)
Diffstat (limited to 'src/rpcmining.cpp')
| -rw-r--r-- | src/rpcmining.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index d58d438573..528d5406f4 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -164,7 +164,7 @@ Value generate(const Array& params, bool fHelp) ++pblock->nNonce; } CValidationState state; - if (!ProcessNewBlock(state, NULL, pblock)) + if (!ProcessNewBlock(state, NULL, pblock, true, NULL)) throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted"); ++nHeight; blockHashes.push_back(pblock->GetHash().GetHex()); @@ -650,7 +650,7 @@ Value submitblock(const Array& params, bool fHelp) CValidationState state; submitblock_StateCatcher sc(block.GetHash()); RegisterValidationInterface(&sc); - bool fAccepted = ProcessNewBlock(state, NULL, &block); + bool fAccepted = ProcessNewBlock(state, NULL, &block, true, NULL); UnregisterValidationInterface(&sc); if (fBlockPresent) { |