GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Regtest generate sends fees to wallet

Browse source
This commit is contained in:
instagibbs 2016-04-27 13:28:30 -04:00 • committed by Gregory Sanders
parent ef891a13a5
commit cc272afff1
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/rpc/mining.cpp
View file

@ -17,10 +17,12 @@
#include "net.h"
#include "pow.h"
#include "rpc/server.h"
#include "script/standard.h"
#include "txmempool.h"
#include "util.h"
#include "utilstrencodings.h"
#include "validationinterface.h"
#include "wallet/wallet.h"
#include <stdint.h>
@ -114,8 +116,25 @@ UniValue generate(const UniValue& params, bool fHelp)
LOCK(cs_main);
CScript coinbaseDest(Params().CoinbaseDestination());
if (coinbaseDest == CScript())
if (coinbaseDest == CScript()) {
coinbaseDest = CScript() << OP_TRUE;
#ifdef ENABLE_WALLET
LOCK2(cs_main, pwalletMain->cs_wallet);
if (!pwalletMain->IsLocked())
pwalletMain->TopUpKeyPool();
// Generate a new key that is added to wallet
CPubKey newKey;
if (!pwalletMain->GetKeyFromPool(newKey))
throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
CKeyID keyID = newKey.GetID();
pwalletMain->SetAddressBook(keyID, "", "receive");
coinbaseDest = GetScriptForDestination(CTxDestination(keyID));
#endif
}
UniValue arr(UniValue::VARR);
for (int i = 0; i < params[0].get_int(); i++) {