Skip to content

Commit

Permalink
remove other rpc references to pwalletMain
Browse files Browse the repository at this point in the history
  • Loading branch information
@PastaPastaPasta
PastaPastaPasta committed Jan 25, 2019
1 parent d7474fd commit f914746
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 30 deletions.
38 changes: 20 additions & 18 deletions src/wallet/rpcdump.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,8 @@ UniValue importwallet(const JSONRPCRequest& request)

UniValue importelectrumwallet(const JSONRPCRequest& request)
{
if (!EnsureWalletIsAvailable(request.fHelp))
CWallet* const pwallet = GetWalletForJSONRPCRequest(request);
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
return NullUniValue;

if (request.fHelp || request.params.size() < 1 || request.params.size() > 2)
Expand All @@ -555,9 +556,9 @@ UniValue importelectrumwallet(const JSONRPCRequest& request)
if (fPruneMode)
throw JSONRPCError(RPC_WALLET_ERROR, "Importing wallets is disabled in pruned mode");

LOCK2(cs_main, pwalletMain->cs_wallet);
LOCK2(cs_main, pwallet->cs_wallet);

EnsureWalletIsUnlocked();
EnsureWalletIsUnlocked(pwallet);

std::ifstream file;
std::string strFileName = request.params[0].get_str();
Expand All @@ -578,11 +579,11 @@ UniValue importelectrumwallet(const JSONRPCRequest& request)
int64_t nFilesize = std::max((int64_t)1, (int64_t)file.tellg());
file.seekg(0, file.beg);

pwalletMain->ShowProgress(_("Importing..."), 0); // show progress dialog in GUI
pwallet->ShowProgress(_("Importing..."), 0); // show progress dialog in GUI

if(strFileExt == "csv") {
while (file.good()) {
pwalletMain->ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100))));
pwallet->ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100))));
std::string line;
std::getline(file, line);
if (line.empty() || line == "address,private_key")
Expand All @@ -598,12 +599,12 @@ UniValue importelectrumwallet(const JSONRPCRequest& request)
CPubKey pubkey = key.GetPubKey();
assert(key.VerifyPubKey(pubkey));
CKeyID keyid = pubkey.GetID();
if (pwalletMain->HaveKey(keyid)) {
if (pwallet->HaveKey(keyid)) {
LogPrintf("Skipping import of %s (key already present)\n", CBitcoinAddress(keyid).ToString());
continue;
}
LogPrintf("Importing %s...\n", CBitcoinAddress(keyid).ToString());
if (!pwalletMain->AddKeyPubKey(key, pubkey)) {
if (!pwallet->AddKeyPubKey(key, pubkey)) {
fGood = false;
continue;
}
Expand All @@ -620,7 +621,7 @@ UniValue importelectrumwallet(const JSONRPCRequest& request)
std::vector<std::string> vKeys = data.getKeys();

for (size_t i = 0; i < data.size(); i++) {
pwalletMain->ShowProgress("", std::max(1, std::min(99, int(i*100/data.size()))));
pwallet->ShowProgress("", std::max(1, std::min(99, int(i*100/data.size()))));
if(!data[vKeys[i]].isStr())
continue;
CBitcoinSecret vchSecret;
Expand All @@ -630,19 +631,19 @@ UniValue importelectrumwallet(const JSONRPCRequest& request)
CPubKey pubkey = key.GetPubKey();
assert(key.VerifyPubKey(pubkey));
CKeyID keyid = pubkey.GetID();
if (pwalletMain->HaveKey(keyid)) {
if (pwallet->HaveKey(keyid)) {
LogPrintf("Skipping import of %s (key already present)\n", CBitcoinAddress(keyid).ToString());
continue;
}
LogPrintf("Importing %s...\n", CBitcoinAddress(keyid).ToString());
if (!pwalletMain->AddKeyPubKey(key, pubkey)) {
if (!pwallet->AddKeyPubKey(key, pubkey)) {
fGood = false;
continue;
}
}
}
file.close();
pwalletMain->ShowProgress("", 100); // hide progress dialog in GUI
pwallet->ShowProgress("", 100); // hide progress dialog in GUI

// Whether to perform rescan after import
int nStartHeight = 0;
Expand All @@ -653,10 +654,10 @@ UniValue importelectrumwallet(const JSONRPCRequest& request)

// Assume that electrum wallet was created at that block
int nTimeBegin = chainActive[nStartHeight]->GetBlockTime();
pwalletMain->UpdateTimeFirstKey(nTimeBegin);
pwallet->UpdateTimeFirstKey(nTimeBegin);

LogPrintf("Rescanning %i blocks\n", chainActive.Height() - nStartHeight + 1);
pwalletMain->ScanForWalletTransactions(chainActive[nStartHeight], true);
pwallet->ScanForWalletTransactions(chainActive[nStartHeight], true);

if (!fGood)
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding some keys to wallet");
Expand Down Expand Up @@ -706,6 +707,7 @@ UniValue dumpprivkey(const JSONRPCRequest& request)

UniValue dumphdinfo(const JSONRPCRequest& request)
{
CWallet* const pwallet = GetWalletForJSONRPCRequest(request);
if (!EnsureWalletIsAvailable(request.fHelp))
return NullUniValue;

Expand All @@ -724,15 +726,15 @@ UniValue dumphdinfo(const JSONRPCRequest& request)
+ HelpExampleRpc("dumphdinfo", "")
);

LOCK(pwalletMain->cs_wallet);
LOCK(pwallet->cs_wallet);

EnsureWalletIsUnlocked();
EnsureWalletIsUnlocked(pwallet);

CHDChain hdChainCurrent;
if (!pwalletMain->GetHDChain(hdChainCurrent))
if (!pwallet->GetHDChain(hdChainCurrent))
throw JSONRPCError(RPC_WALLET_ERROR, "This wallet is not a HD wallet.");

if (!pwalletMain->GetDecryptedHDChain(hdChainCurrent))
if (!pwallet->GetDecryptedHDChain(hdChainCurrent))
throw JSONRPCError(RPC_INTERNAL_ERROR, "Cannot decrypt HD seed");

SecureString ssMnemonic;
Expand Down Expand Up @@ -855,7 +857,7 @@ UniValue dumpwallet(const JSONRPCRequest& request)
if (pwallet->GetKey(keyid, key)) {
file << strprintf("%s %s ", CBitcoinSecret(key).ToString(), strTime);
if (pwallet->mapAddressBook.count(keyid)) {
file << strprintf("label=%s", EncodeDumpString(pwalletMain->mapAddressBook[keyid].name));
file << strprintf("label=%s", EncodeDumpString(pwallet->mapAddressBook[keyid].name));
} else if (setKeyPool.count(keyid)) {
file << "reserve=1";
} else {
Expand Down
26 changes: 14 additions & 12 deletions src/wallet/rpcwallet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,8 @@ UniValue sendtoaddress(const JSONRPCRequest& request)

UniValue instantsendtoaddress(const JSONRPCRequest& request)
{
if (!EnsureWalletIsAvailable(request.fHelp))
CWallet* const pwallet = GetWalletForJSONRPCRequest(request);
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
return NullUniValue;

if (request.fHelp || request.params.size() < 2 || request.params.size() > 5)
Expand All @@ -480,7 +481,7 @@ UniValue instantsendtoaddress(const JSONRPCRequest& request)
+ HelpExampleRpc("instantsendtoaddress", "\"XwnLY9Tf7Zsef8gMGL2fhWA9ZmMjt4KPwG\", 0.1, \"donation\", \"seans outpost\"")
);

LOCK2(cs_main, pwalletMain->cs_wallet);
LOCK2(cs_main, pwallet->cs_wallet);

CBitcoinAddress address(request.params[0].get_str());
if (!address.IsValid())
Expand All @@ -502,9 +503,9 @@ UniValue instantsendtoaddress(const JSONRPCRequest& request)
if (request.params.size() > 4)
fSubtractFeeFromAmount = request.params[4].get_bool();

EnsureWalletIsUnlocked();
EnsureWalletIsUnlocked(pwallet);

SendMoney(address.Get(), nAmount, fSubtractFeeFromAmount, wtx, true);
SendMoney(pwallet, address.Get(), nAmount, fSubtractFeeFromAmount, wtx, true);

return wtx.GetHash().GetHex();
}
Expand Down Expand Up @@ -564,7 +565,8 @@ UniValue listaddressgroupings(const JSONRPCRequest& request)

UniValue listaddressbalances(const JSONRPCRequest& request)
{
if (!EnsureWalletIsAvailable(request.fHelp))
CWallet* const pwallet = GetWalletForJSONRPCRequest(request);
if (!EnsureWalletIsAvailable(pwallet, request.fHelp))
return NullUniValue;

if (request.fHelp || request.params.size() > 1)
Expand All @@ -585,7 +587,7 @@ UniValue listaddressbalances(const JSONRPCRequest& request)
+ HelpExampleRpc("listaddressbalances", "10")
);

LOCK2(cs_main, pwalletMain->cs_wallet);
LOCK2(cs_main, pwallet->cs_wallet);

CAmount nMinAmount = 0;
if (request.params.size() > 0)
Expand All @@ -595,7 +597,7 @@ UniValue listaddressbalances(const JSONRPCRequest& request)
throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount");

UniValue jsonBalances(UniValue::VOBJ);
std::map<CTxDestination, CAmount> balances = pwalletMain->GetAddressBalances();
std::map<CTxDestination, CAmount> balances = pwallet->GetAddressBalances();
for (auto& balance : balances)
if (balance.second >= nMinAmount)
jsonBalances.push_back(Pair(CBitcoinAddress(balance.first).ToString(), ValueFromAmount(balance.second)));
Expand Down Expand Up @@ -1259,7 +1261,7 @@ UniValue ListReceived(CWallet * const pwallet, const UniValue& params, bool fByA
if (it == mapTally.end() && !fIncludeEmpty)
continue;

isminefilter mine = IsMine(*pwalletMain, address.Get());
isminefilter mine = IsMine(*pwallet, address.Get());
if(!(mine & filter))
continue;

Expand Down Expand Up @@ -2091,13 +2093,13 @@ UniValue walletpassphrase(const JSONRPCRequest& request)
if (request.params.size() >= 3)
fForMixingOnly = request.params[2].get_bool();

if (fForMixingOnly && !pwalletMain->IsLocked(true) && pwalletMain->IsLocked())
if (fForMixingOnly && !pwallet->IsLocked(true) && pwallet->IsLocked())
throw JSONRPCError(RPC_WALLET_ALREADY_UNLOCKED, "Error: Wallet is already unlocked for mixing only.");

if (!pwalletMain->IsLocked())
if (!pwallet->IsLocked())
throw JSONRPCError(RPC_WALLET_ALREADY_UNLOCKED, "Error: Wallet is already fully unlocked.");

if (!pwalletMain->Unlock(strWalletPass, fForMixingOnly))
if (!pwallet->Unlock(strWalletPass, fForMixingOnly))
throw JSONRPCError(RPC_WALLET_PASSPHRASE_INCORRECT, "Error: The wallet passphrase entered was incorrect.");

pwallet->TopUpKeyPool();
Expand Down Expand Up @@ -2778,7 +2780,7 @@ UniValue listunspent(const JSONRPCRequest& request)
entry.push_back(Pair("confirmations", out.nDepth));
entry.push_back(Pair("spendable", out.fSpendable));
entry.push_back(Pair("solvable", out.fSolvable));
entry.push_back(Pair("ps_rounds", pwalletMain->GetCappedOutpointPrivateSendRounds(COutPoint(out.tx->GetHash(), out.i))));
entry.push_back(Pair("ps_rounds", pwallet->GetCappedOutpointPrivateSendRounds(COutPoint(out.tx->GetHash(), out.i))));
results.push_back(entry);
}

Expand Down

0 comments on commit f914746

Please sign in to comment.