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

Merge ccaef6c28b into merged_master (Bitcoin PR #16908)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:33 +00:00
commit e25e16c65e
11 changed files with 47 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rpc/mining.cpp
View file

@ -1048,7 +1048,7 @@ UniValue getnewblockhex(const JSONRPCRequest& request)
CScript feeDestinationScript = Params().GetConsensus().mandatory_coinbase_destination;
if (feeDestinationScript == CScript()) feeDestinationScript = CScript() << OP_TRUE;
std::unique_ptr<CBlockTemplate> pblocktemplate(BlockAssembler(Params()).CreateNewBlock(feeDestinationScript, required_wait, &proposed));
std::unique_ptr<CBlockTemplate> pblocktemplate(BlockAssembler(Params()).CreateNewBlock(feeDestinationScript, std::chrono::seconds(required_wait), &proposed));
if (!pblocktemplate.get()) {
throw JSONRPCError(RPC_INTERNAL_ERROR, "Wallet keypool empty");
}