2010-08-29 18:58:15 +02:00
|
|
|
// Copyright (c) 2010 Satoshi Nakamoto
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#include "headers.h"
|
2010-11-23 20:16:36 +01:00
|
|
|
#include "cryptopp/sha.h"
|
2011-05-14 22:57:34 +02:00
|
|
|
#include "db.h"
|
2011-05-14 23:20:30 +02:00
|
|
|
#include "net.h"
|
2011-05-15 23:52:31 +02:00
|
|
|
#include "init.h"
|
2010-08-29 18:58:15 +02:00
|
|
|
#undef printf
|
|
|
|
#include <boost/asio.hpp>
|
2010-10-11 20:23:41 +02:00
|
|
|
#include <boost/iostreams/concepts.hpp>
|
|
|
|
#include <boost/iostreams/stream.hpp>
|
2011-05-16 05:45:35 +02:00
|
|
|
#include <boost/algorithm/string.hpp>
|
2010-10-11 20:23:41 +02:00
|
|
|
#ifdef USE_SSL
|
|
|
|
#include <boost/asio/ssl.hpp>
|
2011-06-20 00:12:31 +02:00
|
|
|
#include <boost/filesystem.hpp>
|
2011-05-16 05:45:35 +02:00
|
|
|
#include <boost/filesystem/fstream.hpp>
|
2010-10-11 20:23:41 +02:00
|
|
|
typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream;
|
|
|
|
#endif
|
2010-08-29 18:58:15 +02:00
|
|
|
#include "json/json_spirit_reader_template.h"
|
|
|
|
#include "json/json_spirit_writer_template.h"
|
|
|
|
#include "json/json_spirit_utils.h"
|
|
|
|
#define printf OutputDebugStringF
|
|
|
|
// MinGW 3.4.5 gets "fatal error: had to relocate PCH" if the json headers are
|
|
|
|
// precompiled in headers.h. The problem might be when the pch file goes over
|
|
|
|
// a certain size around 145MB. If we need access to json_spirit outside this
|
|
|
|
// file, we could use the compiled json_spirit option.
|
|
|
|
|
2011-05-15 09:11:04 +02:00
|
|
|
using namespace std;
|
|
|
|
using namespace boost;
|
2010-10-11 20:23:41 +02:00
|
|
|
using namespace boost::asio;
|
2010-08-29 18:58:15 +02:00
|
|
|
using namespace json_spirit;
|
|
|
|
|
|
|
|
void ThreadRPCServer2(void* parg);
|
|
|
|
typedef Value(*rpcfn_type)(const Array& params, bool fHelp);
|
|
|
|
extern map<string, rpcfn_type> mapCallTable;
|
|
|
|
|
2011-06-29 00:47:41 +02:00
|
|
|
static int64 nWalletUnlockTime;
|
|
|
|
static CCriticalSection cs_nWalletUnlockTime;
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2010-09-06 23:03:04 +02:00
|
|
|
Object JSONRPCError(int code, const string& message)
|
|
|
|
{
|
|
|
|
Object error;
|
|
|
|
error.push_back(Pair("code", code));
|
|
|
|
error.push_back(Pair("message", message));
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
void PrintConsole(const char* format, ...)
|
|
|
|
{
|
|
|
|
char buffer[50000];
|
|
|
|
int limit = sizeof(buffer);
|
|
|
|
va_list arg_ptr;
|
|
|
|
va_start(arg_ptr, format);
|
|
|
|
int ret = _vsnprintf(buffer, limit, format, arg_ptr);
|
|
|
|
va_end(arg_ptr);
|
|
|
|
if (ret < 0 || ret >= limit)
|
|
|
|
{
|
|
|
|
ret = limit - 1;
|
|
|
|
buffer[limit-1] = 0;
|
|
|
|
}
|
2010-11-23 20:16:36 +01:00
|
|
|
printf("%s", buffer);
|
2010-08-29 18:58:15 +02:00
|
|
|
#if defined(__WXMSW__) && defined(GUI)
|
|
|
|
MyMessageBox(buffer, "Bitcoin", wxOK | wxICON_EXCLAMATION);
|
|
|
|
#else
|
|
|
|
fprintf(stdout, "%s", buffer);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
int64 AmountFromValue(const Value& value)
|
|
|
|
{
|
|
|
|
double dAmount = value.get_real();
|
|
|
|
if (dAmount <= 0.0 || dAmount > 21000000.0)
|
|
|
|
throw JSONRPCError(-3, "Invalid amount");
|
2011-02-23 20:41:19 +01:00
|
|
|
int64 nAmount = roundint64(dAmount * COIN);
|
2010-11-22 16:53:20 +01:00
|
|
|
if (!MoneyRange(nAmount))
|
|
|
|
throw JSONRPCError(-3, "Invalid amount");
|
|
|
|
return nAmount;
|
|
|
|
}
|
|
|
|
|
2010-11-30 19:58:11 +01:00
|
|
|
Value ValueFromAmount(int64 amount)
|
|
|
|
{
|
|
|
|
return (double)amount / (double)COIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
void WalletTxToJSON(const CWalletTx& wtx, Object& entry)
|
|
|
|
{
|
|
|
|
entry.push_back(Pair("confirmations", wtx.GetDepthInMainChain()));
|
|
|
|
entry.push_back(Pair("txid", wtx.GetHash().GetHex()));
|
2010-12-17 21:16:27 +01:00
|
|
|
entry.push_back(Pair("time", (boost::int64_t)wtx.GetTxTime()));
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(string,string)& item, wtx.mapValue)
|
2010-11-30 19:58:11 +01:00
|
|
|
entry.push_back(Pair(item.first, item.second));
|
|
|
|
}
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
string AccountFromValue(const Value& value)
|
|
|
|
{
|
|
|
|
string strAccount = value.get_str();
|
|
|
|
if (strAccount == "*")
|
|
|
|
throw JSONRPCError(-11, "Invalid account name");
|
|
|
|
return strAccount;
|
|
|
|
}
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
///
|
|
|
|
/// Note: This interface may still be subject to change.
|
|
|
|
///
|
|
|
|
|
|
|
|
|
|
|
|
Value help(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() > 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"help [command]\n"
|
|
|
|
"List commands, or get help for a command.");
|
|
|
|
|
|
|
|
string strCommand;
|
|
|
|
if (params.size() > 0)
|
|
|
|
strCommand = params[0].get_str();
|
|
|
|
|
|
|
|
string strRet;
|
|
|
|
set<rpcfn_type> setDone;
|
|
|
|
for (map<string, rpcfn_type>::iterator mi = mapCallTable.begin(); mi != mapCallTable.end(); ++mi)
|
|
|
|
{
|
|
|
|
string strMethod = (*mi).first;
|
|
|
|
// We already filter duplicates, but these deprecated screw up the sort order
|
|
|
|
if (strMethod == "getamountreceived" ||
|
2010-11-22 16:53:20 +01:00
|
|
|
strMethod == "getallreceived" ||
|
|
|
|
(strMethod.find("label") != string::npos))
|
2010-08-29 18:58:15 +02:00
|
|
|
continue;
|
|
|
|
if (strCommand != "" && strMethod != strCommand)
|
|
|
|
continue;
|
|
|
|
try
|
|
|
|
{
|
|
|
|
Array params;
|
|
|
|
rpcfn_type pfn = (*mi).second;
|
|
|
|
if (setDone.insert(pfn).second)
|
|
|
|
(*pfn)(params, true);
|
|
|
|
}
|
|
|
|
catch (std::exception& e)
|
|
|
|
{
|
|
|
|
// Help text is returned in an exception
|
|
|
|
string strHelp = string(e.what());
|
|
|
|
if (strCommand == "")
|
|
|
|
if (strHelp.find('\n') != -1)
|
|
|
|
strHelp = strHelp.substr(0, strHelp.find('\n'));
|
|
|
|
strRet += strHelp + "\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (strRet == "")
|
|
|
|
strRet = strprintf("help: unknown command: %s\n", strCommand.c_str());
|
|
|
|
strRet = strRet.substr(0,strRet.size()-1);
|
|
|
|
return strRet;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value stop(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 0)
|
|
|
|
throw runtime_error(
|
|
|
|
"stop\n"
|
|
|
|
"Stop bitcoin server.");
|
|
|
|
|
|
|
|
// Shutdown will take long enough that the response should get back
|
|
|
|
CreateThread(Shutdown, NULL);
|
|
|
|
return "bitcoin server stopping";
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getblockcount(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 0)
|
|
|
|
throw runtime_error(
|
|
|
|
"getblockcount\n"
|
|
|
|
"Returns the number of blocks in the longest block chain.");
|
|
|
|
|
|
|
|
return nBestHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getblocknumber(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 0)
|
|
|
|
throw runtime_error(
|
|
|
|
"getblocknumber\n"
|
|
|
|
"Returns the block number of the latest block in the longest block chain.");
|
|
|
|
|
|
|
|
return nBestHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getconnectioncount(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 0)
|
|
|
|
throw runtime_error(
|
|
|
|
"getconnectioncount\n"
|
|
|
|
"Returns the number of connections to other nodes.");
|
|
|
|
|
|
|
|
return (int)vNodes.size();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
double GetDifficulty()
|
|
|
|
{
|
|
|
|
// Floating point number that is a multiple of the minimum difficulty,
|
|
|
|
// minimum difficulty = 1.0.
|
2011-05-26 23:35:00 +02:00
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
if (pindexBest == NULL)
|
|
|
|
return 1.0;
|
2011-05-26 23:35:00 +02:00
|
|
|
int nShift = (pindexBest->nBits >> 24) & 0xff;
|
|
|
|
|
|
|
|
double dDiff =
|
|
|
|
(double)0x0000ffff / (double)(pindexBest->nBits & 0x00ffffff);
|
|
|
|
|
|
|
|
while (nShift < 29)
|
|
|
|
{
|
|
|
|
dDiff *= 256.0;
|
|
|
|
nShift++;
|
|
|
|
}
|
|
|
|
while (nShift > 29)
|
|
|
|
{
|
|
|
|
dDiff /= 256.0;
|
|
|
|
nShift--;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dDiff;
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Value getdifficulty(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 0)
|
|
|
|
throw runtime_error(
|
|
|
|
"getdifficulty\n"
|
|
|
|
"Returns the proof-of-work difficulty as a multiple of the minimum difficulty.");
|
|
|
|
|
|
|
|
return GetDifficulty();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getgenerate(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 0)
|
|
|
|
throw runtime_error(
|
|
|
|
"getgenerate\n"
|
|
|
|
"Returns true or false.");
|
|
|
|
|
|
|
|
return (bool)fGenerateBitcoins;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value setgenerate(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() < 1 || params.size() > 2)
|
|
|
|
throw runtime_error(
|
|
|
|
"setgenerate <generate> [genproclimit]\n"
|
|
|
|
"<generate> is true or false to turn generation on or off.\n"
|
|
|
|
"Generation is limited to [genproclimit] processors, -1 is unlimited.");
|
|
|
|
|
|
|
|
bool fGenerate = true;
|
|
|
|
if (params.size() > 0)
|
|
|
|
fGenerate = params[0].get_bool();
|
|
|
|
|
|
|
|
if (params.size() > 1)
|
|
|
|
{
|
|
|
|
int nGenProcLimit = params[1].get_int();
|
|
|
|
fLimitProcessors = (nGenProcLimit != -1);
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
WriteSetting("fLimitProcessors", fLimitProcessors);
|
2010-08-29 18:58:15 +02:00
|
|
|
if (nGenProcLimit != -1)
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
WriteSetting("nLimitProcessors", nLimitProcessors = nGenProcLimit);
|
2010-12-16 19:17:26 +01:00
|
|
|
if (nGenProcLimit == 0)
|
|
|
|
fGenerate = false;
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
GenerateBitcoins(fGenerate, pwalletMain);
|
2010-08-29 18:58:15 +02:00
|
|
|
return Value::null;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value gethashespersec(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 0)
|
|
|
|
throw runtime_error(
|
|
|
|
"gethashespersec\n"
|
|
|
|
"Returns a recent hashes per second performance measurement while generating.");
|
|
|
|
|
|
|
|
if (GetTimeMillis() - nHPSTimerStart > 8000)
|
|
|
|
return (boost::int64_t)0;
|
|
|
|
return (boost::int64_t)dHashesPerSec;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getinfo(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 0)
|
|
|
|
throw runtime_error(
|
|
|
|
"getinfo\n"
|
|
|
|
"Returns an object containing various state info.");
|
|
|
|
|
|
|
|
Object obj;
|
|
|
|
obj.push_back(Pair("version", (int)VERSION));
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
|
2010-08-29 18:58:15 +02:00
|
|
|
obj.push_back(Pair("blocks", (int)nBestHeight));
|
|
|
|
obj.push_back(Pair("connections", (int)vNodes.size()));
|
|
|
|
obj.push_back(Pair("proxy", (fUseProxy ? addrProxy.ToStringIPPort() : string())));
|
|
|
|
obj.push_back(Pair("generate", (bool)fGenerateBitcoins));
|
|
|
|
obj.push_back(Pair("genproclimit", (int)(fLimitProcessors ? nLimitProcessors : -1)));
|
|
|
|
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
|
|
|
|
obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
|
2010-10-22 17:15:20 +02:00
|
|
|
obj.push_back(Pair("testnet", fTestNet));
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime()));
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
obj.push_back(Pair("keypoolsize", pwalletMain->GetKeyPoolSize()));
|
2011-02-23 20:24:16 +01:00
|
|
|
obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee)));
|
2011-06-29 00:47:41 +02:00
|
|
|
if (pwalletMain->IsCrypted())
|
|
|
|
obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime));
|
2010-08-29 18:58:15 +02:00
|
|
|
obj.push_back(Pair("errors", GetWarnings("statusbar")));
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getnewaddress(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() > 1)
|
|
|
|
throw runtime_error(
|
2010-11-22 16:53:20 +01:00
|
|
|
"getnewaddress [account]\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
"Returns a new bitcoin address for receiving payments. "
|
2010-11-22 16:53:20 +01:00
|
|
|
"If [account] is specified (recommended), it is added to the address book "
|
|
|
|
"so payments received with the address will be credited to [account].");
|
2010-08-29 18:58:15 +02:00
|
|
|
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
if (!pwalletMain->IsLocked())
|
|
|
|
pwalletMain->TopUpKeyPool();
|
|
|
|
|
|
|
|
if (pwalletMain->GetKeyPoolSize() < 1)
|
|
|
|
throw JSONRPCError(-12, "Error: Keypool ran out, please call keypoolrefill first");
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
// Parse the account first so we don't generate a key if there's an error
|
|
|
|
string strAccount;
|
2010-08-29 18:58:15 +02:00
|
|
|
if (params.size() > 0)
|
2010-12-16 02:06:03 +01:00
|
|
|
strAccount = AccountFromValue(params[0]);
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
// Generate a new key that is added to wallet
|
2011-07-05 20:53:43 +02:00
|
|
|
string strAddress = CBitcoinAddress(pwalletMain->GetOrReuseKeyFromPool()).ToString();
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2011-06-27 23:22:30 +02:00
|
|
|
// This could be done in the same main CS as GetKeyFromKeyPool.
|
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
|
|
|
pwalletMain->SetAddressBookName(strAddress, strAccount);
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
return strAddress;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-06-27 23:22:30 +02:00
|
|
|
// requires cs_main, cs_mapWallet, cs_mapAddressBook locks
|
2011-07-05 20:53:43 +02:00
|
|
|
CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false)
|
2010-11-22 16:53:20 +01:00
|
|
|
{
|
2011-01-14 02:04:56 +01:00
|
|
|
string strAddress;
|
2010-11-22 16:53:20 +01:00
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CWalletDB walletdb(pwalletMain->strWalletFile);
|
2010-11-22 16:53:20 +01:00
|
|
|
|
2011-04-05 04:24:35 +02:00
|
|
|
CAccount account;
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2011-04-05 04:24:35 +02:00
|
|
|
{
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
walletdb.ReadAccount(strAccount, account);
|
|
|
|
|
|
|
|
bool bKeyUsed = false;
|
|
|
|
|
|
|
|
// Check if the current key has been used
|
|
|
|
if (!account.vchPubKey.empty())
|
2010-11-22 16:53:20 +01:00
|
|
|
{
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
CScript scriptPubKey;
|
|
|
|
scriptPubKey.SetBitcoinAddress(account.vchPubKey);
|
|
|
|
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin();
|
|
|
|
it != pwalletMain->mapWallet.end() && !account.vchPubKey.empty();
|
|
|
|
++it)
|
|
|
|
{
|
|
|
|
const CWalletTx& wtx = (*it).second;
|
|
|
|
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
|
|
|
|
if (txout.scriptPubKey == scriptPubKey)
|
|
|
|
bKeyUsed = true;
|
|
|
|
}
|
2010-11-22 16:53:20 +01:00
|
|
|
}
|
|
|
|
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
// Generate a new key
|
|
|
|
if (account.vchPubKey.empty() || bForceNew || bKeyUsed)
|
|
|
|
{
|
|
|
|
if (pwalletMain->GetKeyPoolSize() < 1)
|
|
|
|
{
|
|
|
|
if (bKeyUsed || bForceNew)
|
|
|
|
throw JSONRPCError(-12, "Error: Keypool ran out, please call topupkeypool first");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
account.vchPubKey = pwalletMain->GetOrReuseKeyFromPool();
|
2011-07-05 20:53:43 +02:00
|
|
|
string strAddress = CBitcoinAddress(account.vchPubKey).ToString();
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
pwalletMain->SetAddressBookName(strAddress, strAccount);
|
|
|
|
walletdb.WriteAccount(strAccount, account);
|
|
|
|
}
|
|
|
|
}
|
2010-11-22 16:53:20 +01:00
|
|
|
}
|
2011-04-05 04:24:35 +02:00
|
|
|
|
2011-07-05 20:53:43 +02:00
|
|
|
return CBitcoinAddress(account.vchPubKey);
|
2011-01-14 02:04:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
Value getaccountaddress(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"getaccountaddress <account>\n"
|
|
|
|
"Returns the current bitcoin address for receiving payments to this account.");
|
|
|
|
|
|
|
|
// Parse the account first so we don't generate a key if there's an error
|
|
|
|
string strAccount = AccountFromValue(params[0]);
|
|
|
|
|
2011-04-05 04:24:35 +02:00
|
|
|
Value ret;
|
|
|
|
|
|
|
|
CRITICAL_BLOCK(cs_main)
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
2011-06-27 23:22:30 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2011-04-05 04:24:35 +02:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
ret = GetAccountAddress(strAccount).ToString();
|
2011-04-05 04:24:35 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
2010-11-22 16:53:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-01-14 02:04:56 +01:00
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
Value setaccount(const Array& params, bool fHelp)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
if (fHelp || params.size() < 1 || params.size() > 2)
|
|
|
|
throw runtime_error(
|
2010-11-22 16:53:20 +01:00
|
|
|
"setaccount <bitcoinaddress> <account>\n"
|
|
|
|
"Sets the account associated with the given address.");
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
string strAddress = params[0].get_str();
|
2011-07-05 20:53:43 +02:00
|
|
|
CBitcoinAddress address(strAddress);
|
|
|
|
if (!address.IsValid())
|
2011-03-05 16:45:56 +01:00
|
|
|
throw JSONRPCError(-5, "Invalid bitcoin address");
|
2011-03-05 15:32:32 +01:00
|
|
|
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
string strAccount;
|
2010-08-29 18:58:15 +02:00
|
|
|
if (params.size() > 1)
|
2010-12-16 02:06:03 +01:00
|
|
|
strAccount = AccountFromValue(params[1]);
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2011-01-14 02:04:56 +01:00
|
|
|
// Detect when changing the account of an address that is the 'unused current key' of another account:
|
2011-04-05 04:24:35 +02:00
|
|
|
CRITICAL_BLOCK(cs_main)
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2011-01-14 02:04:56 +01:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
if (pwalletMain->mapAddressBook.count(address))
|
2011-01-14 02:04:56 +01:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
string strOldAccount = pwalletMain->mapAddressBook[address];
|
|
|
|
if (address == GetAccountAddress(strOldAccount))
|
2011-01-14 02:04:56 +01:00
|
|
|
GetAccountAddress(strOldAccount, true);
|
|
|
|
}
|
2011-06-27 23:22:30 +02:00
|
|
|
|
|
|
|
pwalletMain->SetAddressBookName(strAddress, strAccount);
|
2011-01-14 02:04:56 +01:00
|
|
|
}
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
return Value::null;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
Value getaccount(const Array& params, bool fHelp)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 1)
|
|
|
|
throw runtime_error(
|
2010-11-22 16:53:20 +01:00
|
|
|
"getaccount <bitcoinaddress>\n"
|
|
|
|
"Returns the account associated with the given address.");
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
string strAddress = params[0].get_str();
|
2011-07-05 20:53:43 +02:00
|
|
|
CBitcoinAddress address(strAddress);
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
string strAccount;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
map<CBitcoinAddress, string>::iterator mi = pwalletMain->mapAddressBook.find(address);
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
if (mi != pwalletMain->mapAddressBook.end() && !(*mi).second.empty())
|
2010-11-22 16:53:20 +01:00
|
|
|
strAccount = (*mi).second;
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
2010-11-22 16:53:20 +01:00
|
|
|
return strAccount;
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
Value getaddressesbyaccount(const Array& params, bool fHelp)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 1)
|
|
|
|
throw runtime_error(
|
2010-11-22 16:53:20 +01:00
|
|
|
"getaddressesbyaccount <account>\n"
|
|
|
|
"Returns the list of addresses for the given account.");
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
string strAccount = AccountFromValue(params[0]);
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
// Find all addresses that have the given account
|
2010-08-29 18:58:15 +02:00
|
|
|
Array ret;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, string)& item, pwalletMain->mapAddressBook)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
const CBitcoinAddress& address = item.first;
|
2010-08-29 18:58:15 +02:00
|
|
|
const string& strName = item.second;
|
2010-11-22 16:53:20 +01:00
|
|
|
if (strName == strAccount)
|
2011-07-05 20:53:43 +02:00
|
|
|
ret.push_back(address.ToString());
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-05-09 20:35:30 +02:00
|
|
|
Value settxfee(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() < 1 || params.size() > 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"settxfee <amount>\n"
|
|
|
|
"<amount> is a real and is rounded to the nearest 0.00000001");
|
|
|
|
|
|
|
|
// Amount
|
|
|
|
int64 nAmount = 0;
|
|
|
|
if (params[0].get_real() != 0.0)
|
|
|
|
nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts
|
|
|
|
|
|
|
|
nTransactionFee = nAmount;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
Value sendtoaddress(const Array& params, bool fHelp)
|
|
|
|
{
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
if (pwalletMain->IsCrypted() && (fHelp || params.size() < 2 || params.size() > 4))
|
|
|
|
throw runtime_error(
|
|
|
|
"sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
|
|
|
|
"<amount> is a real and is rounded to the nearest 0.00000001\n"
|
|
|
|
"requires wallet passphrase to be set with walletpassphrase first");
|
|
|
|
if (!pwalletMain->IsCrypted() && (fHelp || params.size() < 2 || params.size() > 4))
|
2010-08-29 18:58:15 +02:00
|
|
|
throw runtime_error(
|
|
|
|
"sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
|
2011-05-09 20:26:41 +02:00
|
|
|
"<amount> is a real and is rounded to the nearest 0.00000001");
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
string strAddress = params[0].get_str();
|
|
|
|
|
|
|
|
// Amount
|
2010-11-22 16:53:20 +01:00
|
|
|
int64 nAmount = AmountFromValue(params[1]);
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
// Wallet comments
|
|
|
|
CWalletTx wtx;
|
|
|
|
if (params.size() > 2 && params[2].type() != null_type && !params[2].get_str().empty())
|
2010-12-16 02:06:03 +01:00
|
|
|
wtx.mapValue["comment"] = params[2].get_str();
|
2010-08-29 18:58:15 +02:00
|
|
|
if (params.size() > 3 && params[3].type() != null_type && !params[3].get_str().empty())
|
|
|
|
wtx.mapValue["to"] = params[3].get_str();
|
|
|
|
|
2011-04-05 04:24:35 +02:00
|
|
|
CRITICAL_BLOCK(cs_main)
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_vMasterKey)
|
2011-04-05 04:24:35 +02:00
|
|
|
{
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
if(pwalletMain->IsLocked())
|
|
|
|
throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect.");
|
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
string strError = pwalletMain->SendMoneyToBitcoinAddress(strAddress, nAmount, wtx);
|
2011-04-05 04:24:35 +02:00
|
|
|
if (strError != "")
|
|
|
|
throw JSONRPCError(-4, strError);
|
|
|
|
}
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
return wtx.GetHash().GetHex();
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getreceivedbyaddress(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() < 1 || params.size() > 2)
|
|
|
|
throw runtime_error(
|
|
|
|
"getreceivedbyaddress <bitcoinaddress> [minconf=1]\n"
|
|
|
|
"Returns the total amount received by <bitcoinaddress> in transactions with at least [minconf] confirmations.");
|
|
|
|
|
|
|
|
// Bitcoin address
|
2011-07-05 20:53:43 +02:00
|
|
|
CBitcoinAddress address = CBitcoinAddress(params[0].get_str());
|
2010-08-29 18:58:15 +02:00
|
|
|
CScript scriptPubKey;
|
2011-07-05 20:53:43 +02:00
|
|
|
if (!address.IsValid())
|
2010-09-06 23:03:04 +02:00
|
|
|
throw JSONRPCError(-5, "Invalid bitcoin address");
|
2011-07-05 20:53:43 +02:00
|
|
|
scriptPubKey.SetBitcoinAddress(address);
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
if (!IsMine(*pwalletMain,scriptPubKey))
|
2010-08-29 18:58:15 +02:00
|
|
|
return (double)0.0;
|
|
|
|
|
|
|
|
// Minimum confirmations
|
|
|
|
int nMinDepth = 1;
|
|
|
|
if (params.size() > 1)
|
|
|
|
nMinDepth = params[1].get_int();
|
|
|
|
|
|
|
|
// Tally
|
|
|
|
int64 nAmount = 0;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
const CWalletTx& wtx = (*it).second;
|
|
|
|
if (wtx.IsCoinBase() || !wtx.IsFinal())
|
|
|
|
continue;
|
|
|
|
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
|
2010-08-29 18:58:15 +02:00
|
|
|
if (txout.scriptPubKey == scriptPubKey)
|
|
|
|
if (wtx.GetDepthInMainChain() >= nMinDepth)
|
|
|
|
nAmount += txout.nValue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-23 20:24:16 +01:00
|
|
|
return ValueFromAmount(nAmount);
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-07-05 20:53:43 +02:00
|
|
|
void GetAccountAddresses(string strAccount, set<CBitcoinAddress>& setAddress)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, string)& item, pwalletMain->mapAddressBook)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
const CBitcoinAddress& address = item.first;
|
2010-08-29 18:58:15 +02:00
|
|
|
const string& strName = item.second;
|
2010-11-22 16:53:20 +01:00
|
|
|
if (strName == strAccount)
|
2011-07-05 20:53:43 +02:00
|
|
|
setAddress.insert(address);
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
}
|
2010-11-30 19:58:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getreceivedbyaccount(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() < 1 || params.size() > 2)
|
|
|
|
throw runtime_error(
|
|
|
|
"getreceivedbyaccount <account> [minconf=1]\n"
|
|
|
|
"Returns the total amount received by addresses with <account> in transactions with at least [minconf] confirmations.");
|
|
|
|
|
|
|
|
// Minimum confirmations
|
|
|
|
int nMinDepth = 1;
|
|
|
|
if (params.size() > 1)
|
|
|
|
nMinDepth = params[1].get_int();
|
|
|
|
|
|
|
|
// Get the set of pub keys that have the label
|
2010-12-16 02:06:03 +01:00
|
|
|
string strAccount = AccountFromValue(params[0]);
|
2011-07-05 20:53:43 +02:00
|
|
|
set<CBitcoinAddress> setAddress;
|
|
|
|
GetAccountAddresses(strAccount, setAddress);
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
// Tally
|
|
|
|
int64 nAmount = 0;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
const CWalletTx& wtx = (*it).second;
|
|
|
|
if (wtx.IsCoinBase() || !wtx.IsFinal())
|
|
|
|
continue;
|
|
|
|
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
|
2011-07-05 20:53:43 +02:00
|
|
|
{
|
|
|
|
CBitcoinAddress address;
|
|
|
|
if (ExtractAddress(txout.scriptPubKey, pwalletMain, address) && setAddress.count(address))
|
2010-08-29 18:58:15 +02:00
|
|
|
if (wtx.GetDepthInMainChain() >= nMinDepth)
|
|
|
|
nAmount += txout.nValue;
|
2011-07-05 20:53:43 +02:00
|
|
|
}
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return (double)nAmount / (double)COIN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
int64 GetAccountBalance(CWalletDB& walletdb, const string& strAccount, int nMinDepth)
|
|
|
|
{
|
|
|
|
int64 nBalance = 0;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
2010-11-22 16:53:20 +01:00
|
|
|
{
|
|
|
|
// Tally wallet transactions
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
|
2010-11-22 16:53:20 +01:00
|
|
|
{
|
|
|
|
const CWalletTx& wtx = (*it).second;
|
|
|
|
if (!wtx.IsFinal())
|
|
|
|
continue;
|
|
|
|
|
2010-11-30 19:58:11 +01:00
|
|
|
int64 nGenerated, nReceived, nSent, nFee;
|
2010-12-16 02:06:03 +01:00
|
|
|
wtx.GetAccountAmounts(strAccount, nGenerated, nReceived, nSent, nFee);
|
2010-11-22 16:53:20 +01:00
|
|
|
|
2010-11-30 19:58:11 +01:00
|
|
|
if (nReceived != 0 && wtx.GetDepthInMainChain() >= nMinDepth)
|
|
|
|
nBalance += nReceived;
|
|
|
|
nBalance += nGenerated - nSent - nFee;
|
2010-11-22 16:53:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Tally internal accounting entries
|
|
|
|
nBalance += walletdb.GetAccountCreditDebit(strAccount);
|
|
|
|
}
|
|
|
|
|
|
|
|
return nBalance;
|
|
|
|
}
|
|
|
|
|
|
|
|
int64 GetAccountBalance(const string& strAccount, int nMinDepth)
|
|
|
|
{
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CWalletDB walletdb(pwalletMain->strWalletFile);
|
2010-11-22 16:53:20 +01:00
|
|
|
return GetAccountBalance(walletdb, strAccount, nMinDepth);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getbalance(const Array& params, bool fHelp)
|
|
|
|
{
|
2011-06-24 20:09:24 +02:00
|
|
|
if (fHelp || params.size() > 2)
|
2010-11-22 16:53:20 +01:00
|
|
|
throw runtime_error(
|
|
|
|
"getbalance [account] [minconf=1]\n"
|
|
|
|
"If [account] is not specified, returns the server's total available balance.\n"
|
|
|
|
"If [account] is specified, returns the balance in the account.");
|
|
|
|
|
|
|
|
if (params.size() == 0)
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
return ValueFromAmount(pwalletMain->GetBalance());
|
2010-11-22 16:53:20 +01:00
|
|
|
|
2011-04-19 02:40:50 +02:00
|
|
|
int nMinDepth = 1;
|
|
|
|
if (params.size() > 1)
|
|
|
|
nMinDepth = params[1].get_int();
|
|
|
|
|
2011-01-19 22:50:20 +01:00
|
|
|
if (params[0].get_str() == "*") {
|
|
|
|
// Calculate total balance a different way from GetBalance()
|
|
|
|
// (GetBalance() sums up all unspent TxOuts)
|
|
|
|
// getbalance and getbalance '*' should always return the same number.
|
|
|
|
int64 nBalance = 0;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
|
2011-01-19 22:50:20 +01:00
|
|
|
{
|
|
|
|
const CWalletTx& wtx = (*it).second;
|
2011-04-19 02:40:50 +02:00
|
|
|
if (!wtx.IsFinal())
|
|
|
|
continue;
|
|
|
|
|
2011-03-27 20:56:18 +02:00
|
|
|
int64 allGeneratedImmature, allGeneratedMature, allFee;
|
|
|
|
allGeneratedImmature = allGeneratedMature = allFee = 0;
|
2011-01-19 22:50:20 +01:00
|
|
|
string strSentAccount;
|
2011-07-05 20:53:43 +02:00
|
|
|
list<pair<CBitcoinAddress, int64> > listReceived;
|
|
|
|
list<pair<CBitcoinAddress, int64> > listSent;
|
2011-03-27 20:56:18 +02:00
|
|
|
wtx.GetAmounts(allGeneratedImmature, allGeneratedMature, listReceived, listSent, allFee, strSentAccount);
|
2011-04-19 02:40:50 +02:00
|
|
|
if (wtx.GetDepthInMainChain() >= nMinDepth)
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress,int64)& r, listReceived)
|
2011-04-19 02:40:50 +02:00
|
|
|
nBalance += r.second;
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress,int64)& r, listSent)
|
2011-01-19 22:50:20 +01:00
|
|
|
nBalance -= r.second;
|
|
|
|
nBalance -= allFee;
|
2011-03-27 20:56:18 +02:00
|
|
|
nBalance += allGeneratedMature;
|
2011-01-19 22:50:20 +01:00
|
|
|
}
|
2011-02-23 20:24:16 +01:00
|
|
|
return ValueFromAmount(nBalance);
|
2011-01-19 22:50:20 +01:00
|
|
|
}
|
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
string strAccount = AccountFromValue(params[0]);
|
2010-11-22 16:53:20 +01:00
|
|
|
|
|
|
|
int64 nBalance = GetAccountBalance(strAccount, nMinDepth);
|
|
|
|
|
2011-02-23 20:24:16 +01:00
|
|
|
return ValueFromAmount(nBalance);
|
2010-11-22 16:53:20 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value movecmd(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() < 3 || params.size() > 5)
|
|
|
|
throw runtime_error(
|
|
|
|
"move <fromaccount> <toaccount> <amount> [minconf=1] [comment]\n"
|
|
|
|
"Move from one account in your wallet to another.");
|
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
string strFrom = AccountFromValue(params[0]);
|
|
|
|
string strTo = AccountFromValue(params[1]);
|
2010-11-22 16:53:20 +01:00
|
|
|
int64 nAmount = AmountFromValue(params[2]);
|
|
|
|
if (params.size() > 3)
|
2011-07-13 13:43:24 +02:00
|
|
|
// unused parameter, used to be nMinDepth, keep type-checking it though
|
|
|
|
(void)params[3].get_int();
|
2010-11-22 16:53:20 +01:00
|
|
|
string strComment;
|
|
|
|
if (params.size() > 4)
|
|
|
|
strComment = params[4].get_str();
|
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
2010-11-22 16:53:20 +01:00
|
|
|
{
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CWalletDB walletdb(pwalletMain->strWalletFile);
|
2010-11-22 16:53:20 +01:00
|
|
|
walletdb.TxnBegin();
|
|
|
|
|
|
|
|
int64 nNow = GetAdjustedTime();
|
|
|
|
|
|
|
|
// Debit
|
|
|
|
CAccountingEntry debit;
|
2010-12-16 02:06:03 +01:00
|
|
|
debit.strAccount = strFrom;
|
2010-11-22 16:53:20 +01:00
|
|
|
debit.nCreditDebit = -nAmount;
|
|
|
|
debit.nTime = nNow;
|
|
|
|
debit.strOtherAccount = strTo;
|
|
|
|
debit.strComment = strComment;
|
2010-12-16 02:06:03 +01:00
|
|
|
walletdb.WriteAccountingEntry(debit);
|
2010-11-22 16:53:20 +01:00
|
|
|
|
|
|
|
// Credit
|
|
|
|
CAccountingEntry credit;
|
2010-12-16 02:06:03 +01:00
|
|
|
credit.strAccount = strTo;
|
2010-11-22 16:53:20 +01:00
|
|
|
credit.nCreditDebit = nAmount;
|
|
|
|
credit.nTime = nNow;
|
|
|
|
credit.strOtherAccount = strFrom;
|
|
|
|
credit.strComment = strComment;
|
2010-12-16 02:06:03 +01:00
|
|
|
walletdb.WriteAccountingEntry(credit);
|
2010-11-22 16:53:20 +01:00
|
|
|
|
|
|
|
walletdb.TxnCommit();
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value sendfrom(const Array& params, bool fHelp)
|
|
|
|
{
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
if (pwalletMain->IsCrypted() && (fHelp || params.size() < 3 || params.size() > 6))
|
|
|
|
throw runtime_error(
|
|
|
|
"sendfrom <fromaccount> <tobitcoinaddress> <amount> [minconf=1] [comment] [comment-to]\n"
|
|
|
|
"<amount> is a real and is rounded to the nearest 0.00000001\n"
|
|
|
|
"requires wallet passphrase to be set with walletpassphrase first");
|
|
|
|
if (!pwalletMain->IsCrypted() && (fHelp || params.size() < 3 || params.size() > 6))
|
2010-11-22 16:53:20 +01:00
|
|
|
throw runtime_error(
|
|
|
|
"sendfrom <fromaccount> <tobitcoinaddress> <amount> [minconf=1] [comment] [comment-to]\n"
|
2011-05-09 20:26:41 +02:00
|
|
|
"<amount> is a real and is rounded to the nearest 0.00000001");
|
2010-11-22 16:53:20 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
string strAccount = AccountFromValue(params[0]);
|
2010-11-22 16:53:20 +01:00
|
|
|
string strAddress = params[1].get_str();
|
|
|
|
int64 nAmount = AmountFromValue(params[2]);
|
|
|
|
int nMinDepth = 1;
|
|
|
|
if (params.size() > 3)
|
|
|
|
nMinDepth = params[3].get_int();
|
|
|
|
|
|
|
|
CWalletTx wtx;
|
|
|
|
wtx.strFromAccount = strAccount;
|
|
|
|
if (params.size() > 4 && params[4].type() != null_type && !params[4].get_str().empty())
|
2010-12-16 02:06:03 +01:00
|
|
|
wtx.mapValue["comment"] = params[4].get_str();
|
2010-11-22 16:53:20 +01:00
|
|
|
if (params.size() > 5 && params[5].type() != null_type && !params[5].get_str().empty())
|
|
|
|
wtx.mapValue["to"] = params[5].get_str();
|
|
|
|
|
2011-04-05 04:24:35 +02:00
|
|
|
CRITICAL_BLOCK(cs_main)
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_vMasterKey)
|
2010-11-22 16:53:20 +01:00
|
|
|
{
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
if(pwalletMain->IsLocked())
|
|
|
|
throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect.");
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
// Check funds
|
|
|
|
int64 nBalance = GetAccountBalance(strAccount, nMinDepth);
|
|
|
|
if (nAmount > nBalance)
|
|
|
|
throw JSONRPCError(-6, "Account has insufficient funds");
|
|
|
|
|
|
|
|
// Send
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
string strError = pwalletMain->SendMoneyToBitcoinAddress(strAddress, nAmount, wtx);
|
2010-11-22 16:53:20 +01:00
|
|
|
if (strError != "")
|
|
|
|
throw JSONRPCError(-4, strError);
|
|
|
|
}
|
|
|
|
|
|
|
|
return wtx.GetHash().GetHex();
|
|
|
|
}
|
|
|
|
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
|
2010-12-16 21:48:04 +01:00
|
|
|
Value sendmany(const Array& params, bool fHelp)
|
|
|
|
{
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
if (pwalletMain->IsCrypted() && (fHelp || params.size() < 2 || params.size() > 4))
|
|
|
|
throw runtime_error(
|
|
|
|
"sendmany <fromaccount> {address:amount,...} [minconf=1] [comment]\n"
|
|
|
|
"amounts are double-precision floating point numbers\n"
|
|
|
|
"requires wallet passphrase to be set with walletpassphrase first");
|
|
|
|
if (!pwalletMain->IsCrypted() && (fHelp || params.size() < 2 || params.size() > 4))
|
2010-12-16 21:48:04 +01:00
|
|
|
throw runtime_error(
|
|
|
|
"sendmany <fromaccount> {address:amount,...} [minconf=1] [comment]\n"
|
|
|
|
"amounts are double-precision floating point numbers");
|
|
|
|
|
|
|
|
string strAccount = AccountFromValue(params[0]);
|
|
|
|
Object sendTo = params[1].get_obj();
|
|
|
|
int nMinDepth = 1;
|
|
|
|
if (params.size() > 2)
|
|
|
|
nMinDepth = params[2].get_int();
|
|
|
|
|
|
|
|
CWalletTx wtx;
|
|
|
|
wtx.strFromAccount = strAccount;
|
|
|
|
if (params.size() > 3 && params[3].type() != null_type && !params[3].get_str().empty())
|
|
|
|
wtx.mapValue["comment"] = params[3].get_str();
|
|
|
|
|
2011-07-05 20:53:43 +02:00
|
|
|
set<CBitcoinAddress> setAddress;
|
2010-12-16 21:48:04 +01:00
|
|
|
vector<pair<CScript, int64> > vecSend;
|
|
|
|
|
|
|
|
int64 totalAmount = 0;
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(const Pair& s, sendTo)
|
2010-12-16 21:48:04 +01:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
CBitcoinAddress address(s.name_);
|
|
|
|
if (!address.IsValid())
|
|
|
|
throw JSONRPCError(-5, string("Invalid bitcoin address:")+s.name_);
|
2010-12-16 21:48:04 +01:00
|
|
|
|
2011-07-05 20:53:43 +02:00
|
|
|
if (setAddress.count(address))
|
|
|
|
throw JSONRPCError(-8, string("Invalid parameter, duplicated address: ")+s.name_);
|
|
|
|
setAddress.insert(address);
|
2010-12-16 21:48:04 +01:00
|
|
|
|
|
|
|
CScript scriptPubKey;
|
2011-07-05 20:53:43 +02:00
|
|
|
scriptPubKey.SetBitcoinAddress(address);
|
2010-12-16 21:48:04 +01:00
|
|
|
int64 nAmount = AmountFromValue(s.value_);
|
|
|
|
totalAmount += nAmount;
|
|
|
|
|
|
|
|
vecSend.push_back(make_pair(scriptPubKey, nAmount));
|
|
|
|
}
|
|
|
|
|
2011-04-05 21:15:20 +02:00
|
|
|
CRITICAL_BLOCK(cs_main)
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_vMasterKey)
|
2010-12-16 21:48:04 +01:00
|
|
|
{
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
if(pwalletMain->IsLocked())
|
|
|
|
throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect.");
|
|
|
|
|
2010-12-16 21:48:04 +01:00
|
|
|
// Check funds
|
|
|
|
int64 nBalance = GetAccountBalance(strAccount, nMinDepth);
|
|
|
|
if (totalAmount > nBalance)
|
|
|
|
throw JSONRPCError(-6, "Account has insufficient funds");
|
|
|
|
|
|
|
|
// Send
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CReserveKey keyChange(pwalletMain);
|
2010-12-16 21:48:04 +01:00
|
|
|
int64 nFeeRequired = 0;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired);
|
2010-12-16 21:48:04 +01:00
|
|
|
if (!fCreated)
|
|
|
|
{
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
if (totalAmount + nFeeRequired > pwalletMain->GetBalance())
|
2010-12-16 21:48:04 +01:00
|
|
|
throw JSONRPCError(-6, "Insufficient funds");
|
|
|
|
throw JSONRPCError(-4, "Transaction creation failed");
|
|
|
|
}
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
if (!pwalletMain->CommitTransaction(wtx, keyChange))
|
2010-12-16 21:48:04 +01:00
|
|
|
throw JSONRPCError(-4, "Transaction commit failed");
|
|
|
|
}
|
|
|
|
|
|
|
|
return wtx.GetHash().GetHex();
|
|
|
|
}
|
2010-11-22 16:53:20 +01:00
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
struct tallyitem
|
|
|
|
{
|
|
|
|
int64 nAmount;
|
|
|
|
int nConf;
|
|
|
|
tallyitem()
|
|
|
|
{
|
|
|
|
nAmount = 0;
|
|
|
|
nConf = INT_MAX;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
Value ListReceived(const Array& params, bool fByAccounts)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
// Minimum confirmations
|
|
|
|
int nMinDepth = 1;
|
|
|
|
if (params.size() > 0)
|
|
|
|
nMinDepth = params[0].get_int();
|
|
|
|
|
|
|
|
// Whether to include empty accounts
|
|
|
|
bool fIncludeEmpty = false;
|
|
|
|
if (params.size() > 1)
|
|
|
|
fIncludeEmpty = params[1].get_bool();
|
|
|
|
|
|
|
|
// Tally
|
2011-07-05 20:53:43 +02:00
|
|
|
map<CBitcoinAddress, tallyitem> mapTally;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
const CWalletTx& wtx = (*it).second;
|
|
|
|
if (wtx.IsCoinBase() || !wtx.IsFinal())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
int nDepth = wtx.GetDepthInMainChain();
|
|
|
|
if (nDepth < nMinDepth)
|
|
|
|
continue;
|
|
|
|
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(const CTxOut& txout, wtx.vout)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
CBitcoinAddress address;
|
|
|
|
if (!ExtractAddress(txout.scriptPubKey, pwalletMain, address) || !address.IsValid())
|
2010-08-29 18:58:15 +02:00
|
|
|
continue;
|
|
|
|
|
2011-07-05 20:53:43 +02:00
|
|
|
tallyitem& item = mapTally[address];
|
2010-08-29 18:58:15 +02:00
|
|
|
item.nAmount += txout.nValue;
|
|
|
|
item.nConf = min(item.nConf, nDepth);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Reply
|
|
|
|
Array ret;
|
2010-11-22 16:53:20 +01:00
|
|
|
map<string, tallyitem> mapAccountTally;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, string)& item, pwalletMain->mapAddressBook)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
const CBitcoinAddress& address = item.first;
|
2010-11-22 16:53:20 +01:00
|
|
|
const string& strAccount = item.second;
|
2011-07-05 20:53:43 +02:00
|
|
|
map<CBitcoinAddress, tallyitem>::iterator it = mapTally.find(address);
|
2010-08-29 18:58:15 +02:00
|
|
|
if (it == mapTally.end() && !fIncludeEmpty)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
int64 nAmount = 0;
|
|
|
|
int nConf = INT_MAX;
|
|
|
|
if (it != mapTally.end())
|
|
|
|
{
|
|
|
|
nAmount = (*it).second.nAmount;
|
|
|
|
nConf = (*it).second.nConf;
|
|
|
|
}
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
if (fByAccounts)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2010-11-22 16:53:20 +01:00
|
|
|
tallyitem& item = mapAccountTally[strAccount];
|
2010-08-29 18:58:15 +02:00
|
|
|
item.nAmount += nAmount;
|
|
|
|
item.nConf = min(item.nConf, nConf);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Object obj;
|
2011-07-05 20:53:43 +02:00
|
|
|
obj.push_back(Pair("address", address.ToString()));
|
2010-11-22 16:53:20 +01:00
|
|
|
obj.push_back(Pair("account", strAccount));
|
|
|
|
obj.push_back(Pair("label", strAccount)); // deprecated
|
2011-02-23 20:24:16 +01:00
|
|
|
obj.push_back(Pair("amount", ValueFromAmount(nAmount)));
|
2010-08-29 18:58:15 +02:00
|
|
|
obj.push_back(Pair("confirmations", (nConf == INT_MAX ? 0 : nConf)));
|
|
|
|
ret.push_back(obj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
if (fByAccounts)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2010-11-22 16:53:20 +01:00
|
|
|
for (map<string, tallyitem>::iterator it = mapAccountTally.begin(); it != mapAccountTally.end(); ++it)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
int64 nAmount = (*it).second.nAmount;
|
|
|
|
int nConf = (*it).second.nConf;
|
|
|
|
Object obj;
|
2010-11-22 16:53:20 +01:00
|
|
|
obj.push_back(Pair("account", (*it).first));
|
|
|
|
obj.push_back(Pair("label", (*it).first)); // deprecated
|
2011-02-23 20:24:16 +01:00
|
|
|
obj.push_back(Pair("amount", ValueFromAmount(nAmount)));
|
2010-08-29 18:58:15 +02:00
|
|
|
obj.push_back(Pair("confirmations", (nConf == INT_MAX ? 0 : nConf)));
|
|
|
|
ret.push_back(obj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
Value listreceivedbyaddress(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() > 2)
|
|
|
|
throw runtime_error(
|
|
|
|
"listreceivedbyaddress [minconf=1] [includeempty=false]\n"
|
|
|
|
"[minconf] is the minimum number of confirmations before payments are included.\n"
|
|
|
|
"[includeempty] whether to include addresses that haven't received any payments.\n"
|
|
|
|
"Returns an array of objects containing:\n"
|
|
|
|
" \"address\" : receiving address\n"
|
2010-11-22 16:53:20 +01:00
|
|
|
" \"account\" : the account of the receiving address\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
" \"amount\" : total amount received by the address\n"
|
|
|
|
" \"confirmations\" : number of confirmations of the most recent transaction included");
|
|
|
|
|
|
|
|
return ListReceived(params, false);
|
|
|
|
}
|
|
|
|
|
2010-11-22 16:53:20 +01:00
|
|
|
Value listreceivedbyaccount(const Array& params, bool fHelp)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
if (fHelp || params.size() > 2)
|
|
|
|
throw runtime_error(
|
2010-11-22 16:53:20 +01:00
|
|
|
"listreceivedbyaccount [minconf=1] [includeempty=false]\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
"[minconf] is the minimum number of confirmations before payments are included.\n"
|
2010-11-22 16:53:20 +01:00
|
|
|
"[includeempty] whether to include accounts that haven't received any payments.\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
"Returns an array of objects containing:\n"
|
2010-11-22 16:53:20 +01:00
|
|
|
" \"account\" : the account of the receiving addresses\n"
|
|
|
|
" \"amount\" : total amount received by addresses with this account\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
" \"confirmations\" : number of confirmations of the most recent transaction included");
|
|
|
|
|
|
|
|
return ListReceived(params, true);
|
|
|
|
}
|
|
|
|
|
2011-01-07 20:10:08 +01:00
|
|
|
void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDepth, bool fLong, Array& ret)
|
2010-11-30 19:58:11 +01:00
|
|
|
{
|
2011-03-27 20:56:18 +02:00
|
|
|
int64 nGeneratedImmature, nGeneratedMature, nFee;
|
2010-12-16 02:06:03 +01:00
|
|
|
string strSentAccount;
|
2011-07-05 20:53:43 +02:00
|
|
|
list<pair<CBitcoinAddress, int64> > listReceived;
|
|
|
|
list<pair<CBitcoinAddress, int64> > listSent;
|
2011-03-27 20:56:18 +02:00
|
|
|
wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount);
|
2010-11-30 19:58:11 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
bool fAllAccounts = (strAccount == string("*"));
|
|
|
|
|
|
|
|
// Generated blocks assigned to account ""
|
2011-03-27 20:56:18 +02:00
|
|
|
if ((nGeneratedMature+nGeneratedImmature) != 0 && (fAllAccounts || strAccount == ""))
|
2010-11-30 19:58:11 +01:00
|
|
|
{
|
2010-12-16 02:06:03 +01:00
|
|
|
Object entry;
|
|
|
|
entry.push_back(Pair("account", string("")));
|
2011-03-27 20:56:18 +02:00
|
|
|
if (nGeneratedImmature)
|
|
|
|
{
|
|
|
|
entry.push_back(Pair("category", wtx.GetDepthInMainChain() ? "immature" : "orphan"));
|
|
|
|
entry.push_back(Pair("amount", ValueFromAmount(nGeneratedImmature)));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
entry.push_back(Pair("category", "generate"));
|
|
|
|
entry.push_back(Pair("amount", ValueFromAmount(nGeneratedMature)));
|
|
|
|
}
|
2011-01-07 20:10:08 +01:00
|
|
|
if (fLong)
|
|
|
|
WalletTxToJSON(wtx, entry);
|
2010-12-16 02:06:03 +01:00
|
|
|
ret.push_back(entry);
|
|
|
|
}
|
2010-11-30 19:58:11 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
// Sent
|
2010-12-20 20:44:54 +01:00
|
|
|
if ((!listSent.empty() || nFee != 0) && (fAllAccounts || strAccount == strSentAccount))
|
2010-12-16 02:06:03 +01:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, int64)& s, listSent)
|
2010-12-20 20:44:54 +01:00
|
|
|
{
|
|
|
|
Object entry;
|
|
|
|
entry.push_back(Pair("account", strSentAccount));
|
2011-07-05 20:53:43 +02:00
|
|
|
entry.push_back(Pair("address", s.first.ToString()));
|
2010-12-20 20:44:54 +01:00
|
|
|
entry.push_back(Pair("category", "send"));
|
|
|
|
entry.push_back(Pair("amount", ValueFromAmount(-s.second)));
|
|
|
|
entry.push_back(Pair("fee", ValueFromAmount(-nFee)));
|
2011-01-07 20:10:08 +01:00
|
|
|
if (fLong)
|
|
|
|
WalletTxToJSON(wtx, entry);
|
2010-12-20 20:44:54 +01:00
|
|
|
ret.push_back(entry);
|
|
|
|
}
|
2010-12-16 02:06:03 +01:00
|
|
|
}
|
2010-11-30 19:58:11 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
// Received
|
|
|
|
if (listReceived.size() > 0 && wtx.GetDepthInMainChain() >= nMinDepth)
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2010-12-16 02:06:03 +01:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, int64)& r, listReceived)
|
2010-12-20 20:44:54 +01:00
|
|
|
{
|
|
|
|
string account;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
if (pwalletMain->mapAddressBook.count(r.first))
|
|
|
|
account = pwalletMain->mapAddressBook[r.first];
|
2010-12-20 20:44:54 +01:00
|
|
|
if (fAllAccounts || (account == strAccount))
|
2010-12-16 02:06:03 +01:00
|
|
|
{
|
|
|
|
Object entry;
|
2010-12-20 20:44:54 +01:00
|
|
|
entry.push_back(Pair("account", account));
|
2011-07-05 20:53:43 +02:00
|
|
|
entry.push_back(Pair("address", r.first.ToString()));
|
2010-12-16 02:06:03 +01:00
|
|
|
entry.push_back(Pair("category", "receive"));
|
|
|
|
entry.push_back(Pair("amount", ValueFromAmount(r.second)));
|
2011-01-07 20:10:08 +01:00
|
|
|
if (fLong)
|
|
|
|
WalletTxToJSON(wtx, entry);
|
2010-12-16 02:06:03 +01:00
|
|
|
ret.push_back(entry);
|
|
|
|
}
|
2010-12-20 20:44:54 +01:00
|
|
|
}
|
2010-12-16 02:06:03 +01:00
|
|
|
}
|
2010-11-30 19:58:11 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
}
|
2010-11-30 19:58:11 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
void AcentryToJSON(const CAccountingEntry& acentry, const string& strAccount, Array& ret)
|
|
|
|
{
|
|
|
|
bool fAllAccounts = (strAccount == string("*"));
|
2010-11-30 19:58:11 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
if (fAllAccounts || acentry.strAccount == strAccount)
|
|
|
|
{
|
|
|
|
Object entry;
|
|
|
|
entry.push_back(Pair("account", acentry.strAccount));
|
|
|
|
entry.push_back(Pair("category", "move"));
|
2011-01-05 15:52:52 +01:00
|
|
|
entry.push_back(Pair("time", (boost::int64_t)acentry.nTime));
|
2010-12-16 02:06:03 +01:00
|
|
|
entry.push_back(Pair("amount", ValueFromAmount(acentry.nCreditDebit)));
|
|
|
|
entry.push_back(Pair("otheraccount", acentry.strOtherAccount));
|
|
|
|
entry.push_back(Pair("comment", acentry.strComment));
|
|
|
|
ret.push_back(entry);
|
2010-11-30 19:58:11 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Value listtransactions(const Array& params, bool fHelp)
|
|
|
|
{
|
2011-05-09 20:03:54 +02:00
|
|
|
if (fHelp || params.size() > 3)
|
2010-11-30 19:58:11 +01:00
|
|
|
throw runtime_error(
|
2011-04-15 08:24:59 +02:00
|
|
|
"listtransactions [account] [count=10] [from=0]\n"
|
|
|
|
"Returns up to [count] most recent transactions skipping the first [from] transactions for account [account].");
|
2010-11-30 19:58:11 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
string strAccount = "*";
|
|
|
|
if (params.size() > 0)
|
|
|
|
strAccount = params[0].get_str();
|
2010-11-30 19:58:11 +01:00
|
|
|
int nCount = 10;
|
|
|
|
if (params.size() > 1)
|
|
|
|
nCount = params[1].get_int();
|
2011-04-15 08:24:59 +02:00
|
|
|
int nFrom = 0;
|
|
|
|
if (params.size() > 2)
|
|
|
|
nFrom = params[2].get_int();
|
2010-11-30 19:58:11 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
Array ret;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CWalletDB walletdb(pwalletMain->strWalletFile);
|
2010-11-30 19:58:11 +01:00
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
2010-11-30 19:58:11 +01:00
|
|
|
{
|
2010-12-16 02:06:03 +01:00
|
|
|
// Firs: get all CWalletTx and CAccountingEntry into a sorted-by-time multimap:
|
|
|
|
typedef pair<CWalletTx*, CAccountingEntry*> TxPair;
|
|
|
|
typedef multimap<int64, TxPair > TxItems;
|
|
|
|
TxItems txByTime;
|
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
|
2010-12-16 02:06:03 +01:00
|
|
|
{
|
|
|
|
CWalletTx* wtx = &((*it).second);
|
2011-02-11 01:24:22 +01:00
|
|
|
txByTime.insert(make_pair(wtx->GetTxTime(), TxPair(wtx, (CAccountingEntry*)0)));
|
2010-12-16 02:06:03 +01:00
|
|
|
}
|
|
|
|
list<CAccountingEntry> acentries;
|
|
|
|
walletdb.ListAccountCreditDebit(strAccount, acentries);
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(CAccountingEntry& entry, acentries)
|
2010-12-16 02:06:03 +01:00
|
|
|
{
|
2011-02-11 01:24:22 +01:00
|
|
|
txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry)));
|
2010-12-16 02:06:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Now: iterate backwards until we have nCount items to return:
|
2011-05-09 19:31:10 +02:00
|
|
|
TxItems::reverse_iterator it = txByTime.rbegin();
|
|
|
|
for (std::advance(it, nFrom); it != txByTime.rend(); ++it)
|
2010-12-16 02:06:03 +01:00
|
|
|
{
|
|
|
|
CWalletTx *const pwtx = (*it).second.first;
|
|
|
|
if (pwtx != 0)
|
2011-01-07 20:10:08 +01:00
|
|
|
ListTransactions(*pwtx, strAccount, 0, true, ret);
|
2010-12-16 02:06:03 +01:00
|
|
|
CAccountingEntry *const pacentry = (*it).second.second;
|
|
|
|
if (pacentry != 0)
|
|
|
|
AcentryToJSON(*pacentry, strAccount, ret);
|
|
|
|
|
|
|
|
if (ret.size() >= nCount) break;
|
|
|
|
}
|
|
|
|
// ret is now newest to oldest
|
|
|
|
}
|
|
|
|
|
|
|
|
// Make sure we return only last nCount items (sends-to-self might give us an extra):
|
|
|
|
if (ret.size() > nCount)
|
|
|
|
{
|
|
|
|
Array::iterator last = ret.begin();
|
|
|
|
std::advance(last, nCount);
|
|
|
|
ret.erase(last, ret.end());
|
2010-11-30 19:58:11 +01:00
|
|
|
}
|
2010-12-16 02:06:03 +01:00
|
|
|
std::reverse(ret.begin(), ret.end()); // oldest to newest
|
2010-11-30 19:58:11 +01:00
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
Value listaccounts(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() > 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"listaccounts [minconf=1]\n"
|
|
|
|
"Returns Object that has account names as keys, account balances as values.");
|
|
|
|
|
|
|
|
int nMinDepth = 1;
|
2011-01-10 19:54:39 +01:00
|
|
|
if (params.size() > 0)
|
|
|
|
nMinDepth = params[0].get_int();
|
2010-12-16 02:06:03 +01:00
|
|
|
|
|
|
|
map<string, int64> mapAccountBalances;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2010-12-16 02:06:03 +01:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, string)& entry, pwalletMain->mapAddressBook) {
|
|
|
|
if (pwalletMain->HaveKey(entry.first)) // This address belongs to me
|
2011-03-20 23:32:39 +01:00
|
|
|
mapAccountBalances[entry.second] = 0;
|
|
|
|
}
|
2010-12-16 02:06:03 +01:00
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
|
2010-12-16 02:06:03 +01:00
|
|
|
{
|
|
|
|
const CWalletTx& wtx = (*it).second;
|
2011-03-27 20:56:18 +02:00
|
|
|
int64 nGeneratedImmature, nGeneratedMature, nFee;
|
2010-12-16 02:06:03 +01:00
|
|
|
string strSentAccount;
|
2011-07-05 20:53:43 +02:00
|
|
|
list<pair<CBitcoinAddress, int64> > listReceived;
|
|
|
|
list<pair<CBitcoinAddress, int64> > listSent;
|
2011-03-27 20:56:18 +02:00
|
|
|
wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount);
|
2010-12-20 20:44:54 +01:00
|
|
|
mapAccountBalances[strSentAccount] -= nFee;
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, int64)& s, listSent)
|
2010-12-20 20:44:54 +01:00
|
|
|
mapAccountBalances[strSentAccount] -= s.second;
|
2010-12-16 02:06:03 +01:00
|
|
|
if (wtx.GetDepthInMainChain() >= nMinDepth)
|
|
|
|
{
|
2011-03-27 20:56:18 +02:00
|
|
|
mapAccountBalances[""] += nGeneratedMature;
|
2011-07-05 20:53:43 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, int64)& r, listReceived)
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
if (pwalletMain->mapAddressBook.count(r.first))
|
|
|
|
mapAccountBalances[pwalletMain->mapAddressBook[r.first]] += r.second;
|
2011-01-20 19:10:01 +01:00
|
|
|
else
|
|
|
|
mapAccountBalances[""] += r.second;
|
2010-12-16 02:06:03 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
list<CAccountingEntry> acentries;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CWalletDB(pwalletMain->strWalletFile).ListAccountCreditDebit("*", acentries);
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(const CAccountingEntry& entry, acentries)
|
2010-12-16 02:06:03 +01:00
|
|
|
mapAccountBalances[entry.strAccount] += entry.nCreditDebit;
|
|
|
|
|
|
|
|
Object ret;
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(string, int64)& accountBalance, mapAccountBalances) {
|
2010-12-16 02:06:03 +01:00
|
|
|
ret.push_back(Pair(accountBalance.first, ValueFromAmount(accountBalance.second)));
|
|
|
|
}
|
2010-11-30 19:58:11 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
Value gettransaction(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"gettransaction <txid>\n"
|
|
|
|
"Get detailed information about <txid>");
|
|
|
|
|
|
|
|
uint256 hash;
|
|
|
|
hash.SetHex(params[0].get_str());
|
|
|
|
|
|
|
|
Object entry;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapWallet)
|
2010-11-30 19:58:11 +01:00
|
|
|
{
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
if (!pwalletMain->mapWallet.count(hash))
|
2011-01-07 20:10:08 +01:00
|
|
|
throw JSONRPCError(-5, "Invalid or non-wallet transaction id");
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
const CWalletTx& wtx = pwalletMain->mapWallet[hash];
|
2010-11-30 19:58:11 +01:00
|
|
|
|
|
|
|
int64 nCredit = wtx.GetCredit();
|
|
|
|
int64 nDebit = wtx.GetDebit();
|
|
|
|
int64 nNet = nCredit - nDebit;
|
|
|
|
int64 nFee = (wtx.IsFromMe() ? wtx.GetValueOut() - nDebit : 0);
|
|
|
|
|
|
|
|
entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
|
|
|
|
if (wtx.IsFromMe())
|
|
|
|
entry.push_back(Pair("fee", ValueFromAmount(nFee)));
|
2011-01-07 20:10:08 +01:00
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
WalletTxToJSON(pwalletMain->mapWallet[hash], entry);
|
2011-01-07 20:10:08 +01:00
|
|
|
|
|
|
|
Array details;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
ListTransactions(pwalletMain->mapWallet[hash], "*", 0, false, details);
|
2011-01-07 20:10:08 +01:00
|
|
|
entry.push_back(Pair("details", details));
|
2010-11-30 19:58:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2010-09-06 23:03:04 +02:00
|
|
|
Value backupwallet(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"backupwallet <destination>\n"
|
|
|
|
"Safely copies wallet.dat to destination, which can be a directory or a path with filename.");
|
|
|
|
|
|
|
|
string strDest = params[0].get_str();
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
BackupWallet(*pwalletMain, strDest);
|
2010-09-06 23:03:04 +02:00
|
|
|
|
|
|
|
return Value::null;
|
|
|
|
}
|
|
|
|
|
2010-10-23 19:43:53 +02:00
|
|
|
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
Value keypoolrefill(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (pwalletMain->IsCrypted() && (fHelp || params.size() > 0))
|
|
|
|
throw runtime_error(
|
|
|
|
"keypoolrefill\n"
|
|
|
|
"Fills the keypool, requires wallet passphrase to be set.");
|
|
|
|
if (!pwalletMain->IsCrypted() && (fHelp || params.size() > 0))
|
|
|
|
throw runtime_error(
|
|
|
|
"keypoolrefill\n"
|
|
|
|
"Fills the keypool.");
|
|
|
|
|
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_vMasterKey)
|
|
|
|
{
|
|
|
|
if (pwalletMain->IsLocked())
|
|
|
|
throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.");
|
|
|
|
|
|
|
|
pwalletMain->TopUpKeyPool();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pwalletMain->GetKeyPoolSize() < GetArg("-keypool", 100))
|
|
|
|
throw JSONRPCError(-4, "Error refreshing keypool.");
|
|
|
|
|
|
|
|
return Value::null;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void ThreadTopUpKeyPool(void* parg)
|
|
|
|
{
|
|
|
|
pwalletMain->TopUpKeyPool();
|
|
|
|
}
|
|
|
|
|
|
|
|
void ThreadCleanWalletPassphrase(void* parg)
|
|
|
|
{
|
|
|
|
int64 nMyWakeTime = GetTime() + *((int*)parg);
|
|
|
|
|
2011-06-29 00:47:41 +02:00
|
|
|
if (nWalletUnlockTime == 0)
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
{
|
2011-06-29 00:47:41 +02:00
|
|
|
CRITICAL_BLOCK(cs_nWalletUnlockTime)
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
{
|
2011-06-29 00:47:41 +02:00
|
|
|
nWalletUnlockTime = nMyWakeTime;
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
}
|
|
|
|
|
2011-06-29 00:47:41 +02:00
|
|
|
while (GetTime() < nWalletUnlockTime)
|
|
|
|
Sleep(GetTime() - nWalletUnlockTime);
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
|
2011-06-29 00:47:41 +02:00
|
|
|
CRITICAL_BLOCK(cs_nWalletUnlockTime)
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
{
|
2011-06-29 00:47:41 +02:00
|
|
|
nWalletUnlockTime = 0;
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2011-06-29 00:47:41 +02:00
|
|
|
CRITICAL_BLOCK(cs_nWalletUnlockTime)
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
{
|
2011-06-29 00:47:41 +02:00
|
|
|
if (nWalletUnlockTime < nMyWakeTime)
|
|
|
|
nWalletUnlockTime = nMyWakeTime;
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
}
|
|
|
|
free(parg);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
pwalletMain->Lock();
|
|
|
|
|
|
|
|
delete (int*)parg;
|
|
|
|
}
|
|
|
|
|
|
|
|
Value walletpassphrase(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
|
|
|
|
throw runtime_error(
|
|
|
|
"walletpassphrase <passphrase> <timeout>\n"
|
|
|
|
"Stores the wallet decryption key in memory for <timeout> seconds.");
|
|
|
|
if (fHelp)
|
|
|
|
return true;
|
|
|
|
if (!pwalletMain->IsCrypted())
|
|
|
|
throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletpassphrase was called.");
|
|
|
|
|
|
|
|
if (!pwalletMain->IsLocked())
|
|
|
|
throw JSONRPCError(-17, "Error: Wallet is already unlocked.");
|
|
|
|
|
|
|
|
// Note that the walletpassphrase is stored in params[0] which is not mlock()ed
|
|
|
|
string strWalletPass;
|
|
|
|
strWalletPass.reserve(100);
|
|
|
|
mlock(&strWalletPass[0], strWalletPass.capacity());
|
|
|
|
strWalletPass = params[0].get_str();
|
|
|
|
|
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_vMasterKey)
|
|
|
|
{
|
|
|
|
if (strWalletPass.length() > 0)
|
|
|
|
{
|
|
|
|
if (!pwalletMain->Unlock(strWalletPass))
|
|
|
|
{
|
|
|
|
fill(strWalletPass.begin(), strWalletPass.end(), '\0');
|
|
|
|
munlock(&strWalletPass[0], strWalletPass.capacity());
|
|
|
|
throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect.");
|
|
|
|
}
|
|
|
|
fill(strWalletPass.begin(), strWalletPass.end(), '\0');
|
|
|
|
munlock(&strWalletPass[0], strWalletPass.capacity());
|
|
|
|
}
|
|
|
|
else
|
|
|
|
throw runtime_error(
|
|
|
|
"walletpassphrase <passphrase> <timeout>\n"
|
|
|
|
"Stores the wallet decryption key in memory for <timeout> seconds.");
|
|
|
|
}
|
|
|
|
|
|
|
|
CreateThread(ThreadTopUpKeyPool, NULL);
|
|
|
|
int* pnSleepTime = new int(params[1].get_int());
|
|
|
|
CreateThread(ThreadCleanWalletPassphrase, pnSleepTime);
|
|
|
|
|
|
|
|
return Value::null;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value walletpassphrasechange(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
|
|
|
|
throw runtime_error(
|
|
|
|
"walletpassphrasechange <oldpassphrase> <newpassphrase>\n"
|
|
|
|
"Changes the wallet passphrase from <oldpassphrase> to <newpassphrase>.");
|
|
|
|
if (fHelp)
|
|
|
|
return true;
|
|
|
|
if (!pwalletMain->IsCrypted())
|
|
|
|
throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletpassphrasechange was called.");
|
|
|
|
|
|
|
|
string strOldWalletPass;
|
|
|
|
strOldWalletPass.reserve(100);
|
|
|
|
mlock(&strOldWalletPass[0], strOldWalletPass.capacity());
|
|
|
|
strOldWalletPass = params[0].get_str();
|
|
|
|
|
|
|
|
string strNewWalletPass;
|
|
|
|
strNewWalletPass.reserve(100);
|
|
|
|
mlock(&strNewWalletPass[0], strNewWalletPass.capacity());
|
|
|
|
strNewWalletPass = params[1].get_str();
|
|
|
|
|
|
|
|
if (strOldWalletPass.length() < 1 || strNewWalletPass.length() < 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"walletpassphrasechange <oldpassphrase> <newpassphrase>\n"
|
|
|
|
"Changes the wallet passphrase from <oldpassphrase> to <newpassphrase>.");
|
|
|
|
|
|
|
|
if (!pwalletMain->ChangeWalletPassphrase(strOldWalletPass, strNewWalletPass))
|
|
|
|
{
|
|
|
|
fill(strOldWalletPass.begin(), strOldWalletPass.end(), '\0');
|
|
|
|
fill(strNewWalletPass.begin(), strNewWalletPass.end(), '\0');
|
|
|
|
munlock(&strOldWalletPass[0], strOldWalletPass.capacity());
|
|
|
|
munlock(&strNewWalletPass[0], strNewWalletPass.capacity());
|
|
|
|
throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect.");
|
|
|
|
}
|
|
|
|
fill(strNewWalletPass.begin(), strNewWalletPass.end(), '\0');
|
|
|
|
fill(strOldWalletPass.begin(), strOldWalletPass.end(), '\0');
|
|
|
|
munlock(&strOldWalletPass[0], strOldWalletPass.capacity());
|
|
|
|
munlock(&strNewWalletPass[0], strNewWalletPass.capacity());
|
|
|
|
|
|
|
|
return Value::null;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-06-30 02:09:47 +02:00
|
|
|
Value walletlock(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (pwalletMain->IsCrypted() && (fHelp || params.size() != 0))
|
|
|
|
throw runtime_error(
|
|
|
|
"walletlock\n"
|
|
|
|
"Removes the wallet encryption key from memory, locking the wallet.\n"
|
|
|
|
"After calling this method, you will need to call walletpassphrase again\n"
|
|
|
|
"before being able to call any methods which require the wallet to be unlocked.");
|
|
|
|
if (fHelp)
|
|
|
|
return true;
|
|
|
|
if (!pwalletMain->IsCrypted())
|
|
|
|
throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletlock was called.");
|
|
|
|
|
|
|
|
pwalletMain->Lock();
|
|
|
|
CRITICAL_BLOCK(cs_nWalletUnlockTime)
|
|
|
|
{
|
|
|
|
nWalletUnlockTime = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return Value::null;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
Value encryptwallet(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (!pwalletMain->IsCrypted() && (fHelp || params.size() != 1))
|
|
|
|
throw runtime_error(
|
|
|
|
"encryptwallet <passphrase>\n"
|
|
|
|
"Encrypts the wallet with <passphrase>.");
|
|
|
|
if (fHelp)
|
|
|
|
return true;
|
|
|
|
if (pwalletMain->IsCrypted())
|
|
|
|
throw JSONRPCError(-15, "Error: running with an encrypted wallet, but encryptwallet was called.");
|
|
|
|
|
|
|
|
string strWalletPass;
|
|
|
|
strWalletPass.reserve(100);
|
|
|
|
mlock(&strWalletPass[0], strWalletPass.capacity());
|
|
|
|
strWalletPass = params[0].get_str();
|
|
|
|
|
|
|
|
if (strWalletPass.length() < 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"encryptwallet <passphrase>\n"
|
|
|
|
"Encrypts the wallet with <passphrase>.");
|
|
|
|
|
|
|
|
if (!pwalletMain->EncryptWallet(strWalletPass))
|
|
|
|
{
|
|
|
|
fill(strWalletPass.begin(), strWalletPass.end(), '\0');
|
|
|
|
munlock(&strWalletPass[0], strWalletPass.capacity());
|
|
|
|
throw JSONRPCError(-16, "Error: Failed to encrypt the wallet.");
|
|
|
|
}
|
|
|
|
fill(strWalletPass.begin(), strWalletPass.end(), '\0');
|
|
|
|
munlock(&strWalletPass[0], strWalletPass.capacity());
|
|
|
|
|
|
|
|
return Value::null;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-10-20 17:58:16 +02:00
|
|
|
Value validateaddress(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() != 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"validateaddress <bitcoinaddress>\n"
|
|
|
|
"Return information about <bitcoinaddress>.");
|
|
|
|
|
|
|
|
string strAddress = params[0].get_str();
|
2011-07-05 20:53:43 +02:00
|
|
|
CBitcoinAddress address(strAddress);
|
|
|
|
bool isValid = address.IsValid();
|
2010-09-06 23:03:04 +02:00
|
|
|
|
2010-10-20 17:58:16 +02:00
|
|
|
Object ret;
|
|
|
|
ret.push_back(Pair("isvalid", isValid));
|
|
|
|
if (isValid)
|
|
|
|
{
|
|
|
|
// Call Hash160ToAddress() so we always return current ADDRESSVERSION
|
|
|
|
// version of the address:
|
2011-07-05 20:53:43 +02:00
|
|
|
string currentAddress = address.ToString();
|
2010-11-22 16:53:20 +01:00
|
|
|
ret.push_back(Pair("address", currentAddress));
|
2011-07-05 20:53:43 +02:00
|
|
|
ret.push_back(Pair("ismine", (pwalletMain->HaveKey(address) > 0)));
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
CRITICAL_BLOCK(pwalletMain->cs_mapAddressBook)
|
2010-11-22 16:53:20 +01:00
|
|
|
{
|
2011-07-05 20:53:43 +02:00
|
|
|
if (pwalletMain->mapAddressBook.count(address))
|
|
|
|
ret.push_back(Pair("account", pwalletMain->mapAddressBook[address]));
|
2010-11-22 16:53:20 +01:00
|
|
|
}
|
2010-10-20 17:58:16 +02:00
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
|
2010-11-23 20:16:36 +01:00
|
|
|
Value getwork(const Array& params, bool fHelp)
|
|
|
|
{
|
|
|
|
if (fHelp || params.size() > 1)
|
|
|
|
throw runtime_error(
|
|
|
|
"getwork [data]\n"
|
|
|
|
"If [data] is not specified, returns formatted hash data to work on:\n"
|
|
|
|
" \"midstate\" : precomputed hash state after hashing the first half of the data\n"
|
|
|
|
" \"data\" : block data\n"
|
|
|
|
" \"hash1\" : formatted hash buffer for second hash\n"
|
|
|
|
" \"target\" : little endian hash target\n"
|
|
|
|
"If [data] is specified, tries to solve the block and returns true if it was successful.");
|
|
|
|
|
|
|
|
if (vNodes.empty())
|
|
|
|
throw JSONRPCError(-9, "Bitcoin is not connected!");
|
|
|
|
|
|
|
|
if (IsInitialBlockDownload())
|
|
|
|
throw JSONRPCError(-10, "Bitcoin is downloading blocks...");
|
|
|
|
|
|
|
|
static map<uint256, pair<CBlock*, unsigned int> > mapNewBlock;
|
|
|
|
static vector<CBlock*> vNewBlock;
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
static CReserveKey reservekey(pwalletMain);
|
2010-11-23 20:16:36 +01:00
|
|
|
|
|
|
|
if (params.size() == 0)
|
|
|
|
{
|
|
|
|
// Update block
|
|
|
|
static unsigned int nTransactionsUpdatedLast;
|
|
|
|
static CBlockIndex* pindexPrev;
|
|
|
|
static int64 nStart;
|
|
|
|
static CBlock* pblock;
|
|
|
|
if (pindexPrev != pindexBest ||
|
|
|
|
(nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60))
|
|
|
|
{
|
|
|
|
if (pindexPrev != pindexBest)
|
|
|
|
{
|
|
|
|
// Deallocate old blocks since they're obsolete now
|
|
|
|
mapNewBlock.clear();
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(CBlock* pblock, vNewBlock)
|
2010-11-23 20:16:36 +01:00
|
|
|
delete pblock;
|
|
|
|
vNewBlock.clear();
|
|
|
|
}
|
|
|
|
nTransactionsUpdatedLast = nTransactionsUpdated;
|
|
|
|
pindexPrev = pindexBest;
|
|
|
|
nStart = GetTime();
|
|
|
|
|
|
|
|
// Create new block
|
|
|
|
pblock = CreateNewBlock(reservekey);
|
|
|
|
if (!pblock)
|
|
|
|
throw JSONRPCError(-7, "Out of memory");
|
|
|
|
vNewBlock.push_back(pblock);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update nTime
|
|
|
|
pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
|
|
|
|
pblock->nNonce = 0;
|
|
|
|
|
|
|
|
// Update nExtraNonce
|
|
|
|
static unsigned int nExtraNonce = 0;
|
|
|
|
static int64 nPrevTime = 0;
|
|
|
|
IncrementExtraNonce(pblock, pindexPrev, nExtraNonce, nPrevTime);
|
|
|
|
|
|
|
|
// Save
|
|
|
|
mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, nExtraNonce);
|
|
|
|
|
|
|
|
// Prebuild hash buffers
|
|
|
|
char pmidstate[32];
|
|
|
|
char pdata[128];
|
|
|
|
char phash1[64];
|
|
|
|
FormatHashBuffers(pblock, pmidstate, pdata, phash1);
|
|
|
|
|
|
|
|
uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
|
|
|
|
|
|
|
|
Object result;
|
|
|
|
result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate))));
|
|
|
|
result.push_back(Pair("data", HexStr(BEGIN(pdata), END(pdata))));
|
|
|
|
result.push_back(Pair("hash1", HexStr(BEGIN(phash1), END(phash1))));
|
|
|
|
result.push_back(Pair("target", HexStr(BEGIN(hashTarget), END(hashTarget))));
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Parse parameters
|
|
|
|
vector<unsigned char> vchData = ParseHex(params[0].get_str());
|
|
|
|
if (vchData.size() != 128)
|
|
|
|
throw JSONRPCError(-8, "Invalid parameter");
|
|
|
|
CBlock* pdata = (CBlock*)&vchData[0];
|
|
|
|
|
|
|
|
// Byte reverse
|
|
|
|
for (int i = 0; i < 128/4; i++)
|
|
|
|
((unsigned int*)pdata)[i] = CryptoPP::ByteReverse(((unsigned int*)pdata)[i]);
|
|
|
|
|
|
|
|
// Get saved block
|
|
|
|
if (!mapNewBlock.count(pdata->hashMerkleRoot))
|
|
|
|
return false;
|
|
|
|
CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
|
|
|
|
unsigned int nExtraNonce = mapNewBlock[pdata->hashMerkleRoot].second;
|
|
|
|
|
|
|
|
pblock->nTime = pdata->nTime;
|
|
|
|
pblock->nNonce = pdata->nNonce;
|
|
|
|
pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nBits << CBigNum(nExtraNonce);
|
|
|
|
pblock->hashMerkleRoot = pblock->BuildMerkleTree();
|
|
|
|
|
CWallet class
* A new class CKeyStore manages private keys, and script.cpp depends on access to CKeyStore.
* A new class CWallet extends CKeyStore, and contains all former wallet-specific globals; CWallet depends on script.cpp, not the other way around.
* Wallet-specific functions in CTransaction/CTxIn/CTxOut (GetDebit, GetCredit, GetChange, IsMine, IsFromMe), are moved to CWallet, taking their former 'this' argument as an explicit parameter
* CWalletTx objects know which CWallet they belong to, for convenience, so they have their own direct (and caching) GetDebit/... functions.
* Some code was moved from CWalletDB to CWallet, such as handling of reserve keys.
* Main.cpp keeps a set of all 'registered' wallets, which should be informed about updates to the block chain, and does not have any notion about any 'main' wallet. Function in main.cpp that require a wallet (such as GenerateCoins), take an explicit CWallet* argument.
* The actual CWallet instance used by the application is defined in init.cpp as "CWallet* pwalletMain". rpc.cpp and ui.cpp use this variable.
* Functions in main.cpp and db.cpp that are not used by other modules are marked static.
* The code for handling the 'submitorder' message is removed, as it not really compatible with the idea that a node is independent from the wallet(s) connected to it, and obsolete anyway.
2011-06-01 18:28:20 +02:00
|
|
|
return CheckWork(pblock, *pwalletMain, reservekey);
|
2010-11-23 20:16:36 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// Call Table
|
|
|
|
//
|
|
|
|
|
|
|
|
pair<string, rpcfn_type> pCallTable[] =
|
|
|
|
{
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
make_pair("help", &help),
|
|
|
|
make_pair("stop", &stop),
|
|
|
|
make_pair("getblockcount", &getblockcount),
|
|
|
|
make_pair("getblocknumber", &getblocknumber),
|
|
|
|
make_pair("getconnectioncount", &getconnectioncount),
|
|
|
|
make_pair("getdifficulty", &getdifficulty),
|
|
|
|
make_pair("getgenerate", &getgenerate),
|
|
|
|
make_pair("setgenerate", &setgenerate),
|
|
|
|
make_pair("gethashespersec", &gethashespersec),
|
|
|
|
make_pair("getinfo", &getinfo),
|
|
|
|
make_pair("getnewaddress", &getnewaddress),
|
|
|
|
make_pair("getaccountaddress", &getaccountaddress),
|
|
|
|
make_pair("setaccount", &setaccount),
|
|
|
|
make_pair("setlabel", &setaccount), // deprecated
|
|
|
|
make_pair("getaccount", &getaccount),
|
|
|
|
make_pair("getlabel", &getaccount), // deprecated
|
|
|
|
make_pair("getaddressesbyaccount", &getaddressesbyaccount),
|
|
|
|
make_pair("getaddressesbylabel", &getaddressesbyaccount), // deprecated
|
|
|
|
make_pair("sendtoaddress", &sendtoaddress),
|
|
|
|
make_pair("getamountreceived", &getreceivedbyaddress), // deprecated, renamed to getreceivedbyaddress
|
|
|
|
make_pair("getallreceived", &listreceivedbyaddress), // deprecated, renamed to listreceivedbyaddress
|
|
|
|
make_pair("getreceivedbyaddress", &getreceivedbyaddress),
|
|
|
|
make_pair("getreceivedbyaccount", &getreceivedbyaccount),
|
|
|
|
make_pair("getreceivedbylabel", &getreceivedbyaccount), // deprecated
|
|
|
|
make_pair("listreceivedbyaddress", &listreceivedbyaddress),
|
|
|
|
make_pair("listreceivedbyaccount", &listreceivedbyaccount),
|
|
|
|
make_pair("listreceivedbylabel", &listreceivedbyaccount), // deprecated
|
|
|
|
make_pair("backupwallet", &backupwallet),
|
|
|
|
make_pair("keypoolrefill", &keypoolrefill),
|
|
|
|
make_pair("walletpassphrase", &walletpassphrase),
|
|
|
|
make_pair("walletpassphrasechange", &walletpassphrasechange),
|
2011-06-30 02:09:47 +02:00
|
|
|
make_pair("walletlock", &walletlock),
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
make_pair("encryptwallet", &encryptwallet),
|
|
|
|
make_pair("validateaddress", &validateaddress),
|
|
|
|
make_pair("getbalance", &getbalance),
|
|
|
|
make_pair("move", &movecmd),
|
|
|
|
make_pair("sendfrom", &sendfrom),
|
|
|
|
make_pair("sendmany", &sendmany),
|
|
|
|
make_pair("gettransaction", &gettransaction),
|
|
|
|
make_pair("listtransactions", &listtransactions),
|
|
|
|
make_pair("getwork", &getwork),
|
|
|
|
make_pair("listaccounts", &listaccounts),
|
|
|
|
make_pair("settxfee", &settxfee),
|
2010-08-29 18:58:15 +02:00
|
|
|
};
|
|
|
|
map<string, rpcfn_type> mapCallTable(pCallTable, pCallTable + sizeof(pCallTable)/sizeof(pCallTable[0]));
|
|
|
|
|
2010-12-12 19:38:02 +01:00
|
|
|
string pAllowInSafeMode[] =
|
|
|
|
{
|
|
|
|
"help",
|
|
|
|
"stop",
|
|
|
|
"getblockcount",
|
|
|
|
"getblocknumber",
|
|
|
|
"getconnectioncount",
|
|
|
|
"getdifficulty",
|
|
|
|
"getgenerate",
|
|
|
|
"setgenerate",
|
|
|
|
"gethashespersec",
|
|
|
|
"getinfo",
|
|
|
|
"getnewaddress",
|
|
|
|
"getaccountaddress",
|
|
|
|
"setlabel",
|
|
|
|
"getaccount",
|
|
|
|
"getlabel", // deprecated
|
|
|
|
"getaddressesbyaccount",
|
|
|
|
"getaddressesbylabel", // deprecated
|
|
|
|
"backupwallet",
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
"keypoolrefill",
|
|
|
|
"walletpassphrase",
|
2011-06-30 02:09:47 +02:00
|
|
|
"walletlock",
|
2010-12-12 19:38:02 +01:00
|
|
|
"validateaddress",
|
|
|
|
"getwork",
|
|
|
|
};
|
|
|
|
set<string> setAllowInSafeMode(pAllowInSafeMode, pAllowInSafeMode + sizeof(pAllowInSafeMode)/sizeof(pAllowInSafeMode[0]));
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
// HTTP protocol
|
|
|
|
//
|
|
|
|
// This ain't Apache. We're just using HTTP header for the length field
|
|
|
|
// and to be compatible with other JSON-RPC implementations.
|
|
|
|
//
|
|
|
|
|
|
|
|
string HTTPPost(const string& strMsg, const map<string,string>& mapRequestHeaders)
|
|
|
|
{
|
|
|
|
ostringstream s;
|
|
|
|
s << "POST / HTTP/1.1\r\n"
|
2011-04-13 21:16:38 +02:00
|
|
|
<< "User-Agent: bitcoin-json-rpc/" << FormatFullVersion() << "\r\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
<< "Host: 127.0.0.1\r\n"
|
|
|
|
<< "Content-Type: application/json\r\n"
|
|
|
|
<< "Content-Length: " << strMsg.size() << "\r\n"
|
|
|
|
<< "Accept: application/json\r\n";
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(const PAIRTYPE(string, string)& item, mapRequestHeaders)
|
2010-09-06 23:03:04 +02:00
|
|
|
s << item.first << ": " << item.second << "\r\n";
|
2010-08-29 18:58:15 +02:00
|
|
|
s << "\r\n" << strMsg;
|
|
|
|
|
|
|
|
return s.str();
|
|
|
|
}
|
|
|
|
|
2010-10-22 17:15:20 +02:00
|
|
|
string rfc1123Time()
|
|
|
|
{
|
2011-04-09 04:50:14 +02:00
|
|
|
char buffer[64];
|
2010-10-22 17:15:20 +02:00
|
|
|
time_t now;
|
|
|
|
time(&now);
|
|
|
|
struct tm* now_gmt = gmtime(&now);
|
2011-04-13 21:06:48 +02:00
|
|
|
string locale(setlocale(LC_TIME, NULL));
|
|
|
|
setlocale(LC_TIME, "C"); // we want posix (aka "C") weekday/month strings
|
|
|
|
strftime(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S +0000", now_gmt);
|
|
|
|
setlocale(LC_TIME, locale.c_str());
|
2010-10-22 17:15:20 +02:00
|
|
|
return string(buffer);
|
|
|
|
}
|
|
|
|
|
2011-06-24 19:26:47 +02:00
|
|
|
static string HTTPReply(int nStatus, const string& strMsg)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
if (nStatus == 401)
|
2010-10-22 17:15:20 +02:00
|
|
|
return strprintf("HTTP/1.0 401 Authorization Required\r\n"
|
|
|
|
"Date: %s\r\n"
|
2011-04-13 21:16:38 +02:00
|
|
|
"Server: bitcoin-json-rpc/%s\r\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
"WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
|
|
|
|
"Content-Type: text/html\r\n"
|
2010-12-16 02:06:03 +01:00
|
|
|
"Content-Length: 296\r\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
"\r\n"
|
|
|
|
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\r\n"
|
|
|
|
"\"http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd\">\r\n"
|
|
|
|
"<HTML>\r\n"
|
|
|
|
"<HEAD>\r\n"
|
|
|
|
"<TITLE>Error</TITLE>\r\n"
|
|
|
|
"<META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>\r\n"
|
|
|
|
"</HEAD>\r\n"
|
|
|
|
"<BODY><H1>401 Unauthorized.</H1></BODY>\r\n"
|
2011-04-13 21:16:38 +02:00
|
|
|
"</HTML>\r\n", rfc1123Time().c_str(), FormatFullVersion().c_str());
|
2010-08-29 18:58:15 +02:00
|
|
|
string strStatus;
|
2010-09-06 23:03:04 +02:00
|
|
|
if (nStatus == 200) strStatus = "OK";
|
|
|
|
else if (nStatus == 400) strStatus = "Bad Request";
|
2011-06-24 19:26:47 +02:00
|
|
|
else if (nStatus == 403) strStatus = "Forbidden";
|
2010-09-06 23:03:04 +02:00
|
|
|
else if (nStatus == 404) strStatus = "Not Found";
|
|
|
|
else if (nStatus == 500) strStatus = "Internal Server Error";
|
2010-08-29 18:58:15 +02:00
|
|
|
return strprintf(
|
|
|
|
"HTTP/1.1 %d %s\r\n"
|
2010-10-22 17:15:20 +02:00
|
|
|
"Date: %s\r\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
"Connection: close\r\n"
|
|
|
|
"Content-Length: %d\r\n"
|
|
|
|
"Content-Type: application/json\r\n"
|
2011-04-13 21:16:38 +02:00
|
|
|
"Server: bitcoin-json-rpc/%s\r\n"
|
2010-08-29 18:58:15 +02:00
|
|
|
"\r\n"
|
|
|
|
"%s",
|
|
|
|
nStatus,
|
|
|
|
strStatus.c_str(),
|
2010-10-22 17:15:20 +02:00
|
|
|
rfc1123Time().c_str(),
|
2010-08-29 18:58:15 +02:00
|
|
|
strMsg.size(),
|
2011-04-13 21:16:38 +02:00
|
|
|
FormatFullVersion().c_str(),
|
2010-08-29 18:58:15 +02:00
|
|
|
strMsg.c_str());
|
|
|
|
}
|
|
|
|
|
2010-10-11 20:23:41 +02:00
|
|
|
int ReadHTTPStatus(std::basic_istream<char>& stream)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
string str;
|
|
|
|
getline(stream, str);
|
|
|
|
vector<string> vWords;
|
|
|
|
boost::split(vWords, str, boost::is_any_of(" "));
|
2010-09-16 00:10:13 +02:00
|
|
|
if (vWords.size() < 2)
|
|
|
|
return 500;
|
|
|
|
return atoi(vWords[1].c_str());
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
2010-10-11 20:23:41 +02:00
|
|
|
int ReadHTTPHeader(std::basic_istream<char>& stream, map<string, string>& mapHeadersRet)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
int nLen = 0;
|
|
|
|
loop
|
|
|
|
{
|
|
|
|
string str;
|
|
|
|
std::getline(stream, str);
|
|
|
|
if (str.empty() || str == "\r")
|
|
|
|
break;
|
|
|
|
string::size_type nColon = str.find(":");
|
|
|
|
if (nColon != string::npos)
|
|
|
|
{
|
|
|
|
string strHeader = str.substr(0, nColon);
|
|
|
|
boost::trim(strHeader);
|
2011-05-08 23:10:33 +02:00
|
|
|
boost::to_lower(strHeader);
|
2010-08-29 18:58:15 +02:00
|
|
|
string strValue = str.substr(nColon+1);
|
|
|
|
boost::trim(strValue);
|
|
|
|
mapHeadersRet[strHeader] = strValue;
|
2011-05-08 23:10:33 +02:00
|
|
|
if (strHeader == "content-length")
|
2010-08-29 18:58:15 +02:00
|
|
|
nLen = atoi(strValue.c_str());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nLen;
|
|
|
|
}
|
|
|
|
|
2010-10-11 20:23:41 +02:00
|
|
|
int ReadHTTP(std::basic_istream<char>& stream, map<string, string>& mapHeadersRet, string& strMessageRet)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
mapHeadersRet.clear();
|
|
|
|
strMessageRet = "";
|
|
|
|
|
|
|
|
// Read status
|
|
|
|
int nStatus = ReadHTTPStatus(stream);
|
|
|
|
|
|
|
|
// Read header
|
|
|
|
int nLen = ReadHTTPHeader(stream, mapHeadersRet);
|
2010-09-06 23:03:04 +02:00
|
|
|
if (nLen < 0 || nLen > MAX_SIZE)
|
2010-08-29 18:58:15 +02:00
|
|
|
return 500;
|
|
|
|
|
|
|
|
// Read message
|
2010-09-06 23:03:04 +02:00
|
|
|
if (nLen > 0)
|
|
|
|
{
|
|
|
|
vector<char> vch(nLen);
|
|
|
|
stream.read(&vch[0], nLen);
|
|
|
|
strMessageRet = string(vch.begin(), vch.end());
|
|
|
|
}
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
return nStatus;
|
|
|
|
}
|
|
|
|
|
|
|
|
string EncodeBase64(string s)
|
|
|
|
{
|
|
|
|
BIO *b64, *bmem;
|
|
|
|
BUF_MEM *bptr;
|
|
|
|
|
|
|
|
b64 = BIO_new(BIO_f_base64());
|
|
|
|
BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
|
|
|
|
bmem = BIO_new(BIO_s_mem());
|
|
|
|
b64 = BIO_push(b64, bmem);
|
|
|
|
BIO_write(b64, s.c_str(), s.size());
|
|
|
|
BIO_flush(b64);
|
|
|
|
BIO_get_mem_ptr(b64, &bptr);
|
|
|
|
|
|
|
|
string result(bptr->data, bptr->length);
|
|
|
|
BIO_free_all(b64);
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
string DecodeBase64(string s)
|
|
|
|
{
|
|
|
|
BIO *b64, *bmem;
|
|
|
|
|
|
|
|
char* buffer = static_cast<char*>(calloc(s.size(), sizeof(char)));
|
|
|
|
|
|
|
|
b64 = BIO_new(BIO_f_base64());
|
|
|
|
BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
|
|
|
|
bmem = BIO_new_mem_buf(const_cast<char*>(s.c_str()), s.size());
|
|
|
|
bmem = BIO_push(b64, bmem);
|
|
|
|
BIO_read(bmem, buffer, s.size());
|
|
|
|
BIO_free_all(bmem);
|
|
|
|
|
|
|
|
string result(buffer);
|
|
|
|
free(buffer);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool HTTPAuthorized(map<string, string>& mapHeaders)
|
|
|
|
{
|
2011-05-08 23:10:33 +02:00
|
|
|
string strAuth = mapHeaders["authorization"];
|
2010-08-29 18:58:15 +02:00
|
|
|
if (strAuth.substr(0,6) != "Basic ")
|
|
|
|
return false;
|
|
|
|
string strUserPass64 = strAuth.substr(6); boost::trim(strUserPass64);
|
|
|
|
string strUserPass = DecodeBase64(strUserPass64);
|
|
|
|
string::size_type nColon = strUserPass.find(":");
|
|
|
|
if (nColon == string::npos)
|
|
|
|
return false;
|
|
|
|
string strUser = strUserPass.substr(0, nColon);
|
|
|
|
string strPassword = strUserPass.substr(nColon+1);
|
|
|
|
return (strUser == mapArgs["-rpcuser"] && strPassword == mapArgs["-rpcpassword"]);
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
2010-09-06 23:03:04 +02:00
|
|
|
// JSON-RPC protocol. Bitcoin speaks version 1.0 for maximum compatibility,
|
|
|
|
// but uses JSON-RPC 1.1/2.0 standards for parts of the 1.0 standard that were
|
|
|
|
// unspecified (HTTP errors and contents of 'error').
|
2010-08-29 18:58:15 +02:00
|
|
|
//
|
2010-09-06 23:03:04 +02:00
|
|
|
// 1.0 spec: http://json-rpc.org/wiki/specification
|
|
|
|
// 1.2 spec: http://groups.google.com/group/json-rpc/web/json-rpc-over-http
|
2010-08-29 18:58:15 +02:00
|
|
|
// http://www.codeproject.com/KB/recipes/JSON_Spirit.aspx
|
|
|
|
//
|
|
|
|
|
|
|
|
string JSONRPCRequest(const string& strMethod, const Array& params, const Value& id)
|
|
|
|
{
|
|
|
|
Object request;
|
|
|
|
request.push_back(Pair("method", strMethod));
|
|
|
|
request.push_back(Pair("params", params));
|
|
|
|
request.push_back(Pair("id", id));
|
|
|
|
return write_string(Value(request), false) + "\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
string JSONRPCReply(const Value& result, const Value& error, const Value& id)
|
|
|
|
{
|
|
|
|
Object reply;
|
|
|
|
if (error.type() != null_type)
|
|
|
|
reply.push_back(Pair("result", Value::null));
|
|
|
|
else
|
|
|
|
reply.push_back(Pair("result", result));
|
|
|
|
reply.push_back(Pair("error", error));
|
|
|
|
reply.push_back(Pair("id", id));
|
|
|
|
return write_string(Value(reply), false) + "\n";
|
|
|
|
}
|
|
|
|
|
2010-12-16 02:06:03 +01:00
|
|
|
void ErrorReply(std::ostream& stream, const Object& objError, const Value& id)
|
|
|
|
{
|
|
|
|
// Send error reply from json-rpc error object
|
|
|
|
int nStatus = 500;
|
|
|
|
int code = find_value(objError, "code").get_int();
|
|
|
|
if (code == -32600) nStatus = 400;
|
|
|
|
else if (code == -32601) nStatus = 404;
|
|
|
|
string strReply = JSONRPCReply(Value::null, objError, id);
|
|
|
|
stream << HTTPReply(nStatus, strReply) << std::flush;
|
|
|
|
}
|
|
|
|
|
2010-09-16 00:10:13 +02:00
|
|
|
bool ClientAllowed(const string& strAddress)
|
|
|
|
{
|
|
|
|
if (strAddress == asio::ip::address_v4::loopback().to_string())
|
|
|
|
return true;
|
|
|
|
const vector<string>& vAllow = mapMultiArgs["-rpcallowip"];
|
2011-05-15 09:11:04 +02:00
|
|
|
BOOST_FOREACH(string strAllow, vAllow)
|
2010-09-16 00:10:13 +02:00
|
|
|
if (WildcardMatch(strAddress, strAllow))
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-10-11 20:23:41 +02:00
|
|
|
#ifdef USE_SSL
|
|
|
|
//
|
|
|
|
// IOStream device that speaks SSL but can also speak non-SSL
|
|
|
|
//
|
|
|
|
class SSLIOStreamDevice : public iostreams::device<iostreams::bidirectional> {
|
|
|
|
public:
|
|
|
|
SSLIOStreamDevice(SSLStream &streamIn, bool fUseSSLIn) : stream(streamIn)
|
|
|
|
{
|
|
|
|
fUseSSL = fUseSSLIn;
|
|
|
|
fNeedHandshake = fUseSSLIn;
|
|
|
|
}
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2010-10-11 20:23:41 +02:00
|
|
|
void handshake(ssl::stream_base::handshake_type role)
|
|
|
|
{
|
|
|
|
if (!fNeedHandshake) return;
|
|
|
|
fNeedHandshake = false;
|
|
|
|
stream.handshake(role);
|
|
|
|
}
|
|
|
|
std::streamsize read(char* s, std::streamsize n)
|
|
|
|
{
|
|
|
|
handshake(ssl::stream_base::server); // HTTPS servers read first
|
|
|
|
if (fUseSSL) return stream.read_some(asio::buffer(s, n));
|
|
|
|
return stream.next_layer().read_some(asio::buffer(s, n));
|
|
|
|
}
|
|
|
|
std::streamsize write(const char* s, std::streamsize n)
|
|
|
|
{
|
|
|
|
handshake(ssl::stream_base::client); // HTTPS clients write first
|
|
|
|
if (fUseSSL) return asio::write(stream, asio::buffer(s, n));
|
|
|
|
return asio::write(stream.next_layer(), asio::buffer(s, n));
|
|
|
|
}
|
|
|
|
bool connect(const std::string& server, const std::string& port)
|
|
|
|
{
|
|
|
|
ip::tcp::resolver resolver(stream.get_io_service());
|
|
|
|
ip::tcp::resolver::query query(server.c_str(), port.c_str());
|
|
|
|
ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
|
|
|
|
ip::tcp::resolver::iterator end;
|
|
|
|
boost::system::error_code error = asio::error::host_not_found;
|
|
|
|
while (error && endpoint_iterator != end)
|
|
|
|
{
|
|
|
|
stream.lowest_layer().close();
|
|
|
|
stream.lowest_layer().connect(*endpoint_iterator++, error);
|
|
|
|
}
|
|
|
|
if (error)
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2010-10-11 20:23:41 +02:00
|
|
|
private:
|
|
|
|
bool fNeedHandshake;
|
|
|
|
bool fUseSSL;
|
|
|
|
SSLStream& stream;
|
|
|
|
};
|
|
|
|
#endif
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
void ThreadRPCServer(void* parg)
|
|
|
|
{
|
|
|
|
IMPLEMENT_RANDOMIZE_STACK(ThreadRPCServer(parg));
|
|
|
|
try
|
|
|
|
{
|
|
|
|
vnThreadsRunning[4]++;
|
|
|
|
ThreadRPCServer2(parg);
|
|
|
|
vnThreadsRunning[4]--;
|
|
|
|
}
|
|
|
|
catch (std::exception& e) {
|
|
|
|
vnThreadsRunning[4]--;
|
|
|
|
PrintException(&e, "ThreadRPCServer()");
|
|
|
|
} catch (...) {
|
|
|
|
vnThreadsRunning[4]--;
|
|
|
|
PrintException(NULL, "ThreadRPCServer()");
|
|
|
|
}
|
|
|
|
printf("ThreadRPCServer exiting\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
void ThreadRPCServer2(void* parg)
|
|
|
|
{
|
|
|
|
printf("ThreadRPCServer started\n");
|
|
|
|
|
|
|
|
if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
|
|
|
|
{
|
|
|
|
string strWhatAmI = "To use bitcoind";
|
|
|
|
if (mapArgs.count("-server"))
|
|
|
|
strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
|
|
|
|
else if (mapArgs.count("-daemon"))
|
|
|
|
strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\"");
|
|
|
|
PrintConsole(
|
|
|
|
_("Warning: %s, you must set rpcpassword=<password>\nin the configuration file: %s\n"
|
|
|
|
"If the file does not exist, create it with owner-readable-only file permissions.\n"),
|
|
|
|
strWhatAmI.c_str(),
|
|
|
|
GetConfigFile().c_str());
|
|
|
|
CreateThread(Shutdown, NULL);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-12-03 20:38:09 +01:00
|
|
|
bool fUseSSL = GetBoolArg("-rpcssl");
|
2010-10-11 20:23:41 +02:00
|
|
|
asio::ip::address bindAddress = mapArgs.count("-rpcallowip") ? asio::ip::address_v4::any() : asio::ip::address_v4::loopback();
|
|
|
|
|
|
|
|
asio::io_service io_service;
|
|
|
|
ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 8332));
|
|
|
|
ip::tcp::acceptor acceptor(io_service, endpoint);
|
|
|
|
|
2011-02-10 09:25:42 +01:00
|
|
|
acceptor.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
|
|
|
|
|
2010-10-11 20:23:41 +02:00
|
|
|
#ifdef USE_SSL
|
|
|
|
ssl::context context(io_service, ssl::context::sslv23);
|
|
|
|
if (fUseSSL)
|
|
|
|
{
|
|
|
|
context.set_options(ssl::context::no_sslv2);
|
|
|
|
filesystem::path certfile = GetArg("-rpcsslcertificatechainfile", "server.cert");
|
|
|
|
if (!certfile.is_complete()) certfile = filesystem::path(GetDataDir()) / certfile;
|
|
|
|
if (filesystem::exists(certfile)) context.use_certificate_chain_file(certfile.string().c_str());
|
|
|
|
else printf("ThreadRPCServer ERROR: missing server certificate file %s\n", certfile.string().c_str());
|
|
|
|
filesystem::path pkfile = GetArg("-rpcsslprivatekeyfile", "server.pem");
|
|
|
|
if (!pkfile.is_complete()) pkfile = filesystem::path(GetDataDir()) / pkfile;
|
|
|
|
if (filesystem::exists(pkfile)) context.use_private_key_file(pkfile.string().c_str(), ssl::context::pem);
|
|
|
|
else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pkfile.string().c_str());
|
|
|
|
|
|
|
|
string ciphers = GetArg("-rpcsslciphers",
|
|
|
|
"TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH");
|
|
|
|
SSL_CTX_set_cipher_list(context.impl(), ciphers.c_str());
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
if (fUseSSL)
|
2010-12-03 20:38:09 +01:00
|
|
|
throw runtime_error("-rpcssl=1, but bitcoin compiled without full openssl libraries.");
|
2010-10-11 20:23:41 +02:00
|
|
|
#endif
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
loop
|
|
|
|
{
|
|
|
|
// Accept connection
|
2010-10-11 20:23:41 +02:00
|
|
|
#ifdef USE_SSL
|
|
|
|
SSLStream sslStream(io_service, context);
|
|
|
|
SSLIOStreamDevice d(sslStream, fUseSSL);
|
|
|
|
iostreams::stream<SSLIOStreamDevice> stream(d);
|
|
|
|
#else
|
|
|
|
ip::tcp::iostream stream;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
ip::tcp::endpoint peer;
|
2010-08-29 18:58:15 +02:00
|
|
|
vnThreadsRunning[4]--;
|
2010-10-11 20:23:41 +02:00
|
|
|
#ifdef USE_SSL
|
|
|
|
acceptor.accept(sslStream.lowest_layer(), peer);
|
|
|
|
#else
|
2010-08-29 18:58:15 +02:00
|
|
|
acceptor.accept(*stream.rdbuf(), peer);
|
2010-10-11 20:23:41 +02:00
|
|
|
#endif
|
2010-08-29 18:58:15 +02:00
|
|
|
vnThreadsRunning[4]++;
|
|
|
|
if (fShutdown)
|
|
|
|
return;
|
|
|
|
|
2010-09-16 00:10:13 +02:00
|
|
|
// Restrict callers by IP
|
|
|
|
if (!ClientAllowed(peer.address().to_string()))
|
2011-06-24 19:26:47 +02:00
|
|
|
{
|
2011-06-25 04:31:48 +02:00
|
|
|
// Only send a 403 if we're not using SSL to prevent a DoS during the SSL handshake.
|
|
|
|
if (!fUseSSL)
|
|
|
|
stream << HTTPReply(403, "") << std::flush;
|
2010-08-29 18:58:15 +02:00
|
|
|
continue;
|
2011-06-24 19:26:47 +02:00
|
|
|
}
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
map<string, string> mapHeaders;
|
|
|
|
string strRequest;
|
2010-12-16 02:06:03 +01:00
|
|
|
|
2011-02-11 01:24:22 +01:00
|
|
|
boost::thread api_caller(ReadHTTP, boost::ref(stream), boost::ref(mapHeaders), boost::ref(strRequest));
|
2010-12-16 02:06:03 +01:00
|
|
|
if (!api_caller.timed_join(boost::posix_time::seconds(GetArg("-rpctimeout", 30))))
|
|
|
|
{ // Timed out:
|
|
|
|
acceptor.cancel();
|
|
|
|
printf("ThreadRPCServer ReadHTTP timeout\n");
|
|
|
|
continue;
|
|
|
|
}
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
// Check authorization
|
2011-05-08 23:10:33 +02:00
|
|
|
if (mapHeaders.count("authorization") == 0)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2010-09-06 23:03:04 +02:00
|
|
|
stream << HTTPReply(401, "") << std::flush;
|
2010-08-29 18:58:15 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!HTTPAuthorized(mapHeaders))
|
|
|
|
{
|
|
|
|
// Deter brute-forcing short passwords
|
|
|
|
if (mapArgs["-rpcpassword"].size() < 15)
|
|
|
|
Sleep(50);
|
|
|
|
|
2010-09-06 23:03:04 +02:00
|
|
|
stream << HTTPReply(401, "") << std::flush;
|
2010-08-29 18:58:15 +02:00
|
|
|
printf("ThreadRPCServer incorrect password attempt\n");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-09-06 23:03:04 +02:00
|
|
|
Value id = Value::null;
|
|
|
|
try
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2010-09-06 23:03:04 +02:00
|
|
|
// Parse request
|
|
|
|
Value valRequest;
|
|
|
|
if (!read_string(strRequest, valRequest) || valRequest.type() != obj_type)
|
|
|
|
throw JSONRPCError(-32700, "Parse error");
|
|
|
|
const Object& request = valRequest.get_obj();
|
|
|
|
|
|
|
|
// Parse id now so errors from here on will have the id
|
|
|
|
id = find_value(request, "id");
|
|
|
|
|
|
|
|
// Parse method
|
|
|
|
Value valMethod = find_value(request, "method");
|
|
|
|
if (valMethod.type() == null_type)
|
|
|
|
throw JSONRPCError(-32600, "Missing method");
|
|
|
|
if (valMethod.type() != str_type)
|
|
|
|
throw JSONRPCError(-32600, "Method must be a string");
|
|
|
|
string strMethod = valMethod.get_str();
|
2010-11-23 20:16:36 +01:00
|
|
|
if (strMethod != "getwork")
|
|
|
|
printf("ThreadRPCServer method=%s\n", strMethod.c_str());
|
2010-09-06 23:03:04 +02:00
|
|
|
|
|
|
|
// Parse params
|
|
|
|
Value valParams = find_value(request, "params");
|
|
|
|
Array params;
|
|
|
|
if (valParams.type() == array_type)
|
|
|
|
params = valParams.get_array();
|
|
|
|
else if (valParams.type() == null_type)
|
|
|
|
params = Array();
|
|
|
|
else
|
|
|
|
throw JSONRPCError(-32600, "Params must be an array");
|
|
|
|
|
|
|
|
// Find method
|
|
|
|
map<string, rpcfn_type>::iterator mi = mapCallTable.find(strMethod);
|
|
|
|
if (mi == mapCallTable.end())
|
|
|
|
throw JSONRPCError(-32601, "Method not found");
|
|
|
|
|
2010-12-12 19:38:02 +01:00
|
|
|
// Observe safe mode
|
|
|
|
string strWarning = GetWarnings("rpc");
|
|
|
|
if (strWarning != "" && !GetBoolArg("-disablesafemode") && !setAllowInSafeMode.count(strMethod))
|
|
|
|
throw JSONRPCError(-2, string("Safe mode: ") + strWarning);
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
try
|
|
|
|
{
|
|
|
|
// Execute
|
|
|
|
Value result = (*(*mi).second)(params, false);
|
|
|
|
|
|
|
|
// Send reply
|
|
|
|
string strReply = JSONRPCReply(result, Value::null, id);
|
2010-09-06 23:03:04 +02:00
|
|
|
stream << HTTPReply(200, strReply) << std::flush;
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
catch (std::exception& e)
|
|
|
|
{
|
2010-12-16 02:06:03 +01:00
|
|
|
ErrorReply(stream, JSONRPCError(-1, e.what()), id);
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
2010-09-06 23:03:04 +02:00
|
|
|
}
|
|
|
|
catch (Object& objError)
|
|
|
|
{
|
2010-12-16 02:06:03 +01:00
|
|
|
ErrorReply(stream, objError, id);
|
2010-09-06 23:03:04 +02:00
|
|
|
}
|
|
|
|
catch (std::exception& e)
|
|
|
|
{
|
2010-12-16 02:06:03 +01:00
|
|
|
ErrorReply(stream, JSONRPCError(-32700, e.what()), id);
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2010-09-06 23:03:04 +02:00
|
|
|
Object CallRPC(const string& strMethod, const Array& params)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
|
|
|
if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
|
|
|
|
throw runtime_error(strprintf(
|
|
|
|
_("You must set rpcpassword=<password> in the configuration file:\n%s\n"
|
|
|
|
"If the file does not exist, create it with owner-readable-only file permissions."),
|
|
|
|
GetConfigFile().c_str()));
|
|
|
|
|
|
|
|
// Connect to localhost
|
2010-12-03 20:38:09 +01:00
|
|
|
bool fUseSSL = GetBoolArg("-rpcssl");
|
2010-10-11 20:23:41 +02:00
|
|
|
#ifdef USE_SSL
|
|
|
|
asio::io_service io_service;
|
|
|
|
ssl::context context(io_service, ssl::context::sslv23);
|
|
|
|
context.set_options(ssl::context::no_sslv2);
|
|
|
|
SSLStream sslStream(io_service, context);
|
|
|
|
SSLIOStreamDevice d(sslStream, fUseSSL);
|
|
|
|
iostreams::stream<SSLIOStreamDevice> stream(d);
|
|
|
|
if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "8332")))
|
|
|
|
throw runtime_error("couldn't connect to server");
|
|
|
|
#else
|
|
|
|
if (fUseSSL)
|
2010-12-03 20:38:09 +01:00
|
|
|
throw runtime_error("-rpcssl=1, but bitcoin compiled without full openssl libraries.");
|
2010-10-11 20:23:41 +02:00
|
|
|
|
|
|
|
ip::tcp::iostream stream(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "8332"));
|
2010-08-29 18:58:15 +02:00
|
|
|
if (stream.fail())
|
|
|
|
throw runtime_error("couldn't connect to server");
|
2010-10-11 20:23:41 +02:00
|
|
|
#endif
|
|
|
|
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
// HTTP basic authentication
|
|
|
|
string strUserPass64 = EncodeBase64(mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"]);
|
|
|
|
map<string, string> mapRequestHeaders;
|
|
|
|
mapRequestHeaders["Authorization"] = string("Basic ") + strUserPass64;
|
|
|
|
|
|
|
|
// Send request
|
|
|
|
string strRequest = JSONRPCRequest(strMethod, params, 1);
|
|
|
|
string strPost = HTTPPost(strRequest, mapRequestHeaders);
|
|
|
|
stream << strPost << std::flush;
|
|
|
|
|
|
|
|
// Receive reply
|
|
|
|
map<string, string> mapHeaders;
|
|
|
|
string strReply;
|
|
|
|
int nStatus = ReadHTTP(stream, mapHeaders, strReply);
|
|
|
|
if (nStatus == 401)
|
|
|
|
throw runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
|
2010-09-06 23:03:04 +02:00
|
|
|
else if (nStatus >= 400 && nStatus != 400 && nStatus != 404 && nStatus != 500)
|
2010-08-29 18:58:15 +02:00
|
|
|
throw runtime_error(strprintf("server returned HTTP error %d", nStatus));
|
|
|
|
else if (strReply.empty())
|
|
|
|
throw runtime_error("no response from server");
|
|
|
|
|
|
|
|
// Parse reply
|
|
|
|
Value valReply;
|
|
|
|
if (!read_string(strReply, valReply))
|
|
|
|
throw runtime_error("couldn't parse reply from server");
|
|
|
|
const Object& reply = valReply.get_obj();
|
|
|
|
if (reply.empty())
|
|
|
|
throw runtime_error("expected reply to have result, error and id properties");
|
|
|
|
|
2010-09-06 23:03:04 +02:00
|
|
|
return reply;
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
template<typename T>
|
|
|
|
void ConvertTo(Value& value)
|
|
|
|
{
|
|
|
|
if (value.type() == str_type)
|
|
|
|
{
|
|
|
|
// reinterpret string as unquoted json value
|
|
|
|
Value value2;
|
|
|
|
if (!read_string(value.get_str(), value2))
|
|
|
|
throw runtime_error("type mismatch");
|
|
|
|
value = value2.get_value<T>();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
value = value.get_value<T>();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int CommandLineRPC(int argc, char *argv[])
|
|
|
|
{
|
2010-09-06 23:03:04 +02:00
|
|
|
string strPrint;
|
|
|
|
int nRet = 0;
|
2010-08-29 18:58:15 +02:00
|
|
|
try
|
|
|
|
{
|
|
|
|
// Skip switches
|
|
|
|
while (argc > 1 && IsSwitchChar(argv[1][0]))
|
|
|
|
{
|
|
|
|
argc--;
|
|
|
|
argv++;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Method
|
|
|
|
if (argc < 2)
|
|
|
|
throw runtime_error("too few parameters");
|
|
|
|
string strMethod = argv[1];
|
|
|
|
|
|
|
|
// Parameters default to strings
|
|
|
|
Array params;
|
|
|
|
for (int i = 2; i < argc; i++)
|
|
|
|
params.push_back(argv[i]);
|
|
|
|
int n = params.size();
|
|
|
|
|
|
|
|
//
|
|
|
|
// Special case non-string parameter types
|
|
|
|
//
|
|
|
|
if (strMethod == "setgenerate" && n > 0) ConvertTo<bool>(params[0]);
|
|
|
|
if (strMethod == "setgenerate" && n > 1) ConvertTo<boost::int64_t>(params[1]);
|
|
|
|
if (strMethod == "sendtoaddress" && n > 1) ConvertTo<double>(params[1]);
|
2011-05-09 20:35:30 +02:00
|
|
|
if (strMethod == "settxfee" && n > 0) ConvertTo<double>(params[0]);
|
2010-08-29 18:58:15 +02:00
|
|
|
if (strMethod == "getamountreceived" && n > 1) ConvertTo<boost::int64_t>(params[1]); // deprecated
|
|
|
|
if (strMethod == "getreceivedbyaddress" && n > 1) ConvertTo<boost::int64_t>(params[1]);
|
2010-11-22 16:53:20 +01:00
|
|
|
if (strMethod == "getreceivedbyaccount" && n > 1) ConvertTo<boost::int64_t>(params[1]);
|
|
|
|
if (strMethod == "getreceivedbylabel" && n > 1) ConvertTo<boost::int64_t>(params[1]); // deprecated
|
2010-08-29 18:58:15 +02:00
|
|
|
if (strMethod == "getallreceived" && n > 0) ConvertTo<boost::int64_t>(params[0]); // deprecated
|
|
|
|
if (strMethod == "getallreceived" && n > 1) ConvertTo<bool>(params[1]);
|
|
|
|
if (strMethod == "listreceivedbyaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]);
|
|
|
|
if (strMethod == "listreceivedbyaddress" && n > 1) ConvertTo<bool>(params[1]);
|
2010-11-22 16:53:20 +01:00
|
|
|
if (strMethod == "listreceivedbyaccount" && n > 0) ConvertTo<boost::int64_t>(params[0]);
|
|
|
|
if (strMethod == "listreceivedbyaccount" && n > 1) ConvertTo<bool>(params[1]);
|
|
|
|
if (strMethod == "listreceivedbylabel" && n > 0) ConvertTo<boost::int64_t>(params[0]); // deprecated
|
|
|
|
if (strMethod == "listreceivedbylabel" && n > 1) ConvertTo<bool>(params[1]); // deprecated
|
|
|
|
if (strMethod == "getbalance" && n > 1) ConvertTo<boost::int64_t>(params[1]);
|
|
|
|
if (strMethod == "move" && n > 2) ConvertTo<double>(params[2]);
|
|
|
|
if (strMethod == "move" && n > 3) ConvertTo<boost::int64_t>(params[3]);
|
|
|
|
if (strMethod == "sendfrom" && n > 2) ConvertTo<double>(params[2]);
|
|
|
|
if (strMethod == "sendfrom" && n > 3) ConvertTo<boost::int64_t>(params[3]);
|
2010-11-30 19:58:11 +01:00
|
|
|
if (strMethod == "listtransactions" && n > 1) ConvertTo<boost::int64_t>(params[1]);
|
2011-05-07 18:34:32 +02:00
|
|
|
if (strMethod == "listtransactions" && n > 2) ConvertTo<boost::int64_t>(params[2]);
|
2011-01-10 19:54:39 +01:00
|
|
|
if (strMethod == "listaccounts" && n > 0) ConvertTo<boost::int64_t>(params[0]);
|
Add wallet privkey encryption.
This commit adds support for ckeys, or enCrypted private keys, to the wallet.
All keys are stored in memory in their encrypted form and thus the passphrase
is required from the user to spend coins, or to create new addresses.
Keys are encrypted with AES-256-CBC using OpenSSL's EVP library. The key is
calculated via EVP_BytesToKey using SHA512 with (by default) 25000 rounds and
a random salt.
By default, the user's wallet remains unencrypted until they call the RPC
command encryptwallet <passphrase> or, from the GUI menu, Options->
Encrypt Wallet.
When the user is attempting to call RPC functions which require the password
to unlock the wallet, an error will be returned unless they call
walletpassphrase <passphrase> <time to keep key in memory> first.
A keypoolrefill command has been added which tops up the users keypool
(requiring the passphrase via walletpassphrase first).
keypoolsize has been added to the output of getinfo to show the user the
number of keys left before they need to specify their passphrase (and call
keypoolrefill).
Note that walletpassphrase will automatically fill keypool in a separate
thread which it spawns when the passphrase is set. This could cause some
delays in other threads waiting for locks on the wallet passphrase, including
one which could cause the passphrase to be stored longer than expected,
however it will not allow the passphrase to be used longer than expected as
ThreadCleanWalletPassphrase will attempt to get a lock on the key as soon
as the specified lock time has arrived.
When the keypool runs out (and wallet is locked) GetOrReuseKeyFromPool
returns vchDefaultKey, meaning miners may start to generate many blocks to
vchDefaultKey instead of a new key each time.
A walletpassphrasechange <oldpassphrase> <newpassphrase> has been added to
allow the user to change their password via RPC.
Whenever keying material (unencrypted private keys, the user's passphrase,
the wallet's AES key) is stored unencrypted in memory, any reasonable attempt
is made to mlock/VirtualLock that memory before storing the keying material.
This is not true in several (commented) cases where mlock/VirtualLocking the
memory is not possible.
Although encryption of private keys in memory can be very useful on desktop
systems (as some small amount of protection against stupid viruses), on an
RPC server, the password is entered fairly insecurely. Thus, the only main
advantage encryption has for RPC servers is for RPC servers that do not spend
coins, except in rare cases, eg. a webserver of a merchant which only receives
payment except for cases of manual intervention.
Thanks to jgarzik for the original patch and sipa, gmaxwell and many others
for all their input.
Conflicts:
src/wallet.cpp
2011-07-08 15:47:35 +02:00
|
|
|
if (strMethod == "walletpassphrase" && n > 1) ConvertTo<boost::int64_t>(params[1]);
|
2010-12-16 21:48:04 +01:00
|
|
|
if (strMethod == "sendmany" && n > 1)
|
|
|
|
{
|
|
|
|
string s = params[1].get_str();
|
|
|
|
Value v;
|
|
|
|
if (!read_string(s, v) || v.type() != obj_type)
|
|
|
|
throw runtime_error("type mismatch");
|
|
|
|
params[1] = v.get_obj();
|
|
|
|
}
|
|
|
|
if (strMethod == "sendmany" && n > 2) ConvertTo<boost::int64_t>(params[2]);
|
2010-08-29 18:58:15 +02:00
|
|
|
|
|
|
|
// Execute
|
2010-09-06 23:03:04 +02:00
|
|
|
Object reply = CallRPC(strMethod, params);
|
|
|
|
|
|
|
|
// Parse reply
|
|
|
|
const Value& result = find_value(reply, "result");
|
|
|
|
const Value& error = find_value(reply, "error");
|
2010-08-29 18:58:15 +02:00
|
|
|
|
2010-09-06 23:03:04 +02:00
|
|
|
if (error.type() != null_type)
|
2010-08-29 18:58:15 +02:00
|
|
|
{
|
2010-09-06 23:03:04 +02:00
|
|
|
// Error
|
|
|
|
strPrint = "error: " + write_string(error, false);
|
|
|
|
int code = find_value(error.get_obj(), "code").get_int();
|
|
|
|
nRet = abs(code);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Result
|
|
|
|
if (result.type() == null_type)
|
|
|
|
strPrint = "";
|
|
|
|
else if (result.type() == str_type)
|
|
|
|
strPrint = result.get_str();
|
|
|
|
else
|
|
|
|
strPrint = write_string(result, true);
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
}
|
2010-09-06 23:03:04 +02:00
|
|
|
catch (std::exception& e)
|
|
|
|
{
|
|
|
|
strPrint = string("error: ") + e.what();
|
|
|
|
nRet = 87;
|
|
|
|
}
|
|
|
|
catch (...)
|
|
|
|
{
|
|
|
|
PrintException(NULL, "CommandLineRPC()");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strPrint != "")
|
|
|
|
{
|
2010-08-29 18:58:15 +02:00
|
|
|
#if defined(__WXMSW__) && defined(GUI)
|
2010-09-06 23:03:04 +02:00
|
|
|
// Windows GUI apps can't print to command line,
|
|
|
|
// so settle for a message box yuck
|
|
|
|
MyMessageBox(strPrint, "Bitcoin", wxOK);
|
2010-08-29 18:58:15 +02:00
|
|
|
#else
|
2010-09-06 23:03:04 +02:00
|
|
|
fprintf((nRet == 0 ? stdout : stderr), "%s\n", strPrint.c_str());
|
2010-08-29 18:58:15 +02:00
|
|
|
#endif
|
|
|
|
}
|
2010-09-06 23:03:04 +02:00
|
|
|
return nRet;
|
2010-08-29 18:58:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef TEST
|
|
|
|
int main(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
#ifdef _MSC_VER
|
|
|
|
// Turn off microsoft heap dump noise
|
|
|
|
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
|
|
|
|
_CrtSetReportFile(_CRT_WARN, CreateFile("NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0));
|
|
|
|
#endif
|
|
|
|
setbuf(stdin, NULL);
|
|
|
|
setbuf(stdout, NULL);
|
|
|
|
setbuf(stderr, NULL);
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
if (argc >= 2 && string(argv[1]) == "-server")
|
|
|
|
{
|
|
|
|
printf("server ready\n");
|
|
|
|
ThreadRPCServer(NULL);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
return CommandLineRPC(argc, argv);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (std::exception& e) {
|
|
|
|
PrintException(&e, "main()");
|
|
|
|
} catch (...) {
|
|
|
|
PrintException(NULL, "main()");
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|