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 735d6b57e7 into merged_master (Bitcoin PR #16227)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 03:58:21 +00:00
commit a50b652932
38 changed files with 607 additions and 607 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rpc/mining.cpp
View file

@ -33,7 +33,7 @@
#include <warnings.h>
#include <block_proof.h> // CheckProof
#include <keystore.h> // combineblocksigs
#include <script/signingprovider.h> // combineblocksigs
#include <script/generic.hpp> // combineblocksigs
#include <blockencodings.h> // getcompactsketch
#include <policy/settings.h> // IsStandardTx
@ -1046,7 +1046,7 @@ UniValue combineblocksigs(const JSONRPCRequest& request)
const Consensus::Params& params = Params().GetConsensus();
const UniValue& sigs = request.params[1].get_array();
CBasicKeyStore keystore;
FillableSigningProvider keystore;
SignatureData sig_data;
SimpleSignatureCreator signature_creator(block.GetHash());
for (unsigned int i = 0; i < sigs.size(); i++) {