GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 8f604361eb into merged_master (Bitcoin PR #16194)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:06 +00:00
commit 1e58aac3d1
8 changed files with 231 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/mining.cpp
View file

@ -1308,8 +1308,8 @@ UniValue testproposedblock(const JSONRPCRequest& request)
LOCK(cs_main);
uint256 hash = block.GetHash();
BlockMap::iterator mi = mapBlockIndex.find(hash);
if (mi != mapBlockIndex.end())
BlockMap::iterator mi = ::BlockIndex().find(hash);
if (mi != ::BlockIndex().end())
throw JSONRPCError(RPC_VERIFY_ERROR, "already have block");
CBlockIndex* const pindexPrev = ::ChainActive().Tip();