fix logic error with signing/checking blocks

peercoin · Apr 9, 2019 · 0dd5a72 · 0dd5a72
1 parent 775ee71
commit 0dd5a72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -731,7 +731,7 @@ UniValue submitblock(const JSONRPCRequest& request)
 
     // peercoin: sign block
     // rfc6: sign proof of stake blocks only after 0.8 fork
-    if ((block.IsProofOfStake() || IsBTC16BIPsEnabled(block.GetBlockTime())) && !SignBlock(block, *pwallet))
+    if ((block.IsProofOfStake() || !IsBTC16BIPsEnabled(block.GetBlockTime())) && !SignBlock(block, *pwallet))
         throw JSONRPCError(-100, "Unable to sign block, wallet locked?");
 
     {

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2933,7 +2933,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
     // peercoin: check block signature
     // Only check block signature if check merkle root, c.f. commit 3cd01fdf
     // rfc6: validate signatures of proof of stake blocks only after 0.8 fork
-    if (fCheckMerkleRoot && (block.IsProofOfStake() || IsBTC16BIPsEnabled(block.GetBlockTime())) && !CheckBlockSignature(block))
+    if (fCheckMerkleRoot && (block.IsProofOfStake() || !IsBTC16BIPsEnabled(block.GetBlockTime())) && !CheckBlockSignature(block))
         return state.DoS(100, false, REJECT_INVALID, "bad-blk-sign", false, strprintf("%s : bad block signature", __func__));
 
     return true;