diff options
| author | langerhans <[email protected]> | 2014-08-18 21:15:39 +0200 |
|---|---|---|
| committer | langerhans <[email protected]> | 2014-08-18 21:15:39 +0200 |
| commit | ad579037c8235032ba6a35f5720debc528a09511 (patch) | |
| tree | 798ef9ef859d955de3d765169ccc9e50add4a364 /src/main.cpp | |
| parent | Merge pull request #617 from rnicoll/1.8-dev-protocol (diff) | |
| parent | Correct AuxPoW coinbase script concatenation operators. (diff) | |
| download | discoin-ad579037c8235032ba6a35f5720debc528a09511.tar.xz discoin-ad579037c8235032ba6a35f5720debc528a09511.zip | |
Merge pull request #613 from rnicoll/1.8-dev-coinbase
Correct format of AuxPoW coinbase script
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index c806a80a3..bbc083cec 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1889,9 +1889,11 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C if (fEnforceBIP30) { for (unsigned int i = 0; i < block.vtx.size(); i++) { uint256 hash = block.GetTxHash(i); - if (view.HaveCoins(hash) && !view.GetCoins(hash).IsPruned()) - return state.DoS(100, error("ConnectBlock() : tried to overwrite transaction"), + if (view.HaveCoins(hash) && !view.GetCoins(hash).IsPruned()) { + std::string errorMsg = "ConnectBlock() : tried to overwrite transaction " + (hash.GetHex()); + return state.DoS(100, error(errorMsg.data()), REJECT_INVALID, "bad-txns-BIP30"); + } } } |