bitcoin: src/bitcoinrpc.cpp annotate

annotate src/bitcoinrpc.cpp @ 2246:b26677f778d1 draft

fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]

author	Wladimir J. van der Laan <laanwj@gmail.com>
date	Sun, 15 Apr 2012 13:27:00 +0200
parents	bacc73f513ac
children	a52e8d9c2638 7e66f9a59926

rev	line source
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1 // Copyright (c) 2010 Satoshi Nakamoto
1818 20667468f95b Update all copyrights to 2012 Gavin Andresen <gavinandresen@gmail.com> parents: 1800 diff changeset	2 // Copyright (c) 2009-2012 The Bitcoin developers
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	3 // Distributed under the MIT/X11 software license, see the accompanying
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	4 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	5
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	6 #include "headers.h"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	7 #include "db.h"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	8 #include "net.h"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	9 #include "init.h"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	10 #undef printf
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	11 #include <boost/asio.hpp>
1583 df45e8721f53 Key import and export Pieter Wuille <pieter.wuille@gmail.com> parents: 1582 diff changeset	12 #include <boost/filesystem.hpp>
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	13 #include <boost/iostreams/concepts.hpp>
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	14 #include <boost/iostreams/stream.hpp>
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	15 #include <boost/algorithm/string.hpp>
1582 a562176d7552 Preparations for key import/export Pieter Wuille <pieter.wuille@gmail.com> parents: 1580 diff changeset	16 #include <boost/lexical_cast.hpp>
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	17 #include <boost/asio/ssl.hpp>
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	18 #include <boost/filesystem/fstream.hpp>
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	19 typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream;
2169 fab353e96776 Remove USE_SSL #define Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	20
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	21 #include "json/json_spirit_reader_template.h"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	22 #include "json/json_spirit_writer_template.h"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	23 #include "json/json_spirit_utils.h"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	24 #define printf OutputDebugStringF
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	25 // MinGW 3.4.5 gets "fatal error: had to relocate PCH" if the json headers are
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	26 // precompiled in headers.h. The problem might be when the pch file goes over
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	27 // a certain size around 145MB. If we need access to json_spirit outside this
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	28 // file, we could use the compiled json_spirit option.
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	29
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	30 using namespace std;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	31 using namespace boost;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	32 using namespace boost::asio;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	33 using namespace json_spirit;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	34
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	35 void ThreadRPCServer2(void* parg);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	36 typedef Value(*rpcfn_type)(const Array& params, bool fHelp);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	37 extern map<string, rpcfn_type> mapCallTable;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	38
1541 d9bb9c516845 Speed up RPC authentication (reworked pull from Joel Katz) Gavin Andresen <gavinandresen@gmail.com> parents: 1533 diff changeset	39 static std::string strRPCUserColonPass;
d9bb9c516845 Speed up RPC authentication (reworked pull from Joel Katz) Gavin Andresen <gavinandresen@gmail.com> parents: 1533 diff changeset	40
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	41 static int64 nWalletUnlockTime;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	42 static CCriticalSection cs_nWalletUnlockTime;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	43
1583 df45e8721f53 Key import and export Pieter Wuille <pieter.wuille@gmail.com> parents: 1582 diff changeset	44 extern Value dumpprivkey(const Array& params, bool fHelp);
df45e8721f53 Key import and export Pieter Wuille <pieter.wuille@gmail.com> parents: 1582 diff changeset	45 extern Value importprivkey(const Array& params, bool fHelp);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	46
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	47 Object JSONRPCError(int code, const string& message)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	48 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	49 Object error;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	50 error.push_back(Pair("code", code));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	51 error.push_back(Pair("message", message));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	52 return error;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	53 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	54
1627 1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	55 double GetDifficulty(const CBlockIndex* blockindex = NULL)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	56 {
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	57 // Floating point number that is a multiple of the minimum difficulty,
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	58 // minimum difficulty = 1.0.
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	59 if (blockindex == NULL)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	60 {
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	61 if (pindexBest == NULL)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	62 return 1.0;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	63 else
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	64 blockindex = pindexBest;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	65 }
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	66
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	67 int nShift = (blockindex->nBits >> 24) & 0xff;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	68
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	69 double dDiff =
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	70 (double)0x0000ffff / (double)(blockindex->nBits & 0x00ffffff);
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	71
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	72 while (nShift < 29)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	73 {
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	74 dDiff *= 256.0;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	75 nShift++;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	76 }
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	77 while (nShift > 29)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	78 {
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	79 dDiff /= 256.0;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	80 nShift--;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	81 }
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	82
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	83 return dDiff;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	84 }
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	85
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	86
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	87 int64 AmountFromValue(const Value& value)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	88 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	89 double dAmount = value.get_real();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	90 if (dAmount <= 0.0 \|\| dAmount > 21000000.0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	91 throw JSONRPCError(-3, "Invalid amount");
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	92 int64 nAmount = roundint64(dAmount * COIN);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	93 if (!MoneyRange(nAmount))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	94 throw JSONRPCError(-3, "Invalid amount");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	95 return nAmount;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	96 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	97
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	98 Value ValueFromAmount(int64 amount)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	99 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	100 return (double)amount / (double)COIN;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	101 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	102
1900 7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	103 std::string
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	104 HexBits(unsigned int nBits)
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	105 {
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	106 union {
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	107 int32_t nBits;
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	108 char cBits[4];
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	109 } uBits;
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	110 uBits.nBits = htonl((int32_t)nBits);
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	111 return HexStr(BEGIN(uBits.cBits), END(uBits.cBits));
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	112 }
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	113
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	114 void WalletTxToJSON(const CWalletTx& wtx, Object& entry)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	115 {
1590 820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	116 int confirms = wtx.GetDepthInMainChain();
820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	117 entry.push_back(Pair("confirmations", confirms));
820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	118 if (confirms)
820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	119 {
820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	120 entry.push_back(Pair("blockhash", wtx.hashBlock.GetHex()));
820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	121 entry.push_back(Pair("blockindex", wtx.nIndex));
820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	122 }
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	123 entry.push_back(Pair("txid", wtx.GetHash().GetHex()));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	124 entry.push_back(Pair("time", (boost::int64_t)wtx.GetTxTime()));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	125 BOOST_FOREACH(const PAIRTYPE(string,string)& item, wtx.mapValue)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	126 entry.push_back(Pair(item.first, item.second));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	127 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	128
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	129 string AccountFromValue(const Value& value)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	130 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	131 string strAccount = value.get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	132 if (strAccount == "*")
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	133 throw JSONRPCError(-11, "Invalid account name");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	134 return strAccount;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	135 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	136
1627 1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	137 Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	138 {
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	139 Object result;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	140 result.push_back(Pair("hash", block.GetHash().GetHex()));
1900 7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	141 result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK)));
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	142 result.push_back(Pair("height", blockindex->nHeight));
1627 1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	143 result.push_back(Pair("version", block.nVersion));
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	144 result.push_back(Pair("merkleroot", block.hashMerkleRoot.GetHex()));
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	145 result.push_back(Pair("time", (boost::int64_t)block.GetBlockTime()));
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	146 result.push_back(Pair("nonce", (boost::uint64_t)block.nNonce));
1900 7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	147 result.push_back(Pair("bits", HexBits(block.nBits)));
1627 1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	148 result.push_back(Pair("difficulty", GetDifficulty(blockindex)));
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	149 Array txhashes;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	150 BOOST_FOREACH (const CTransaction&tx, block.vtx)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	151 txhashes.push_back(tx.GetHash().GetHex());
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	152 result.push_back(Pair("tx", txhashes));
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	153
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	154 if (blockindex->pprev)
1900 7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	155 result.push_back(Pair("previousblockhash", blockindex->pprev->GetBlockHash().GetHex()));
1627 1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	156 if (blockindex->pnext)
1900 7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	157 result.push_back(Pair("nextblockhash", blockindex->pnext->GetBlockHash().GetHex()));
1627 1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	158 return result;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	159 }
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	160
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	161
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	162
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	163 ///
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	164 /// Note: This interface may still be subject to change.
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	165 ///
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	166
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	167
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	168 Value help(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	169 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	170 if (fHelp \|\| params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	171 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	172 "help [command]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	173 "List commands, or get help for a command.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	174
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	175 string strCommand;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	176 if (params.size() > 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	177 strCommand = params[0].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	178
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	179 string strRet;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	180 set<rpcfn_type> setDone;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	181 for (map<string, rpcfn_type>::iterator mi = mapCallTable.begin(); mi != mapCallTable.end(); ++mi)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	182 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	183 string strMethod = (*mi).first;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	184 // We already filter duplicates, but these deprecated screw up the sort order
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	185 if (strMethod == "getamountreceived" \|\|
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	186 strMethod == "getallreceived" \|\|
1490 f5b3cf558f89 Deprecate RPC getblocknumber Michael Hendricks <michael@ndrix.org> parents: 1388 diff changeset	187 strMethod == "getblocknumber" \|\| // deprecated
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	188 (strMethod.find("label") != string::npos))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	189 continue;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	190 if (strCommand != "" && strMethod != strCommand)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	191 continue;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	192 try
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	193 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	194 Array params;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	195 rpcfn_type pfn = (*mi).second;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	196 if (setDone.insert(pfn).second)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	197 (*pfn)(params, true);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	198 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	199 catch (std::exception& e)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	200 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	201 // Help text is returned in an exception
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	202 string strHelp = string(e.what());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	203 if (strCommand == "")
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	204 if (strHelp.find('\n') != -1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	205 strHelp = strHelp.substr(0, strHelp.find('\n'));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	206 strRet += strHelp + "\n";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	207 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	208 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	209 if (strRet == "")
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	210 strRet = strprintf("help: unknown command: %s\n", strCommand.c_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	211 strRet = strRet.substr(0,strRet.size()-1);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	212 return strRet;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	213 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	214
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	215
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	216 Value stop(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	217 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	218 if (fHelp \|\| params.size() != 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	219 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	220 "stop\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	221 "Stop bitcoin server.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	222 // Shutdown will take long enough that the response should get back
2152 aef73b9ddae3 support RPC stop and encryptwallet with UI Wladimir J. van der Laan <laanwj@gmail.com> parents: 2143 diff changeset	223 QueueShutdown();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	224 return "bitcoin server stopping";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	225 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	226
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	227
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	228 Value getblockcount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	229 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	230 if (fHelp \|\| params.size() != 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	231 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	232 "getblockcount\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	233 "Returns the number of blocks in the longest block chain.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	234
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	235 return nBestHeight;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	236 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	237
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	238
1490 f5b3cf558f89 Deprecate RPC getblocknumber Michael Hendricks <michael@ndrix.org> parents: 1388 diff changeset	239 // deprecated
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	240 Value getblocknumber(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	241 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	242 if (fHelp \|\| params.size() != 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	243 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	244 "getblocknumber\n"
1490 f5b3cf558f89 Deprecate RPC getblocknumber Michael Hendricks <michael@ndrix.org> parents: 1388 diff changeset	245 "Deprecated. Use getblockcount.");
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	246
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	247 return nBestHeight;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	248 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	249
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	250
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	251 Value getconnectioncount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	252 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	253 if (fHelp \|\| params.size() != 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	254 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	255 "getconnectioncount\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	256 "Returns the number of connections to other nodes.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	257
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	258 return (int)vNodes.size();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	259 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	260
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	261
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	262 Value getdifficulty(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	263 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	264 if (fHelp \|\| params.size() != 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	265 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	266 "getdifficulty\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	267 "Returns the proof-of-work difficulty as a multiple of the minimum difficulty.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	268
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	269 return GetDifficulty();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	270 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	271
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	272
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	273 Value getgenerate(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	274 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	275 if (fHelp \|\| params.size() != 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	276 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	277 "getgenerate\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	278 "Returns true or false.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	279
1920 bffd14be46a8 bitcoind changes to stop storing settings in wallet.dat. Gavin Andresen <gavinandresen@gmail.com> parents: 1900 diff changeset	280 return GetBoolArg("-gen");
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	281 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	282
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	283
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	284 Value setgenerate(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	285 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	286 if (fHelp \|\| params.size() < 1 \|\| params.size() > 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	287 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	288 "setgenerate <generate> [genproclimit]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	289 "<generate> is true or false to turn generation on or off.\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	290 "Generation is limited to [genproclimit] processors, -1 is unlimited.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	291
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	292 bool fGenerate = true;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	293 if (params.size() > 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	294 fGenerate = params[0].get_bool();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	295
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	296 if (params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	297 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	298 int nGenProcLimit = params[1].get_int();
1920 bffd14be46a8 bitcoind changes to stop storing settings in wallet.dat. Gavin Andresen <gavinandresen@gmail.com> parents: 1900 diff changeset	299 mapArgs["-genproclimit"] = itostr(nGenProcLimit);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	300 if (nGenProcLimit == 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	301 fGenerate = false;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	302 }
1920 bffd14be46a8 bitcoind changes to stop storing settings in wallet.dat. Gavin Andresen <gavinandresen@gmail.com> parents: 1900 diff changeset	303 mapArgs["-gen"] = (fGenerate ? "1" : "0");
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	304
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	305 GenerateBitcoins(fGenerate, pwalletMain);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	306 return Value::null;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	307 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	308
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	309
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	310 Value gethashespersec(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	311 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	312 if (fHelp \|\| params.size() != 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	313 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	314 "gethashespersec\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	315 "Returns a recent hashes per second performance measurement while generating.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	316
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	317 if (GetTimeMillis() - nHPSTimerStart > 8000)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	318 return (boost::int64_t)0;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	319 return (boost::int64_t)dHashesPerSec;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	320 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	321
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	322
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	323 Value getinfo(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	324 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	325 if (fHelp \|\| params.size() != 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	326 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	327 "getinfo\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	328 "Returns an object containing various state info.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	329
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	330 Object obj;
1584 a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1541 diff changeset	331 obj.push_back(Pair("version", (int)CLIENT_VERSION));
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1541 diff changeset	332 obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION));
2086 394961982d80 Introduce explicit -walletupgrade option Pieter Wuille <pieter.wuille@gmail.com> parents: 2072 diff changeset	333 obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	334 obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	335 obj.push_back(Pair("blocks", (int)nBestHeight));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	336 obj.push_back(Pair("connections", (int)vNodes.size()));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	337 obj.push_back(Pair("proxy", (fUseProxy ? addrProxy.ToStringIPPort() : string())));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	338 obj.push_back(Pair("difficulty", (double)GetDifficulty()));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	339 obj.push_back(Pair("testnet", fTestNet));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	340 obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime()));
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	341 obj.push_back(Pair("keypoolsize", pwalletMain->GetKeyPoolSize()));
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	342 obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee)));
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	343 if (pwalletMain->IsCrypted())
1834 1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	344 obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime / 1000));
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	345 obj.push_back(Pair("errors", GetWarnings("statusbar")));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	346 return obj;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	347 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	348
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	349
1745 4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	350 Value getmininginfo(const Array& params, bool fHelp)
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	351 {
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	352 if (fHelp \|\| params.size() != 0)
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	353 throw runtime_error(
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	354 "getmininginfo\n"
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	355 "Returns an object containing mining-related information.");
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	356
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	357 Object obj;
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	358 obj.push_back(Pair("blocks", (int)nBestHeight));
1746 7b7c12a59103 collect more info on tx pooling and block finding for getmininginfo Luke Dashjr <luke-jr+git@utopios.org> parents: 1745 diff changeset	359 obj.push_back(Pair("currentblocksize",(uint64_t)nLastBlockSize));
7b7c12a59103 collect more info on tx pooling and block finding for getmininginfo Luke Dashjr <luke-jr+git@utopios.org> parents: 1745 diff changeset	360 obj.push_back(Pair("currentblocktx",(uint64_t)nLastBlockTx));
1745 4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	361 obj.push_back(Pair("difficulty", (double)GetDifficulty()));
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	362 obj.push_back(Pair("errors", GetWarnings("statusbar")));
1920 bffd14be46a8 bitcoind changes to stop storing settings in wallet.dat. Gavin Andresen <gavinandresen@gmail.com> parents: 1900 diff changeset	363 obj.push_back(Pair("generate", GetBoolArg("-gen")));
bffd14be46a8 bitcoind changes to stop storing settings in wallet.dat. Gavin Andresen <gavinandresen@gmail.com> parents: 1900 diff changeset	364 obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1)));
1745 4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	365 obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
1746 7b7c12a59103 collect more info on tx pooling and block finding for getmininginfo Luke Dashjr <luke-jr+git@utopios.org> parents: 1745 diff changeset	366 obj.push_back(Pair("pooledtx", (uint64_t)nPooledTx));
1745 4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	367 obj.push_back(Pair("testnet", fTestNet));
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	368 return obj;
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	369 }
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	370
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	371
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	372 Value getnewaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	373 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	374 if (fHelp \|\| params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	375 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	376 "getnewaddress [account]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	377 "Returns a new bitcoin address for receiving payments. "
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	378 "If [account] is specified (recommended), it is added to the address book "
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	379 "so payments received with the address will be credited to [account].");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	380
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	381 // Parse the account first so we don't generate a key if there's an error
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	382 string strAccount;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	383 if (params.size() > 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	384 strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	385
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	386 if (!pwalletMain->IsLocked())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	387 pwalletMain->TopUpKeyPool();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	388
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	389 // Generate a new key that is added to wallet
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	390 std::vector<unsigned char> newKey;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	391 if (!pwalletMain->GetKeyFromPool(newKey, false))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	392 throw JSONRPCError(-12, "Error: Keypool ran out, please call keypoolrefill first");
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	393 CBitcoinAddress address(newKey);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	394
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	395 pwalletMain->SetAddressBookName(address, strAccount);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	396
1256 3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	397 return address.ToString();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	398 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	399
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	400
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	401 CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	402 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	403 CWalletDB walletdb(pwalletMain->strWalletFile);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	404
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	405 CAccount account;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	406 walletdb.ReadAccount(strAccount, account);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	407
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	408 bool bKeyUsed = false;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	409
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	410 // Check if the current key has been used
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	411 if (!account.vchPubKey.empty())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	412 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	413 CScript scriptPubKey;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	414 scriptPubKey.SetBitcoinAddress(account.vchPubKey);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	415 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin();
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	416 it != pwalletMain->mapWallet.end() && !account.vchPubKey.empty();
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	417 ++it)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	418 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	419 const CWalletTx& wtx = (*it).second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	420 BOOST_FOREACH(const CTxOut& txout, wtx.vout)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	421 if (txout.scriptPubKey == scriptPubKey)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	422 bKeyUsed = true;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	423 }
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	424 }
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	425
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	426 // Generate a new key
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	427 if (account.vchPubKey.empty() \|\| bForceNew \|\| bKeyUsed)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	428 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	429 if (!pwalletMain->GetKeyFromPool(account.vchPubKey, false))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	430 throw JSONRPCError(-12, "Error: Keypool ran out, please call keypoolrefill first");
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	431
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	432 pwalletMain->SetAddressBookName(CBitcoinAddress(account.vchPubKey), strAccount);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	433 walletdb.WriteAccount(strAccount, account);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	434 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	435
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	436 return CBitcoinAddress(account.vchPubKey);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	437 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	438
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	439 Value getaccountaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	440 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	441 if (fHelp \|\| params.size() != 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	442 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	443 "getaccountaddress <account>\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	444 "Returns the current bitcoin address for receiving payments to this account.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	445
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	446 // Parse the account first so we don't generate a key if there's an error
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	447 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	448
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	449 Value ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	450
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	451 ret = GetAccountAddress(strAccount).ToString();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	452
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	453 return ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	454 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	455
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	456
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	457
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	458 Value setaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	459 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	460 if (fHelp \|\| params.size() < 1 \|\| params.size() > 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	461 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	462 "setaccount <bitcoinaddress> <account>\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	463 "Sets the account associated with the given address.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	464
1256 3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	465 CBitcoinAddress address(params[0].get_str());
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	466 if (!address.IsValid())
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	467 throw JSONRPCError(-5, "Invalid bitcoin address");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	468
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	469
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	470 string strAccount;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	471 if (params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	472 strAccount = AccountFromValue(params[1]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	473
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	474 // Detect when changing the account of an address that is the 'unused current key' of another account:
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	475 if (pwalletMain->mapAddressBook.count(address))
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	476 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	477 string strOldAccount = pwalletMain->mapAddressBook[address];
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	478 if (address == GetAccountAddress(strOldAccount))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	479 GetAccountAddress(strOldAccount, true);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	480 }
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	481
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	482 pwalletMain->SetAddressBookName(address, strAccount);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	483
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	484 return Value::null;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	485 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	486
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	487
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	488 Value getaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	489 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	490 if (fHelp \|\| params.size() != 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	491 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	492 "getaccount <bitcoinaddress>\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	493 "Returns the account associated with the given address.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	494
1256 3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	495 CBitcoinAddress address(params[0].get_str());
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	496 if (!address.IsValid())
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	497 throw JSONRPCError(-5, "Invalid bitcoin address");
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	498
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	499 string strAccount;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	500 map<CBitcoinAddress, string>::iterator mi = pwalletMain->mapAddressBook.find(address);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	501 if (mi != pwalletMain->mapAddressBook.end() && !(*mi).second.empty())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	502 strAccount = (*mi).second;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	503 return strAccount;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	504 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	505
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	506
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	507 Value getaddressesbyaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	508 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	509 if (fHelp \|\| params.size() != 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	510 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	511 "getaddressesbyaccount <account>\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	512 "Returns the list of addresses for the given account.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	513
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	514 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	515
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	516 // Find all addresses that have the given account
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	517 Array ret;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	518 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, string)& item, pwalletMain->mapAddressBook)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	519 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	520 const CBitcoinAddress& address = item.first;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	521 const string& strName = item.second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	522 if (strName == strAccount)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	523 ret.push_back(address.ToString());
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	524 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	525 return ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	526 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	527
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	528 Value settxfee(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	529 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	530 if (fHelp \|\| params.size() < 1 \|\| params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	531 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	532 "settxfee <amount>\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	533 "<amount> is a real and is rounded to the nearest 0.00000001");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	534
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	535 // Amount
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	536 int64 nAmount = 0;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	537 if (params[0].get_real() != 0.0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	538 nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	539
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	540 nTransactionFee = nAmount;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	541 return true;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	542 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	543
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	544 Value sendtoaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	545 {
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	546 if (pwalletMain->IsCrypted() && (fHelp \|\| params.size() < 2 \|\| params.size() > 4))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	547 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	548 "sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	549 "<amount> is a real and is rounded to the nearest 0.00000001\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	550 "requires wallet passphrase to be set with walletpassphrase first");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	551 if (!pwalletMain->IsCrypted() && (fHelp \|\| params.size() < 2 \|\| params.size() > 4))
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	552 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	553 "sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	554 "<amount> is a real and is rounded to the nearest 0.00000001");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	555
1256 3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	556 CBitcoinAddress address(params[0].get_str());
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	557 if (!address.IsValid())
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	558 throw JSONRPCError(-5, "Invalid bitcoin address");
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	559
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	560 // Amount
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	561 int64 nAmount = AmountFromValue(params[1]);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	562
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	563 // Wallet comments
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	564 CWalletTx wtx;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	565 if (params.size() > 2 && params[2].type() != null_type && !params[2].get_str().empty())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	566 wtx.mapValue["comment"] = params[2].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	567 if (params.size() > 3 && params[3].type() != null_type && !params[3].get_str().empty())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	568 wtx.mapValue["to"] = params[3].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	569
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	570 if (pwalletMain->IsLocked())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	571 throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.");
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	572
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	573 string strError = pwalletMain->SendMoneyToBitcoinAddress(address, nAmount, wtx);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	574 if (strError != "")
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	575 throw JSONRPCError(-4, strError);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	576
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	577 return wtx.GetHash().GetHex();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	578 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	579
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	580 Value signmessage(const Array& params, bool fHelp)
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	581 {
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	582 if (fHelp \|\| params.size() != 2)
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	583 throw runtime_error(
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	584 "signmessage <bitcoinaddress> <message>\n"
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	585 "Sign a message with the private key of an address");
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	586
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	587 if (pwalletMain->IsLocked())
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	588 throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.");
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	589
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	590 string strAddress = params[0].get_str();
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	591 string strMessage = params[1].get_str();
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	592
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	593 CBitcoinAddress addr(strAddress);
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	594 if (!addr.IsValid())
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	595 throw JSONRPCError(-3, "Invalid address");
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	596
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	597 CKey key;
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	598 if (!pwalletMain->GetKey(addr, key))
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	599 throw JSONRPCError(-4, "Private key not available");
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	600
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	601 CDataStream ss(SER_GETHASH);
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	602 ss << strMessageMagic;
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	603 ss << strMessage;
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	604
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	605 vector<unsigned char> vchSig;
1333 7efc4fb78051 Use key recovery for message signatures Pieter Wuille <pieter.wuille@gmail.com> parents: 1331 diff changeset	606 if (!key.SignCompact(Hash(ss.begin(), ss.end()), vchSig))
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	607 throw JSONRPCError(-5, "Sign failed");
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	608
1333 7efc4fb78051 Use key recovery for message signatures Pieter Wuille <pieter.wuille@gmail.com> parents: 1331 diff changeset	609 return EncodeBase64(&vchSig[0], vchSig.size());
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	610 }
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	611
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	612 Value verifymessage(const Array& params, bool fHelp)
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	613 {
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	614 if (fHelp \|\| params.size() != 3)
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	615 throw runtime_error(
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	616 "verifymessage <bitcoinaddress> <signature> <message>\n"
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	617 "Verify a signed message");
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	618
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	619 string strAddress = params[0].get_str();
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	620 string strSign = params[1].get_str();
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	621 string strMessage = params[2].get_str();
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	622
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	623 CBitcoinAddress addr(strAddress);
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	624 if (!addr.IsValid())
1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	625 throw JSONRPCError(-3, "Invalid address");
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	626
1331 b427db8574f1 base64-based sign/verify Pieter Wuille <pieter.wuille@gmail.com> parents: 1330 diff changeset	627 bool fInvalid = false;
1333 7efc4fb78051 Use key recovery for message signatures Pieter Wuille <pieter.wuille@gmail.com> parents: 1331 diff changeset	628 vector<unsigned char> vchSig = DecodeBase64(strSign.c_str(), &fInvalid);
1331 b427db8574f1 base64-based sign/verify Pieter Wuille <pieter.wuille@gmail.com> parents: 1330 diff changeset	629
b427db8574f1 base64-based sign/verify Pieter Wuille <pieter.wuille@gmail.com> parents: 1330 diff changeset	630 if (fInvalid)
b427db8574f1 base64-based sign/verify Pieter Wuille <pieter.wuille@gmail.com> parents: 1330 diff changeset	631 throw JSONRPCError(-5, "Malformed base64 encoding");
b427db8574f1 base64-based sign/verify Pieter Wuille <pieter.wuille@gmail.com> parents: 1330 diff changeset	632
1333 7efc4fb78051 Use key recovery for message signatures Pieter Wuille <pieter.wuille@gmail.com> parents: 1331 diff changeset	633 CDataStream ss(SER_GETHASH);
7efc4fb78051 Use key recovery for message signatures Pieter Wuille <pieter.wuille@gmail.com> parents: 1331 diff changeset	634 ss << strMessageMagic;
7efc4fb78051 Use key recovery for message signatures Pieter Wuille <pieter.wuille@gmail.com> parents: 1331 diff changeset	635 ss << strMessage;
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	636
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	637 CKey key;
1333 7efc4fb78051 Use key recovery for message signatures Pieter Wuille <pieter.wuille@gmail.com> parents: 1331 diff changeset	638 if (!key.SetCompactSignature(Hash(ss.begin(), ss.end()), vchSig))
7efc4fb78051 Use key recovery for message signatures Pieter Wuille <pieter.wuille@gmail.com> parents: 1331 diff changeset	639 return false;
1330 1537d1a22f34 Incorporate pubkey in signature, check based on address Pieter Wuille <pieter.wuille@gmail.com> parents: 1329 diff changeset	640
1580 d7f244465cd6 Add GetSecret() and GetKeys() to CKeyStore Pieter Wuille <pieter.wuille@gmail.com> parents: 1541 diff changeset	641 return (CBitcoinAddress(key.GetPubKey()) == addr);
1329 22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	642 }
22f52365d86b Sign and verify message with bitcoin address and public key Khalahan <khal@bitcoin-contact.org> parents: 1327 diff changeset	643
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	644
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	645 Value getreceivedbyaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	646 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	647 if (fHelp \|\| params.size() < 1 \|\| params.size() > 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	648 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	649 "getreceivedbyaddress <bitcoinaddress> [minconf=1]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	650 "Returns the total amount received by <bitcoinaddress> in transactions with at least [minconf] confirmations.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	651
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	652 // Bitcoin address
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	653 CBitcoinAddress address = CBitcoinAddress(params[0].get_str());
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	654 CScript scriptPubKey;
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	655 if (!address.IsValid())
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	656 throw JSONRPCError(-5, "Invalid bitcoin address");
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	657 scriptPubKey.SetBitcoinAddress(address);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	658 if (!IsMine(*pwalletMain,scriptPubKey))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	659 return (double)0.0;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	660
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	661 // Minimum confirmations
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	662 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	663 if (params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	664 nMinDepth = params[1].get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	665
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	666 // Tally
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	667 int64 nAmount = 0;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	668 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	669 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	670 const CWalletTx& wtx = (*it).second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	671 if (wtx.IsCoinBase() \|\| !wtx.IsFinal())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	672 continue;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	673
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	674 BOOST_FOREACH(const CTxOut& txout, wtx.vout)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	675 if (txout.scriptPubKey == scriptPubKey)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	676 if (wtx.GetDepthInMainChain() >= nMinDepth)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	677 nAmount += txout.nValue;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	678 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	679
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	680 return ValueFromAmount(nAmount);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	681 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	682
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	683
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	684 void GetAccountAddresses(string strAccount, set<CBitcoinAddress>& setAddress)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	685 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	686 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, string)& item, pwalletMain->mapAddressBook)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	687 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	688 const CBitcoinAddress& address = item.first;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	689 const string& strName = item.second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	690 if (strName == strAccount)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	691 setAddress.insert(address);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	692 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	693 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	694
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	695
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	696 Value getreceivedbyaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	697 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	698 if (fHelp \|\| params.size() < 1 \|\| params.size() > 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	699 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	700 "getreceivedbyaccount <account> [minconf=1]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	701 "Returns the total amount received by addresses with <account> in transactions with at least [minconf] confirmations.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	702
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	703 // Minimum confirmations
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	704 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	705 if (params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	706 nMinDepth = params[1].get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	707
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	708 // Get the set of pub keys assigned to account
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	709 string strAccount = AccountFromValue(params[0]);
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	710 set<CBitcoinAddress> setAddress;
e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	711 GetAccountAddresses(strAccount, setAddress);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	712
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	713 // Tally
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	714 int64 nAmount = 0;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	715 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	716 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	717 const CWalletTx& wtx = (*it).second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	718 if (wtx.IsCoinBase() \|\| !wtx.IsFinal())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	719 continue;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	720
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	721 BOOST_FOREACH(const CTxOut& txout, wtx.vout)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	722 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	723 CBitcoinAddress address;
1618 e16276182f0f Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care) Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	724 if (ExtractAddress(txout.scriptPubKey, address) && pwalletMain->HaveKey(address) && setAddress.count(address))
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	725 if (wtx.GetDepthInMainChain() >= nMinDepth)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	726 nAmount += txout.nValue;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	727 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	728 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	729
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	730 return (double)nAmount / (double)COIN;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	731 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	732
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	733
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	734 int64 GetAccountBalance(CWalletDB& walletdb, const string& strAccount, int nMinDepth)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	735 {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	736 int64 nBalance = 0;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	737
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	738 // Tally wallet transactions
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	739 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	740 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	741 const CWalletTx& wtx = (*it).second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	742 if (!wtx.IsFinal())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	743 continue;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	744
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	745 int64 nGenerated, nReceived, nSent, nFee;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	746 wtx.GetAccountAmounts(strAccount, nGenerated, nReceived, nSent, nFee);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	747
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	748 if (nReceived != 0 && wtx.GetDepthInMainChain() >= nMinDepth)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	749 nBalance += nReceived;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	750 nBalance += nGenerated - nSent - nFee;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	751 }
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	752
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	753 // Tally internal accounting entries
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	754 nBalance += walletdb.GetAccountCreditDebit(strAccount);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	755
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	756 return nBalance;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	757 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	758
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	759 int64 GetAccountBalance(const string& strAccount, int nMinDepth)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	760 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	761 CWalletDB walletdb(pwalletMain->strWalletFile);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	762 return GetAccountBalance(walletdb, strAccount, nMinDepth);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	763 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	764
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	765
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	766 Value getbalance(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	767 {
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	768 if (fHelp \|\| params.size() > 2)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	769 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	770 "getbalance [account] [minconf=1]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	771 "If [account] is not specified, returns the server's total available balance.\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	772 "If [account] is specified, returns the balance in the account.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	773
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	774 if (params.size() == 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	775 return ValueFromAmount(pwalletMain->GetBalance());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	776
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	777 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	778 if (params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	779 nMinDepth = params[1].get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	780
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	781 if (params[0].get_str() == "*") {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	782 // Calculate total balance a different way from GetBalance()
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	783 // (GetBalance() sums up all unspent TxOuts)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	784 // getbalance and getbalance '*' should always return the same number.
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	785 int64 nBalance = 0;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	786 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	787 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	788 const CWalletTx& wtx = (*it).second;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	789 if (!wtx.IsFinal())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	790 continue;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	791
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	792 int64 allGeneratedImmature, allGeneratedMature, allFee;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	793 allGeneratedImmature = allGeneratedMature = allFee = 0;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	794 string strSentAccount;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	795 list<pair<CBitcoinAddress, int64> > listReceived;
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	796 list<pair<CBitcoinAddress, int64> > listSent;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	797 wtx.GetAmounts(allGeneratedImmature, allGeneratedMature, listReceived, listSent, allFee, strSentAccount);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	798 if (wtx.GetDepthInMainChain() >= nMinDepth)
2246 b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] Wladimir J. van der Laan <laanwj@gmail.com> parents: 2219 diff changeset	799 {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	800 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress,int64)& r, listReceived)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	801 nBalance += r.second;
2246 b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] Wladimir J. van der Laan <laanwj@gmail.com> parents: 2219 diff changeset	802 }
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	803 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress,int64)& r, listSent)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	804 nBalance -= r.second;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	805 nBalance -= allFee;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	806 nBalance += allGeneratedMature;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	807 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	808 return ValueFromAmount(nBalance);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	809 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	810
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	811 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	812
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	813 int64 nBalance = GetAccountBalance(strAccount, nMinDepth);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	814
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	815 return ValueFromAmount(nBalance);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	816 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	817
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	818
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	819 Value movecmd(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	820 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	821 if (fHelp \|\| params.size() < 3 \|\| params.size() > 5)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	822 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	823 "move <fromaccount> <toaccount> <amount> [minconf=1] [comment]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	824 "Move from one account in your wallet to another.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	825
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	826 string strFrom = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	827 string strTo = AccountFromValue(params[1]);
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	828 int64 nAmount = AmountFromValue(params[2]);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	829 if (params.size() > 3)
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	830 // unused parameter, used to be nMinDepth, keep type-checking it though
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	831 (void)params[3].get_int();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	832 string strComment;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	833 if (params.size() > 4)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	834 strComment = params[4].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	835
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	836 CWalletDB walletdb(pwalletMain->strWalletFile);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	837 walletdb.TxnBegin();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	838
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	839 int64 nNow = GetAdjustedTime();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	840
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	841 // Debit
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	842 CAccountingEntry debit;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	843 debit.strAccount = strFrom;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	844 debit.nCreditDebit = -nAmount;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	845 debit.nTime = nNow;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	846 debit.strOtherAccount = strTo;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	847 debit.strComment = strComment;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	848 walletdb.WriteAccountingEntry(debit);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	849
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	850 // Credit
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	851 CAccountingEntry credit;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	852 credit.strAccount = strTo;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	853 credit.nCreditDebit = nAmount;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	854 credit.nTime = nNow;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	855 credit.strOtherAccount = strFrom;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	856 credit.strComment = strComment;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	857 walletdb.WriteAccountingEntry(credit);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	858
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	859 walletdb.TxnCommit();
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	860
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	861 return true;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	862 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	863
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	864
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	865 Value sendfrom(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	866 {
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	867 if (pwalletMain->IsCrypted() && (fHelp \|\| params.size() < 3 \|\| params.size() > 6))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	868 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	869 "sendfrom <fromaccount> <tobitcoinaddress> <amount> [minconf=1] [comment] [comment-to]\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	870 "<amount> is a real and is rounded to the nearest 0.00000001\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	871 "requires wallet passphrase to be set with walletpassphrase first");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	872 if (!pwalletMain->IsCrypted() && (fHelp \|\| params.size() < 3 \|\| params.size() > 6))
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	873 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	874 "sendfrom <fromaccount> <tobitcoinaddress> <amount> [minconf=1] [comment] [comment-to]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	875 "<amount> is a real and is rounded to the nearest 0.00000001");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	876
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	877 string strAccount = AccountFromValue(params[0]);
1256 3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	878 CBitcoinAddress address(params[1].get_str());
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	879 if (!address.IsValid())
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	880 throw JSONRPCError(-5, "Invalid bitcoin address");
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	881 int64 nAmount = AmountFromValue(params[2]);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	882 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	883 if (params.size() > 3)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	884 nMinDepth = params[3].get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	885
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	886 CWalletTx wtx;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	887 wtx.strFromAccount = strAccount;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	888 if (params.size() > 4 && params[4].type() != null_type && !params[4].get_str().empty())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	889 wtx.mapValue["comment"] = params[4].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	890 if (params.size() > 5 && params[5].type() != null_type && !params[5].get_str().empty())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	891 wtx.mapValue["to"] = params[5].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	892
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	893 if (pwalletMain->IsLocked())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	894 throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.");
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	895
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	896 // Check funds
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	897 int64 nBalance = GetAccountBalance(strAccount, nMinDepth);
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	898 if (nAmount > nBalance)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	899 throw JSONRPCError(-6, "Account has insufficient funds");
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	900
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	901 // Send
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	902 string strError = pwalletMain->SendMoneyToBitcoinAddress(address, nAmount, wtx);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	903 if (strError != "")
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	904 throw JSONRPCError(-4, strError);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	905
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	906 return wtx.GetHash().GetHex();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	907 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	908
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	909
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	910 Value sendmany(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	911 {
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	912 if (pwalletMain->IsCrypted() && (fHelp \|\| params.size() < 2 \|\| params.size() > 4))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	913 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	914 "sendmany <fromaccount> {address:amount,...} [minconf=1] [comment]\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	915 "amounts are double-precision floating point numbers\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	916 "requires wallet passphrase to be set with walletpassphrase first");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	917 if (!pwalletMain->IsCrypted() && (fHelp \|\| params.size() < 2 \|\| params.size() > 4))
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	918 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	919 "sendmany <fromaccount> {address:amount,...} [minconf=1] [comment]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	920 "amounts are double-precision floating point numbers");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	921
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	922 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	923 Object sendTo = params[1].get_obj();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	924 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	925 if (params.size() > 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	926 nMinDepth = params[2].get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	927
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	928 CWalletTx wtx;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	929 wtx.strFromAccount = strAccount;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	930 if (params.size() > 3 && params[3].type() != null_type && !params[3].get_str().empty())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	931 wtx.mapValue["comment"] = params[3].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	932
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	933 set<CBitcoinAddress> setAddress;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	934 vector<pair<CScript, int64> > vecSend;
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	935
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	936 int64 totalAmount = 0;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	937 BOOST_FOREACH(const Pair& s, sendTo)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	938 {
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	939 CBitcoinAddress address(s.name_);
e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	940 if (!address.IsValid())
e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	941 throw JSONRPCError(-5, string("Invalid bitcoin address:")+s.name_);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	942
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	943 if (setAddress.count(address))
e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	944 throw JSONRPCError(-8, string("Invalid parameter, duplicated address: ")+s.name_);
e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	945 setAddress.insert(address);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	946
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	947 CScript scriptPubKey;
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	948 scriptPubKey.SetBitcoinAddress(address);
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	949 int64 nAmount = AmountFromValue(s.value_);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	950 totalAmount += nAmount;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	951
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	952 vecSend.push_back(make_pair(scriptPubKey, nAmount));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	953 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	954
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	955 if (pwalletMain->IsLocked())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	956 throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.");
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	957
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	958 // Check funds
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	959 int64 nBalance = GetAccountBalance(strAccount, nMinDepth);
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	960 if (totalAmount > nBalance)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	961 throw JSONRPCError(-6, "Account has insufficient funds");
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	962
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	963 // Send
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	964 CReserveKey keyChange(pwalletMain);
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	965 int64 nFeeRequired = 0;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	966 bool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	967 if (!fCreated)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	968 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	969 if (totalAmount + nFeeRequired > pwalletMain->GetBalance())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	970 throw JSONRPCError(-6, "Insufficient funds");
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	971 throw JSONRPCError(-4, "Transaction creation failed");
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	972 }
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	973 if (!pwalletMain->CommitTransaction(wtx, keyChange))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	974 throw JSONRPCError(-4, "Transaction commit failed");
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	975
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	976 return wtx.GetHash().GetHex();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	977 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	978
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	979 Value addmultisigaddress(const Array& params, bool fHelp)
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	980 {
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	981 if (fHelp \|\| params.size() < 2 \|\| params.size() > 3)
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	982 {
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	983 string msg = "addmultisigaddress <nrequired> <'[\"key\",\"key\"]'> [account]\n"
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	984 "Add a nrequired-to-sign multisignature address to the wallet\"\n"
1755 30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress Gavin Andresen <gavinandresen@gmail.com> parents: 1752 diff changeset	985 "each key is a bitcoin address or hex-encoded public key\n"
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	986 "If [account] is specified, assign address to [account].";
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	987 throw runtime_error(msg);
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	988 }
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	989
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	990 int nRequired = params[0].get_int();
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	991 const Array& keys = params[1].get_array();
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	992 string strAccount;
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	993 if (params.size() > 2)
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	994 strAccount = AccountFromValue(params[2]);
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	995
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	996 // Gather public keys
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	997 if (nRequired < 1 \|\| keys.size() < nRequired)
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	998 throw runtime_error(
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	999 strprintf("wrong number of keys"
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1000 "(got %d, need at least %d)", keys.size(), nRequired));
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1001 std::vector<CKey> pubkeys;
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1002 pubkeys.resize(keys.size());
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1003 for (int i = 0; i < keys.size(); i++)
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1004 {
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1005 const std::string& ks = keys[i].get_str();
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1006
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1007 // Case 1: bitcoin address and we have full public key:
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1008 CBitcoinAddress address(ks);
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1009 if (address.IsValid())
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1010 {
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1011 if (address.IsScript())
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1012 throw runtime_error(
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1013 strprintf("%s is a pay-to-script address",ks.c_str()));
1777 addcc9fb01f5 Fixed addmultisigaddress if looking up public keys from locked wallets. Gavin Andresen <gavinandresen@gmail.com> parents: 1759 diff changeset	1014 std::vector<unsigned char> vchPubKey;
addcc9fb01f5 Fixed addmultisigaddress if looking up public keys from locked wallets. Gavin Andresen <gavinandresen@gmail.com> parents: 1759 diff changeset	1015 if (!pwalletMain->GetPubKey(address, vchPubKey))
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1016 throw runtime_error(
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1017 strprintf("no full public key for address %s",ks.c_str()));
1777 addcc9fb01f5 Fixed addmultisigaddress if looking up public keys from locked wallets. Gavin Andresen <gavinandresen@gmail.com> parents: 1759 diff changeset	1018 if (vchPubKey.empty() \|\| !pubkeys[i].SetPubKey(vchPubKey))
addcc9fb01f5 Fixed addmultisigaddress if looking up public keys from locked wallets. Gavin Andresen <gavinandresen@gmail.com> parents: 1759 diff changeset	1019 throw runtime_error(" Invalid public key: "+ks);
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1020 }
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1021
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1022 // Case 2: hex public key
1755 30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress Gavin Andresen <gavinandresen@gmail.com> parents: 1752 diff changeset	1023 else if (IsHex(ks))
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1024 {
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1025 vector<unsigned char> vchPubKey = ParseHex(ks);
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1026 if (vchPubKey.empty() \|\| !pubkeys[i].SetPubKey(vchPubKey))
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1027 throw runtime_error(" Invalid public key: "+ks);
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1028 }
1755 30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress Gavin Andresen <gavinandresen@gmail.com> parents: 1752 diff changeset	1029 else
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1030 {
1755 30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress Gavin Andresen <gavinandresen@gmail.com> parents: 1752 diff changeset	1031 throw runtime_error(" Invalid public key: "+ks);
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1032 }
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1033 }
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1034
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1035 // Construct using pay-to-script-hash:
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1036 CScript inner;
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1037 inner.SetMultisig(nRequired, pubkeys);
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1038
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1039 uint160 scriptHash = Hash160(inner);
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1040 CScript scriptPubKey;
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1041 scriptPubKey.SetPayToScriptHash(inner);
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	1042 pwalletMain->AddCScript(inner);
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1043 CBitcoinAddress address;
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1044 address.SetScriptHash160(scriptHash);
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1045
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1046 pwalletMain->SetAddressBookName(address, strAccount);
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1047 return address.ToString();
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1048 }
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1049
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1050
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1051 struct tallyitem
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1052 {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1053 int64 nAmount;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1054 int nConf;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1055 tallyitem()
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1056 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1057 nAmount = 0;
1594 e79944b2d430 Use std::numeric_limits<> for typesafe INT_MAX/etc Gavin Andresen <gavinandresen@gmail.com> parents: 1590 diff changeset	1058 nConf = std::numeric_limits<int>::max();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1059 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1060 };
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1061
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1062 Value ListReceived(const Array& params, bool fByAccounts)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1063 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1064 // Minimum confirmations
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1065 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1066 if (params.size() > 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1067 nMinDepth = params[0].get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1068
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1069 // Whether to include empty accounts
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1070 bool fIncludeEmpty = false;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1071 if (params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1072 fIncludeEmpty = params[1].get_bool();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1073
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1074 // Tally
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	1075 map<CBitcoinAddress, tallyitem> mapTally;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1076 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1077 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1078 const CWalletTx& wtx = (*it).second;
1618 e16276182f0f Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care) Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	1079
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1080 if (wtx.IsCoinBase() \|\| !wtx.IsFinal())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1081 continue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1082
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1083 int nDepth = wtx.GetDepthInMainChain();
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1084 if (nDepth < nMinDepth)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1085 continue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1086
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1087 BOOST_FOREACH(const CTxOut& txout, wtx.vout)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1088 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1089 CBitcoinAddress address;
1618 e16276182f0f Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care) Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	1090 if (!ExtractAddress(txout.scriptPubKey, address) \|\| !pwalletMain->HaveKey(address) \|\| !address.IsValid())
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1091 continue;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1092
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1093 tallyitem& item = mapTally[address];
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1094 item.nAmount += txout.nValue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1095 item.nConf = min(item.nConf, nDepth);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1096 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1097 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1098
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1099 // Reply
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1100 Array ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1101 map<string, tallyitem> mapAccountTally;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1102 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, string)& item, pwalletMain->mapAddressBook)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1103 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1104 const CBitcoinAddress& address = item.first;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1105 const string& strAccount = item.second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1106 map<CBitcoinAddress, tallyitem>::iterator it = mapTally.find(address);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1107 if (it == mapTally.end() && !fIncludeEmpty)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1108 continue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1109
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1110 int64 nAmount = 0;
1594 e79944b2d430 Use std::numeric_limits<> for typesafe INT_MAX/etc Gavin Andresen <gavinandresen@gmail.com> parents: 1590 diff changeset	1111 int nConf = std::numeric_limits<int>::max();
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1112 if (it != mapTally.end())
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1113 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1114 nAmount = (*it).second.nAmount;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1115 nConf = (*it).second.nConf;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1116 }
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1117
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1118 if (fByAccounts)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1119 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1120 tallyitem& item = mapAccountTally[strAccount];
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1121 item.nAmount += nAmount;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1122 item.nConf = min(item.nConf, nConf);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1123 }
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1124 else
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1125 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1126 Object obj;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1127 obj.push_back(Pair("address", address.ToString()));
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1128 obj.push_back(Pair("account", strAccount));
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1129 obj.push_back(Pair("amount", ValueFromAmount(nAmount)));
1594 e79944b2d430 Use std::numeric_limits<> for typesafe INT_MAX/etc Gavin Andresen <gavinandresen@gmail.com> parents: 1590 diff changeset	1130 obj.push_back(Pair("confirmations", (nConf == std::numeric_limits<int>::max() ? 0 : nConf)));
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1131 ret.push_back(obj);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1132 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1133 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1134
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1135 if (fByAccounts)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1136 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1137 for (map<string, tallyitem>::iterator it = mapAccountTally.begin(); it != mapAccountTally.end(); ++it)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1138 {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1139 int64 nAmount = (*it).second.nAmount;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1140 int nConf = (*it).second.nConf;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1141 Object obj;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1142 obj.push_back(Pair("account", (*it).first));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1143 obj.push_back(Pair("amount", ValueFromAmount(nAmount)));
1594 e79944b2d430 Use std::numeric_limits<> for typesafe INT_MAX/etc Gavin Andresen <gavinandresen@gmail.com> parents: 1590 diff changeset	1144 obj.push_back(Pair("confirmations", (nConf == std::numeric_limits<int>::max() ? 0 : nConf)));
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1145 ret.push_back(obj);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1146 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1147 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1148
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1149 return ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1150 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1151
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1152 Value listreceivedbyaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1153 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1154 if (fHelp \|\| params.size() > 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1155 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1156 "listreceivedbyaddress [minconf=1] [includeempty=false]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1157 "[minconf] is the minimum number of confirmations before payments are included.\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1158 "[includeempty] whether to include addresses that haven't received any payments.\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1159 "Returns an array of objects containing:\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1160 " \"address\" : receiving address\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1161 " \"account\" : the account of the receiving address\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1162 " \"amount\" : total amount received by the address\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1163 " \"confirmations\" : number of confirmations of the most recent transaction included");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1164
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1165 return ListReceived(params, false);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1166 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1167
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1168 Value listreceivedbyaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1169 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1170 if (fHelp \|\| params.size() > 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1171 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1172 "listreceivedbyaccount [minconf=1] [includeempty=false]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1173 "[minconf] is the minimum number of confirmations before payments are included.\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1174 "[includeempty] whether to include accounts that haven't received any payments.\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1175 "Returns an array of objects containing:\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1176 " \"account\" : the account of the receiving addresses\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1177 " \"amount\" : total amount received by addresses with this account\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1178 " \"confirmations\" : number of confirmations of the most recent transaction included");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1179
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1180 return ListReceived(params, true);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1181 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1182
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1183 void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDepth, bool fLong, Array& ret)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1184 {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1185 int64 nGeneratedImmature, nGeneratedMature, nFee;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1186 string strSentAccount;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1187 list<pair<CBitcoinAddress, int64> > listReceived;
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1188 list<pair<CBitcoinAddress, int64> > listSent;
1618 e16276182f0f Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care) Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	1189
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1190 wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1191
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1192 bool fAllAccounts = (strAccount == string("*"));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1193
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1194 // Generated blocks assigned to account ""
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1195 if ((nGeneratedMature+nGeneratedImmature) != 0 && (fAllAccounts \|\| strAccount == ""))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1196 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1197 Object entry;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1198 entry.push_back(Pair("account", string("")));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1199 if (nGeneratedImmature)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1200 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1201 entry.push_back(Pair("category", wtx.GetDepthInMainChain() ? "immature" : "orphan"));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1202 entry.push_back(Pair("amount", ValueFromAmount(nGeneratedImmature)));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1203 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1204 else
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1205 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1206 entry.push_back(Pair("category", "generate"));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1207 entry.push_back(Pair("amount", ValueFromAmount(nGeneratedMature)));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1208 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1209 if (fLong)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1210 WalletTxToJSON(wtx, entry);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1211 ret.push_back(entry);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1212 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1213
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1214 // Sent
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1215 if ((!listSent.empty() \|\| nFee != 0) && (fAllAccounts \|\| strAccount == strSentAccount))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1216 {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1217 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, int64)& s, listSent)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1218 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1219 Object entry;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1220 entry.push_back(Pair("account", strSentAccount));
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	1221 entry.push_back(Pair("address", s.first.ToString()));
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1222 entry.push_back(Pair("category", "send"));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1223 entry.push_back(Pair("amount", ValueFromAmount(-s.second)));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1224 entry.push_back(Pair("fee", ValueFromAmount(-nFee)));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1225 if (fLong)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1226 WalletTxToJSON(wtx, entry);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1227 ret.push_back(entry);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1228 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1229 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1230
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1231 // Received
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1232 if (listReceived.size() > 0 && wtx.GetDepthInMainChain() >= nMinDepth)
2246 b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] Wladimir J. van der Laan <laanwj@gmail.com> parents: 2219 diff changeset	1233 {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1234 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, int64)& r, listReceived)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1235 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1236 string account;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1237 if (pwalletMain->mapAddressBook.count(r.first))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1238 account = pwalletMain->mapAddressBook[r.first];
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1239 if (fAllAccounts \|\| (account == strAccount))
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1240 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1241 Object entry;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1242 entry.push_back(Pair("account", account));
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1243 entry.push_back(Pair("address", r.first.ToString()));
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1244 entry.push_back(Pair("category", "receive"));
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1245 entry.push_back(Pair("amount", ValueFromAmount(r.second)));
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1246 if (fLong)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1247 WalletTxToJSON(wtx, entry);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1248 ret.push_back(entry);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1249 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1250 }
2246 b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses] Wladimir J. van der Laan <laanwj@gmail.com> parents: 2219 diff changeset	1251 }
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1252 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1253
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1254 void AcentryToJSON(const CAccountingEntry& acentry, const string& strAccount, Array& ret)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1255 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1256 bool fAllAccounts = (strAccount == string("*"));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1257
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1258 if (fAllAccounts \|\| acentry.strAccount == strAccount)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1259 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1260 Object entry;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1261 entry.push_back(Pair("account", acentry.strAccount));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1262 entry.push_back(Pair("category", "move"));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1263 entry.push_back(Pair("time", (boost::int64_t)acentry.nTime));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1264 entry.push_back(Pair("amount", ValueFromAmount(acentry.nCreditDebit)));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1265 entry.push_back(Pair("otheraccount", acentry.strOtherAccount));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1266 entry.push_back(Pair("comment", acentry.strComment));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1267 ret.push_back(entry);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1268 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1269 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1270
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1271 Value listtransactions(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1272 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1273 if (fHelp \|\| params.size() > 3)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1274 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1275 "listtransactions [account] [count=10] [from=0]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1276 "Returns up to [count] most recent transactions skipping the first [from] transactions for account [account].");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1277
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1278 string strAccount = "*";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1279 if (params.size() > 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1280 strAccount = params[0].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1281 int nCount = 10;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1282 if (params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1283 nCount = params[1].get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1284 int nFrom = 0;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1285 if (params.size() > 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1286 nFrom = params[2].get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1287
2168 babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1288 if (nCount < 0)
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1289 throw JSONRPCError(-8, "Negative count");
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1290 if (nFrom < 0)
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1291 throw JSONRPCError(-8, "Negative from");
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1292
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1293 Array ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1294 CWalletDB walletdb(pwalletMain->strWalletFile);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1295
2168 babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1296 // First: get all CWalletTx and CAccountingEntry into a sorted-by-time multimap.
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1297 typedef pair<CWalletTx, CAccountingEntry> TxPair;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1298 typedef multimap<int64, TxPair > TxItems;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1299 TxItems txByTime;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1300
2168 babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1301 // Note: maintaining indices in the database of (account,time) --> txid and (account, time) --> acentry
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1302 // would make this much faster for applications that do this a lot.
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1303 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1304 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1305 CWalletTx* wtx = &((*it).second);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1306 txByTime.insert(make_pair(wtx->GetTxTime(), TxPair(wtx, (CAccountingEntry*)0)));
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1307 }
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1308 list<CAccountingEntry> acentries;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1309 walletdb.ListAccountCreditDebit(strAccount, acentries);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1310 BOOST_FOREACH(CAccountingEntry& entry, acentries)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1311 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1312 txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry)));
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1313 }
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1314
2168 babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1315 // iterate backwards until we have nCount items to return:
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1316 for (TxItems::reverse_iterator it = txByTime.rbegin(); it != txByTime.rend(); ++it)
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1317 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1318 CWalletTx const pwtx = (it).second.first;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1319 if (pwtx != 0)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1320 ListTransactions(*pwtx, strAccount, 0, true, ret);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1321 CAccountingEntry const pacentry = (it).second.second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1322 if (pacentry != 0)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1323 AcentryToJSON(*pacentry, strAccount, ret);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1324
2168 babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1325 if (ret.size() >= (nCount+nFrom)) break;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1326 }
2168 babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1327 // ret is newest to oldest
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	1328
2168 babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1329 if (nFrom > ret.size()) nFrom = ret.size();
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1330 if (nFrom+nCount > ret.size()) nCount = ret.size()-nFrom;
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1331 Array::iterator first = ret.begin();
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1332 std::advance(first, nFrom);
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1333 Array::iterator last = ret.begin();
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1334 std::advance(last, nFrom+nCount);
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1335
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1336 if (last != ret.end()) ret.erase(last, ret.end());
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1337 if (first != ret.begin()) ret.erase(ret.begin(), first);
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1338
babecba95257 Bug fix listtransactions from/count handling. Gavin Andresen <gavinandresen@gmail.com> parents: 2154 diff changeset	1339 std::reverse(ret.begin(), ret.end()); // Return oldest to newest
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1340
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1341 return ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1342 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1343
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1344 Value listaccounts(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1345 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1346 if (fHelp \|\| params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1347 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1348 "listaccounts [minconf=1]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1349 "Returns Object that has account names as keys, account balances as values.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1350
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1351 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1352 if (params.size() > 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1353 nMinDepth = params[0].get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1354
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1355 map<string, int64> mapAccountBalances;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1356 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, string)& entry, pwalletMain->mapAddressBook) {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1357 if (pwalletMain->HaveKey(entry.first)) // This address belongs to me
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1358 mapAccountBalances[entry.second] = 0;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1359 }
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1360
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1361 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1362 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1363 const CWalletTx& wtx = (*it).second;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1364 int64 nGeneratedImmature, nGeneratedMature, nFee;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1365 string strSentAccount;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1366 list<pair<CBitcoinAddress, int64> > listReceived;
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1367 list<pair<CBitcoinAddress, int64> > listSent;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1368 wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1369 mapAccountBalances[strSentAccount] -= nFee;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1370 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, int64)& s, listSent)
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1371 mapAccountBalances[strSentAccount] -= s.second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1372 if (wtx.GetDepthInMainChain() >= nMinDepth)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1373 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1374 mapAccountBalances[""] += nGeneratedMature;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1375 BOOST_FOREACH(const PAIRTYPE(CBitcoinAddress, int64)& r, listReceived)
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1376 if (pwalletMain->mapAddressBook.count(r.first))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1377 mapAccountBalances[pwalletMain->mapAddressBook[r.first]] += r.second;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1378 else
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1379 mapAccountBalances[""] += r.second;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1380 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1381 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1382
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1383 list<CAccountingEntry> acentries;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1384 CWalletDB(pwalletMain->strWalletFile).ListAccountCreditDebit("*", acentries);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1385 BOOST_FOREACH(const CAccountingEntry& entry, acentries)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1386 mapAccountBalances[entry.strAccount] += entry.nCreditDebit;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1387
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1388 Object ret;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1389 BOOST_FOREACH(const PAIRTYPE(string, int64)& accountBalance, mapAccountBalances) {
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1390 ret.push_back(Pair(accountBalance.first, ValueFromAmount(accountBalance.second)));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1391 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1392 return ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1393 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1394
1382 f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1395 Value listsinceblock(const Array& params, bool fHelp)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1396 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1397 if (fHelp)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1398 throw runtime_error(
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1399 "listsinceblock [blockid] [target-confirmations]\n"
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1400 "Get all transactions in blocks since block [blockid], or all transactions if omitted");
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1401
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1402 CBlockIndex *pindex = NULL;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1403 int target_confirms = 1;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1404
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1405 if (params.size() > 0)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1406 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1407 uint256 blockId = 0;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1408
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1409 blockId.SetHex(params[0].get_str());
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1410 pindex = CBlockLocator(blockId).GetBlockIndex();
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1411 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1412
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1413 if (params.size() > 1)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1414 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1415 target_confirms = params[1].get_int();
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1416
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1417 if (target_confirms < 1)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1418 throw JSONRPCError(-8, "Invalid parameter");
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1419 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1420
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1421 int depth = pindex ? (1 + nBestHeight - pindex->nHeight) : -1;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1422
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1423 Array transactions;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1424
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1425 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); it++)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1426 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1427 CWalletTx tx = (*it).second;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1428
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1429 if (depth == -1 \|\| tx.GetDepthInMainChain() < depth)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1430 ListTransactions(tx, "*", 0, true, transactions);
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1431 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1432
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1433 uint256 lastblock;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1434
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1435 if (target_confirms == 1)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1436 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1437 printf("oops!\n");
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1438 lastblock = hashBestChain;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1439 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1440 else
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1441 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1442 int target_height = pindexBest->nHeight + 1 - target_confirms;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1443
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1444 CBlockIndex *block;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1445 for (block = pindexBest;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1446 block && block->nHeight > target_height;
1749 a16663dadac9 Compile with extra warnings turned on. And more makefile/code tidying up. Gavin Andresen <gavinandresen@gmail.com> parents: 1734 diff changeset	1447 block = block->pprev) { }
1382 f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1448
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1449 lastblock = block ? block->GetBlockHash() : 0;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1450 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1451
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1452 Object ret;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1453 ret.push_back(Pair("transactions", transactions));
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1454 ret.push_back(Pair("lastblock", lastblock.GetHex()));
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1455
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1456 return ret;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1457 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	1458
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1459 Value gettransaction(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1460 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1461 if (fHelp \|\| params.size() != 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1462 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1463 "gettransaction <txid>\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1464 "Get detailed information about <txid>");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1465
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1466 uint256 hash;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1467 hash.SetHex(params[0].get_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1468
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1469 Object entry;
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1470
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1471 if (!pwalletMain->mapWallet.count(hash))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1472 throw JSONRPCError(-5, "Invalid or non-wallet transaction id");
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1473 const CWalletTx& wtx = pwalletMain->mapWallet[hash];
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1474
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1475 int64 nCredit = wtx.GetCredit();
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1476 int64 nDebit = wtx.GetDebit();
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1477 int64 nNet = nCredit - nDebit;
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1478 int64 nFee = (wtx.IsFromMe() ? wtx.GetValueOut() - nDebit : 0);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1479
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1480 entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1481 if (wtx.IsFromMe())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1482 entry.push_back(Pair("fee", ValueFromAmount(nFee)));
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1483
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1484 WalletTxToJSON(pwalletMain->mapWallet[hash], entry);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1485
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1486 Array details;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1487 ListTransactions(pwalletMain->mapWallet[hash], "*", 0, false, details);
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1488 entry.push_back(Pair("details", details));
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1489
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1490 return entry;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1491 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1492
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1493
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1494 Value backupwallet(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1495 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1496 if (fHelp \|\| params.size() != 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1497 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1498 "backupwallet <destination>\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1499 "Safely copies wallet.dat to destination, which can be a directory or a path with filename.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1500
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1501 string strDest = params[0].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1502 BackupWallet(*pwalletMain, strDest);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1503
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1504 return Value::null;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1505 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1506
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1507
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1508 Value keypoolrefill(const Array& params, bool fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1509 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1510 if (pwalletMain->IsCrypted() && (fHelp \|\| params.size() > 0))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1511 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1512 "keypoolrefill\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1513 "Fills the keypool, requires wallet passphrase to be set.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1514 if (!pwalletMain->IsCrypted() && (fHelp \|\| params.size() > 0))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1515 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1516 "keypoolrefill\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1517 "Fills the keypool.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1518
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1519 if (pwalletMain->IsLocked())
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1520 throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.");
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1521
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1522 pwalletMain->TopUpKeyPool();
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1523
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1524 if (pwalletMain->GetKeyPoolSize() < GetArg("-keypool", 100))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1525 throw JSONRPCError(-4, "Error refreshing keypool.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1526
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1527 return Value::null;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1528 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1529
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1530
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1531 void ThreadTopUpKeyPool(void* parg)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1532 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1533 pwalletMain->TopUpKeyPool();
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1534 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1535
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1536 void ThreadCleanWalletPassphrase(void* parg)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1537 {
1942 aa7f644075af Resolves issue #922 - "wallet passphrase timeout of several years doesn't work" Gregory Maxwell <greg@xiph.org> parents: 1920 diff changeset	1538 int64 nMyWakeTime = GetTimeMillis() + ((int64)parg) * 1000;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1539
1833 b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1540 ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime);
b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1541
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1542 if (nWalletUnlockTime == 0)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1543 {
1833 b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1544 nWalletUnlockTime = nMyWakeTime;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1545
1834 1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1546 do
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1547 {
1834 1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1548 if (nWalletUnlockTime==0)
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1549 break;
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1550 int64 nToSleep = nWalletUnlockTime - GetTimeMillis();
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1551 if (nToSleep <= 0)
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1552 break;
1833 b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1553
b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1554 LEAVE_CRITICAL_SECTION(cs_nWalletUnlockTime);
b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1555 Sleep(nToSleep);
b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1556 ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime);
1834 1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1557
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1558 } while(1);
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1559
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1560 if (nWalletUnlockTime)
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1561 {
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1562 nWalletUnlockTime = 0;
1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1563 pwalletMain->Lock();
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1564 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1565 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1566 else
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1567 {
1833 b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1568 if (nWalletUnlockTime < nMyWakeTime)
b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1569 nWalletUnlockTime = nMyWakeTime;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1570 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1571
1833 b1be8c6fa967 Fix wallet locking locking Pieter Wuille <pieter.wuille@gmail.com> parents: 1828 diff changeset	1572 LEAVE_CRITICAL_SECTION(cs_nWalletUnlockTime);
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1573
1942 aa7f644075af Resolves issue #922 - "wallet passphrase timeout of several years doesn't work" Gregory Maxwell <greg@xiph.org> parents: 1920 diff changeset	1574 delete (int64*)parg;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1575 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1576
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1577 Value walletpassphrase(const Array& params, bool fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1578 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1579 if (pwalletMain->IsCrypted() && (fHelp \|\| params.size() != 2))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1580 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1581 "walletpassphrase <passphrase> <timeout>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1582 "Stores the wallet decryption key in memory for <timeout> seconds.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1583 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1584 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1585 if (!pwalletMain->IsCrypted())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1586 throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletpassphrase was called.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1587
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1588 if (!pwalletMain->IsLocked())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1589 throw JSONRPCError(-17, "Error: Wallet is already unlocked.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1590
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1591 // Note that the walletpassphrase is stored in params[0] which is not mlock()ed
1533 d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1592 SecureString strWalletPass;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1593 strWalletPass.reserve(100);
1533 d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1594 // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string)
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1595 // Alternately, find a way to make params[0] mlock()'d to begin with.
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1596 strWalletPass = params[0].get_str().c_str();
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1597
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1598 if (strWalletPass.length() > 0)
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1599 {
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1600 if (!pwalletMain->Unlock(strWalletPass))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1601 throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect.");
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1602 }
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1603 else
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1604 throw runtime_error(
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1605 "walletpassphrase <passphrase> <timeout>\n"
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1606 "Stores the wallet decryption key in memory for <timeout> seconds.");
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1607
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1608 CreateThread(ThreadTopUpKeyPool, NULL);
1942 aa7f644075af Resolves issue #922 - "wallet passphrase timeout of several years doesn't work" Gregory Maxwell <greg@xiph.org> parents: 1920 diff changeset	1609 int64* pnSleepTime = new int64(params[1].get_int64());
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1610 CreateThread(ThreadCleanWalletPassphrase, pnSleepTime);
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1611
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1612 return Value::null;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1613 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1614
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1615
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1616 Value walletpassphrasechange(const Array& params, bool fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1617 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1618 if (pwalletMain->IsCrypted() && (fHelp \|\| params.size() != 2))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1619 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1620 "walletpassphrasechange <oldpassphrase> <newpassphrase>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1621 "Changes the wallet passphrase from <oldpassphrase> to <newpassphrase>.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1622 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1623 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1624 if (!pwalletMain->IsCrypted())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1625 throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletpassphrasechange was called.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1626
1533 d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1627 // TODO: get rid of these .c_str() calls by implementing SecureString::operator=(std::string)
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1628 // Alternately, find a way to make params[0] mlock()'d to begin with.
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1629 SecureString strOldWalletPass;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1630 strOldWalletPass.reserve(100);
1533 d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1631 strOldWalletPass = params[0].get_str().c_str();
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1632
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1633 SecureString strNewWalletPass;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1634 strNewWalletPass.reserve(100);
1533 d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1635 strNewWalletPass = params[1].get_str().c_str();
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1636
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1637 if (strOldWalletPass.length() < 1 \|\| strNewWalletPass.length() < 1)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1638 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1639 "walletpassphrasechange <oldpassphrase> <newpassphrase>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1640 "Changes the wallet passphrase from <oldpassphrase> to <newpassphrase>.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1641
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1642 if (!pwalletMain->ChangeWalletPassphrase(strOldWalletPass, strNewWalletPass))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1643 throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1644
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1645 return Value::null;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1646 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1647
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1648
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1649 Value walletlock(const Array& params, bool fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1650 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1651 if (pwalletMain->IsCrypted() && (fHelp \|\| params.size() != 0))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1652 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1653 "walletlock\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1654 "Removes the wallet encryption key from memory, locking the wallet.\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1655 "After calling this method, you will need to call walletpassphrase again\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1656 "before being able to call any methods which require the wallet to be unlocked.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1657 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1658 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1659 if (!pwalletMain->IsCrypted())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1660 throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletlock was called.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1661
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1662 {
2190 60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK Pieter Wuille <pieter.wuille@gmail.com> parents: 2174 diff changeset	1663 LOCK(cs_nWalletUnlockTime);
1834 1961ebec6e7d Extra wallet locking fixes Pieter Wuille <pieter.wuille@gmail.com> parents: 1833 diff changeset	1664 pwalletMain->Lock();
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1665 nWalletUnlockTime = 0;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1666 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1667
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1668 return Value::null;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1669 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1670
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1671
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1672 Value encryptwallet(const Array& params, bool fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1673 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1674 if (!pwalletMain->IsCrypted() && (fHelp \|\| params.size() != 1))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1675 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1676 "encryptwallet <passphrase>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1677 "Encrypts the wallet with <passphrase>.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1678 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1679 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1680 if (pwalletMain->IsCrypted())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1681 throw JSONRPCError(-15, "Error: running with an encrypted wallet, but encryptwallet was called.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1682
1533 d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1683 // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string)
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1684 // Alternately, find a way to make params[0] mlock()'d to begin with.
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1685 SecureString strWalletPass;
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1686 strWalletPass.reserve(100);
1533 d0ccfedf2957 Implement an mlock()'d string class for storing passphrases Dylan Noblesmith <nobled@dreamwidth.org> parents: 1521 diff changeset	1687 strWalletPass = params[0].get_str().c_str();
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1688
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1689 if (strWalletPass.length() < 1)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1690 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1691 "encryptwallet <passphrase>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1692 "Encrypts the wallet with <passphrase>.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1693
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1694 if (!pwalletMain->EncryptWallet(strWalletPass))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1695 throw JSONRPCError(-16, "Error: Failed to encrypt the wallet.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1696
1501 26d0f350347a Obsolete keypool and make sure database removes log files on shutdown. Gavin Andresen <gavinandresen@gmail.com> parents: 1493 diff changeset	1697 // BDB seems to have a bad habit of writing old data into
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown. Gavin Andresen <gavinandresen@gmail.com> parents: 1493 diff changeset	1698 // slack space in .dat files; that is bad if the old data is
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown. Gavin Andresen <gavinandresen@gmail.com> parents: 1493 diff changeset	1699 // unencrypted private keys. So:
2152 aef73b9ddae3 support RPC stop and encryptwallet with UI Wladimir J. van der Laan <laanwj@gmail.com> parents: 2143 diff changeset	1700 QueueShutdown();
1501 26d0f350347a Obsolete keypool and make sure database removes log files on shutdown. Gavin Andresen <gavinandresen@gmail.com> parents: 1493 diff changeset	1701 return "wallet encrypted; bitcoin server stopping, restart to run with encrypted wallet";
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1702 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1703
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	1704
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1705 Value validateaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1706 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1707 if (fHelp \|\| params.size() != 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1708 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1709 "validateaddress <bitcoinaddress>\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1710 "Return information about <bitcoinaddress>.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1711
1256 3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1220 diff changeset	1712 CBitcoinAddress address(params[0].get_str());
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	1713 bool isValid = address.IsValid();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1714
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1715 Object ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1716 ret.push_back(Pair("isvalid", isValid));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1717 if (isValid)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1718 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1719 // Call Hash160ToAddress() so we always return current ADDRESSVERSION
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1720 // version of the address:
1220 e69e63528ec2 Merge remote branch 'upstream/master' Wladimir J. van der Laan <laanwj@gmail.com> parents: 1186 diff changeset	1721 string currentAddress = address.ToString();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1722 ret.push_back(Pair("address", currentAddress));
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1723 if (pwalletMain->HaveKey(address))
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1724 {
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1725 ret.push_back(Pair("ismine", true));
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1726 std::vector<unsigned char> vchPubKey;
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1727 pwalletMain->GetPubKey(address, vchPubKey);
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1728 ret.push_back(Pair("pubkey", HexStr(vchPubKey)));
1734 adac2d60ce43 Compressed pubkeys Pieter Wuille <pieter.wuille@gmail.com> parents: 1627 diff changeset	1729 CKey key;
adac2d60ce43 Compressed pubkeys Pieter Wuille <pieter.wuille@gmail.com> parents: 1627 diff changeset	1730 key.SetPubKey(vchPubKey);
adac2d60ce43 Compressed pubkeys Pieter Wuille <pieter.wuille@gmail.com> parents: 1627 diff changeset	1731 ret.push_back(Pair("iscompressed", key.IsCompressed()));
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1732 }
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1733 else if (pwalletMain->HaveCScript(address.GetHash160()))
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1734 {
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1735 ret.push_back(Pair("isscript", true));
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1736 CScript subscript;
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1737 pwalletMain->GetCScript(address.GetHash160(), subscript);
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1738 ret.push_back(Pair("ismine", ::IsMine(*pwalletMain, subscript)));
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1739 std::vector<CBitcoinAddress> addresses;
1604 2d635cbb6a2d Use block times for 'hard' OP_EVAL switchover, and refactored EvalScript Gavin Andresen <gavinandresen@gmail.com> parents: 1602 diff changeset	1740 txnouttype whichType;
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1741 int nRequired;
1618 e16276182f0f Fix broken ExtractAddress (refactored, made callers check for addresses in keystore if they care) Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	1742 ExtractAddresses(subscript, whichType, addresses, nRequired);
1604 2d635cbb6a2d Use block times for 'hard' OP_EVAL switchover, and refactored EvalScript Gavin Andresen <gavinandresen@gmail.com> parents: 1602 diff changeset	1743 ret.push_back(Pair("script", GetTxnOutputType(whichType)));
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1744 Array a;
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1745 BOOST_FOREACH(const CBitcoinAddress& addr, addresses)
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1746 a.push_back(addr.ToString());
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1747 ret.push_back(Pair("addresses", a));
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1748 if (whichType == TX_MULTISIG)
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1749 ret.push_back(Pair("sigsrequired", nRequired));
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	1750 }
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1751 else
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	1752 ret.push_back(Pair("ismine", false));
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1753 if (pwalletMain->mapAddressBook.count(address))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	1754 ret.push_back(Pair("account", pwalletMain->mapAddressBook[address]));
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1755 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1756 return ret;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1757 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1758
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1759 Value getwork(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1760 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1761 if (fHelp \|\| params.size() > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1762 throw runtime_error(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1763 "getwork [data]\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1764 "If [data] is not specified, returns formatted hash data to work on:\n"
1337 447bba2f0a56 deprecate midstate and hash1 in getwork Nils Schneider <nils.schneider@gmail.com> parents: 1320 diff changeset	1765 " \"midstate\" : precomputed hash state after hashing the first half of the data (DEPRECATED)\n" // deprecated
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1766 " \"data\" : block data\n"
1337 447bba2f0a56 deprecate midstate and hash1 in getwork Nils Schneider <nils.schneider@gmail.com> parents: 1320 diff changeset	1767 " \"hash1\" : formatted hash buffer for second hash (DEPRECATED)\n" // deprecated
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1768 " \"target\" : little endian hash target\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1769 "If [data] is specified, tries to solve the block and returns true if it was successful.");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1770
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1771 if (vNodes.empty())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1772 throw JSONRPCError(-9, "Bitcoin is not connected!");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1773
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1774 if (IsInitialBlockDownload())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1775 throw JSONRPCError(-10, "Bitcoin is downloading blocks...");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1776
1292 024a12d5558d Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1274 diff changeset	1777 typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
024a12d5558d Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1274 diff changeset	1778 static mapNewBlock_t mapNewBlock;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1779 static vector<CBlock*> vNewBlock;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1780 static CReserveKey reservekey(pwalletMain);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1781
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1782 if (params.size() == 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1783 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1784 // Update block
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1785 static unsigned int nTransactionsUpdatedLast;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1786 static CBlockIndex* pindexPrev;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1787 static int64 nStart;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1788 static CBlock* pblock;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1789 if (pindexPrev != pindexBest \|\|
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1790 (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1791 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1792 if (pindexPrev != pindexBest)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1793 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1794 // Deallocate old blocks since they're obsolete now
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1795 mapNewBlock.clear();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1796 BOOST_FOREACH(CBlock* pblock, vNewBlock)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1797 delete pblock;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1798 vNewBlock.clear();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1799 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1800 nTransactionsUpdatedLast = nTransactionsUpdated;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1801 pindexPrev = pindexBest;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1802 nStart = GetTime();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1803
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1804 // Create new block
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1805 pblock = CreateNewBlock(reservekey);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1806 if (!pblock)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1807 throw JSONRPCError(-7, "Out of memory");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1808 vNewBlock.push_back(pblock);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1809 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1810
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1811 // Update nTime
1854 cdea646ab88a Fix issue #848 : broken mining on testnet Gavin Andresen <gavinandresen@gmail.com> parents: 1834 diff changeset	1812 pblock->UpdateTime(pindexPrev);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1813 pblock->nNonce = 0;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1814
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1815 // Update nExtraNonce
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1816 static unsigned int nExtraNonce = 0;
1292 024a12d5558d Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1274 diff changeset	1817 IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1818
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1819 // Save
1292 024a12d5558d Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1274 diff changeset	1820 mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1821
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1822 // Prebuild hash buffers
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1823 char pmidstate[32];
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1824 char pdata[128];
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1825 char phash1[64];
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1826 FormatHashBuffers(pblock, pmidstate, pdata, phash1);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1827
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1828 uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1829
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1830 Object result;
1337 447bba2f0a56 deprecate midstate and hash1 in getwork Nils Schneider <nils.schneider@gmail.com> parents: 1320 diff changeset	1831 result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate)))); // deprecated
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1832 result.push_back(Pair("data", HexStr(BEGIN(pdata), END(pdata))));
1337 447bba2f0a56 deprecate midstate and hash1 in getwork Nils Schneider <nils.schneider@gmail.com> parents: 1320 diff changeset	1833 result.push_back(Pair("hash1", HexStr(BEGIN(phash1), END(phash1)))); // deprecated
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1834 result.push_back(Pair("target", HexStr(BEGIN(hashTarget), END(hashTarget))));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1835 return result;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1836 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1837 else
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1838 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1839 // Parse parameters
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1840 vector<unsigned char> vchData = ParseHex(params[0].get_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1841 if (vchData.size() != 128)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1842 throw JSONRPCError(-8, "Invalid parameter");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1843 CBlock* pdata = (CBlock*)&vchData[0];
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1844
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1845 // Byte reverse
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1846 for (int i = 0; i < 128/4; i++)
1359 08006bbf6cf3 remove cryptopp dependency, add simple unittest for SHA256Transform() Nils Schneider <nils.schneider@gmail.com> parents: 1358 diff changeset	1847 ((unsigned int)pdata)[i] = ByteReverse(((unsigned int)pdata)[i]);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1848
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1849 // Get saved block
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1850 if (!mapNewBlock.count(pdata->hashMerkleRoot))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1851 return false;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1852 CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1853
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1854 pblock->nTime = pdata->nTime;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1855 pblock->nNonce = pdata->nNonce;
1292 024a12d5558d Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1274 diff changeset	1856 pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1857 pblock->hashMerkleRoot = pblock->BuildMerkleTree();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1858
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1859 return CheckWork(pblock, *pwalletMain, reservekey);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1860 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1861 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1862
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1863
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1864 Value getmemorypool(const Array& params, bool fHelp)
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1865 {
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1866 if (fHelp \|\| params.size() > 1)
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1867 throw runtime_error(
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1868 "getmemorypool [data]\n"
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1869 "If [data] is not specified, returns data needed to construct a block to work on:\n"
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1870 " \"version\" : block version\n"
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1871 " \"previousblockhash\" : hash of current highest block\n"
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1872 " \"transactions\" : contents of non-coinbase transactions that should be included in the next block\n"
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1873 " \"coinbasevalue\" : maximum allowable input to coinbase transaction, including the generation award and transaction fees\n"
1758 b76bf0a37f87 Separated COINBASE_FLAGS out into main.h and made RPC getmemorypool return it Forrest Voight <forrest@forre.st> parents: 1755 diff changeset	1874 " \"coinbaseflags\" : data that should be included in coinbase so support for new features can be judged\n"
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1875 " \"time\" : timestamp appropriate for next block\n"
1759 1236caa4dc39 Added mintime and curtime to RPC getmemorypool Forrest Voight <forrest@forre.st> parents: 1758 diff changeset	1876 " \"mintime\" : minimum timestamp appropriate for next block\n"
1236caa4dc39 Added mintime and curtime to RPC getmemorypool Forrest Voight <forrest@forre.st> parents: 1758 diff changeset	1877 " \"curtime\" : current timestamp\n"
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1878 " \"bits\" : compressed target of next block\n"
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1879 "If [data] is specified, tries to solve the block and returns true if it was successful.");
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1880
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1881 if (params.size() == 0)
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1882 {
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1883 if (vNodes.empty())
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1884 throw JSONRPCError(-9, "Bitcoin is not connected!");
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1885
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1886 if (IsInitialBlockDownload())
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1887 throw JSONRPCError(-10, "Bitcoin is downloading blocks...");
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1888
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1889 static CReserveKey reservekey(pwalletMain);
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1890
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1891 // Update block
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1892 static unsigned int nTransactionsUpdatedLast;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1893 static CBlockIndex* pindexPrev;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1894 static int64 nStart;
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1895 static CBlock* pblock;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1896 if (pindexPrev != pindexBest \|\|
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1897 (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 5))
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1898 {
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1899 nTransactionsUpdatedLast = nTransactionsUpdated;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1900 pindexPrev = pindexBest;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1901 nStart = GetTime();
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1902
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1903 // Create new block
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1904 if(pblock)
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1905 delete pblock;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1906 pblock = CreateNewBlock(reservekey);
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1907 if (!pblock)
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1908 throw JSONRPCError(-7, "Out of memory");
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1909 }
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1910
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1911 // Update nTime
1854 cdea646ab88a Fix issue #848 : broken mining on testnet Gavin Andresen <gavinandresen@gmail.com> parents: 1834 diff changeset	1912 pblock->UpdateTime(pindexPrev);
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1913 pblock->nNonce = 0;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1914
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1915 Array transactions;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1916 BOOST_FOREACH(CTransaction tx, pblock->vtx) {
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1917 if(tx.IsCoinBase())
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1918 continue;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1919
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1920 CDataStream ssTx;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1921 ssTx << tx;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1922
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1923 transactions.push_back(HexStr(ssTx.begin(), ssTx.end()));
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1924 }
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1925
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1926 Object result;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1927 result.push_back(Pair("version", pblock->nVersion));
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1928 result.push_back(Pair("previousblockhash", pblock->hashPrevBlock.GetHex()));
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1929 result.push_back(Pair("transactions", transactions));
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1930 result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0].vout[0].nValue));
1758 b76bf0a37f87 Separated COINBASE_FLAGS out into main.h and made RPC getmemorypool return it Forrest Voight <forrest@forre.st> parents: 1755 diff changeset	1931 result.push_back(Pair("coinbaseflags", HexStr(COINBASE_FLAGS.begin(), COINBASE_FLAGS.end())));
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1932 result.push_back(Pair("time", (int64_t)pblock->nTime));
1759 1236caa4dc39 Added mintime and curtime to RPC getmemorypool Forrest Voight <forrest@forre.st> parents: 1758 diff changeset	1933 result.push_back(Pair("mintime", (int64_t)pindexPrev->GetMedianTimePast()+1));
1236caa4dc39 Added mintime and curtime to RPC getmemorypool Forrest Voight <forrest@forre.st> parents: 1758 diff changeset	1934 result.push_back(Pair("curtime", (int64_t)GetAdjustedTime()));
1900 7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent Luke Dashjr <luke-jr+git@utopios.org> parents: 1869 diff changeset	1935 result.push_back(Pair("bits", HexBits(pblock->nBits)));
1388 878c3aef8a40 Bugfix: "bits" should be a hex-string, not a number (that just doesn't make sense) Luke Dashjr <luke-jr+git@utopios.org> parents: 1384 diff changeset	1936
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1937 return result;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1938 }
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1939 else
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1940 {
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1941 // Parse parameters
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1942 CDataStream ssBlock(ParseHex(params[0].get_str()));
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1943 CBlock pblock;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1944 ssBlock >> pblock;
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1945
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1946 return ProcessBlock(NULL, &pblock);
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1947 }
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1948 }
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1949
1627 1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1950 Value getblockhash(const Array& params, bool fHelp)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1951 {
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1952 if (fHelp \|\| params.size() != 1)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1953 throw runtime_error(
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1954 "getblockhash <index>\n"
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1955 "Returns hash of block in best-block-chain at <index>.");
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1956
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1957 int nHeight = params[0].get_int();
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1958 if (nHeight < 0 \|\| nHeight > nBestHeight)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1959 throw runtime_error("Block number out of range.");
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1960
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1961 CBlock block;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1962 CBlockIndex* pblockindex = mapBlockIndex[hashBestChain];
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1963 while (pblockindex->nHeight > nHeight)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1964 pblockindex = pblockindex->pprev;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1965 return pblockindex->phashBlock->GetHex();
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1966 }
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1967
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1968 Value getblock(const Array& params, bool fHelp)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1969 {
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1970 if (fHelp \|\| params.size() != 1)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1971 throw runtime_error(
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1972 "getblock <hash>\n"
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1973 "Returns details of a block with given block-hash.");
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1974
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1975 std::string strHash = params[0].get_str();
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1976 uint256 hash(strHash);
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1977
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1978 if (mapBlockIndex.count(hash) == 0)
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1979 throw JSONRPCError(-5, "Block not found");
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1980
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1981 CBlock block;
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1982 CBlockIndex* pblockindex = mapBlockIndex[hash];
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1983 block.ReadFromDisk(pblockindex, true);
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1984
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1985 return blockToJSON(block, pblockindex);
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1986 }
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	1987
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	1988
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1989
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1990
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1991
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1992
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1993
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1994
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1995
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1996
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1997
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1998 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	1999 // Call Table
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2000 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2001
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2002 pair<string, rpcfn_type> pCallTable[] =
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2003 {
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2004 make_pair("help", &help),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2005 make_pair("stop", &stop),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2006 make_pair("getblockcount", &getblockcount),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2007 make_pair("getblocknumber", &getblocknumber),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2008 make_pair("getconnectioncount", &getconnectioncount),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2009 make_pair("getdifficulty", &getdifficulty),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2010 make_pair("getgenerate", &getgenerate),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2011 make_pair("setgenerate", &setgenerate),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2012 make_pair("gethashespersec", &gethashespersec),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2013 make_pair("getinfo", &getinfo),
1745 4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	2014 make_pair("getmininginfo", &getmininginfo),
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2015 make_pair("getnewaddress", &getnewaddress),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2016 make_pair("getaccountaddress", &getaccountaddress),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2017 make_pair("setaccount", &setaccount),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2018 make_pair("getaccount", &getaccount),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2019 make_pair("getaddressesbyaccount", &getaddressesbyaccount),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2020 make_pair("sendtoaddress", &sendtoaddress),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2021 make_pair("getreceivedbyaddress", &getreceivedbyaddress),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2022 make_pair("getreceivedbyaccount", &getreceivedbyaccount),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2023 make_pair("listreceivedbyaddress", &listreceivedbyaddress),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2024 make_pair("listreceivedbyaccount", &listreceivedbyaccount),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2025 make_pair("backupwallet", &backupwallet),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2026 make_pair("keypoolrefill", &keypoolrefill),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2027 make_pair("walletpassphrase", &walletpassphrase),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2028 make_pair("walletpassphrasechange", &walletpassphrasechange),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2029 make_pair("walletlock", &walletlock),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2030 make_pair("encryptwallet", &encryptwallet),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2031 make_pair("validateaddress", &validateaddress),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2032 make_pair("getbalance", &getbalance),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2033 make_pair("move", &movecmd),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2034 make_pair("sendfrom", &sendfrom),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2035 make_pair("sendmany", &sendmany),
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	2036 make_pair("addmultisigaddress", &addmultisigaddress),
1627 1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	2037 make_pair("getblock", &getblock),
1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	2038 make_pair("getblockhash", &getblockhash),
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2039 make_pair("gettransaction", &gettransaction),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2040 make_pair("listtransactions", &listtransactions),
1583 df45e8721f53 Key import and export Pieter Wuille <pieter.wuille@gmail.com> parents: 1582 diff changeset	2041 make_pair("signmessage", &signmessage),
df45e8721f53 Key import and export Pieter Wuille <pieter.wuille@gmail.com> parents: 1582 diff changeset	2042 make_pair("verifymessage", &verifymessage),
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2043 make_pair("getwork", &getwork),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2044 make_pair("listaccounts", &listaccounts),
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2045 make_pair("settxfee", &settxfee),
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	2046 make_pair("getmemorypool", &getmemorypool),
1583 df45e8721f53 Key import and export Pieter Wuille <pieter.wuille@gmail.com> parents: 1582 diff changeset	2047 make_pair("listsinceblock", &listsinceblock),
df45e8721f53 Key import and export Pieter Wuille <pieter.wuille@gmail.com> parents: 1582 diff changeset	2048 make_pair("dumpprivkey", &dumpprivkey),
df45e8721f53 Key import and export Pieter Wuille <pieter.wuille@gmail.com> parents: 1582 diff changeset	2049 make_pair("importprivkey", &importprivkey)
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2050 };
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2051 map<string, rpcfn_type> mapCallTable(pCallTable, pCallTable + sizeof(pCallTable)/sizeof(pCallTable[0]));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2052
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2053 string pAllowInSafeMode[] =
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2054 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2055 "help",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2056 "stop",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2057 "getblockcount",
1490 f5b3cf558f89 Deprecate RPC getblocknumber Michael Hendricks <michael@ndrix.org> parents: 1388 diff changeset	2058 "getblocknumber", // deprecated
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2059 "getconnectioncount",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2060 "getdifficulty",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2061 "getgenerate",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2062 "setgenerate",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2063 "gethashespersec",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2064 "getinfo",
1745 4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo" Luke Dashjr <luke-jr+git@utopios.org> parents: 1734 diff changeset	2065 "getmininginfo",
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2066 "getnewaddress",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2067 "getaccountaddress",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2068 "getaccount",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2069 "getaddressesbyaccount",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2070 "backupwallet",
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2071 "keypoolrefill",
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2072 "walletpassphrase",
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2073 "walletlock",
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2074 "validateaddress",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2075 "getwork",
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	2076 "getmemorypool",
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2077 };
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2078 set<string> setAllowInSafeMode(pAllowInSafeMode, pAllowInSafeMode + sizeof(pAllowInSafeMode)/sizeof(pAllowInSafeMode[0]));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2079
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2080
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2081
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2082
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2083 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2084 // HTTP protocol
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2085 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2086 // This ain't Apache. We're just using HTTP header for the length field
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2087 // and to be compatible with other JSON-RPC implementations.
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2088 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2089
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2090 string HTTPPost(const string& strMsg, const map<string,string>& mapRequestHeaders)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2091 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2092 ostringstream s;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2093 s << "POST / HTTP/1.1\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2094 << "User-Agent: bitcoin-json-rpc/" << FormatFullVersion() << "\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2095 << "Host: 127.0.0.1\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2096 << "Content-Type: application/json\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2097 << "Content-Length: " << strMsg.size() << "\r\n"
1375 7494c1ddaf7a Send "Connection: close" HTTP header with JSON-RPC requests (client) Luke Dashjr <luke-jr+git@utopios.org> parents: 1363 diff changeset	2098 << "Connection: close\r\n"
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2099 << "Accept: application/json\r\n";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2100 BOOST_FOREACH(const PAIRTYPE(string, string)& item, mapRequestHeaders)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2101 s << item.first << ": " << item.second << "\r\n";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2102 s << "\r\n" << strMsg;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2103
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2104 return s.str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2105 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2106
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2107 string rfc1123Time()
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2108 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2109 char buffer[64];
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2110 time_t now;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2111 time(&now);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2112 struct tm* now_gmt = gmtime(&now);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2113 string locale(setlocale(LC_TIME, NULL));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2114 setlocale(LC_TIME, "C"); // we want posix (aka "C") weekday/month strings
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2115 strftime(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S +0000", now_gmt);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2116 setlocale(LC_TIME, locale.c_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2117 return string(buffer);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2118 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2119
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2120 static string HTTPReply(int nStatus, const string& strMsg)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2121 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2122 if (nStatus == 401)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2123 return strprintf("HTTP/1.0 401 Authorization Required\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2124 "Date: %s\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2125 "Server: bitcoin-json-rpc/%s\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2126 "WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2127 "Content-Type: text/html\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2128 "Content-Length: 296\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2129 "\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2130 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2131 "\"http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd\">\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2132 "<HTML>\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2133 "<HEAD>\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2134 "<TITLE>Error</TITLE>\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2135 "<META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2136 "</HEAD>\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2137 "<BODY><H1>401 Unauthorized.</H1></BODY>\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2138 "</HTML>\r\n", rfc1123Time().c_str(), FormatFullVersion().c_str());
1384 024ebec128ee Use C's const char* for status strings rather than C++'s std::string, which is slower David Joel Schwartz <davidjoelschwartz@gmail.com> parents: 1382 diff changeset	2139 const char *cStatus;
024ebec128ee Use C's const char* for status strings rather than C++'s std::string, which is slower David Joel Schwartz <davidjoelschwartz@gmail.com> parents: 1382 diff changeset	2140 if (nStatus == 200) cStatus = "OK";
024ebec128ee Use C's const char* for status strings rather than C++'s std::string, which is slower David Joel Schwartz <davidjoelschwartz@gmail.com> parents: 1382 diff changeset	2141 else if (nStatus == 400) cStatus = "Bad Request";
024ebec128ee Use C's const char* for status strings rather than C++'s std::string, which is slower David Joel Schwartz <davidjoelschwartz@gmail.com> parents: 1382 diff changeset	2142 else if (nStatus == 403) cStatus = "Forbidden";
024ebec128ee Use C's const char* for status strings rather than C++'s std::string, which is slower David Joel Schwartz <davidjoelschwartz@gmail.com> parents: 1382 diff changeset	2143 else if (nStatus == 404) cStatus = "Not Found";
024ebec128ee Use C's const char* for status strings rather than C++'s std::string, which is slower David Joel Schwartz <davidjoelschwartz@gmail.com> parents: 1382 diff changeset	2144 else if (nStatus == 500) cStatus = "Internal Server Error";
024ebec128ee Use C's const char* for status strings rather than C++'s std::string, which is slower David Joel Schwartz <davidjoelschwartz@gmail.com> parents: 1382 diff changeset	2145 else cStatus = "";
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2146 return strprintf(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2147 "HTTP/1.1 %d %s\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2148 "Date: %s\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2149 "Connection: close\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2150 "Content-Length: %d\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2151 "Content-Type: application/json\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2152 "Server: bitcoin-json-rpc/%s\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2153 "\r\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2154 "%s",
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2155 nStatus,
1384 024ebec128ee Use C's const char* for status strings rather than C++'s std::string, which is slower David Joel Schwartz <davidjoelschwartz@gmail.com> parents: 1382 diff changeset	2156 cStatus,
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2157 rfc1123Time().c_str(),
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2158 strMsg.size(),
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2159 FormatFullVersion().c_str(),
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2160 strMsg.c_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2161 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2162
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2163 int ReadHTTPStatus(std::basic_istream<char>& stream)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2164 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2165 string str;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2166 getline(stream, str);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2167 vector<string> vWords;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2168 boost::split(vWords, str, boost::is_any_of(" "));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2169 if (vWords.size() < 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2170 return 500;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2171 return atoi(vWords[1].c_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2172 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2173
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2174 int ReadHTTPHeader(std::basic_istream<char>& stream, map<string, string>& mapHeadersRet)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2175 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2176 int nLen = 0;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2177 loop
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2178 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2179 string str;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2180 std::getline(stream, str);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2181 if (str.empty() \|\| str == "\r")
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2182 break;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2183 string::size_type nColon = str.find(":");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2184 if (nColon != string::npos)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2185 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2186 string strHeader = str.substr(0, nColon);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2187 boost::trim(strHeader);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2188 boost::to_lower(strHeader);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2189 string strValue = str.substr(nColon+1);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2190 boost::trim(strValue);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2191 mapHeadersRet[strHeader] = strValue;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2192 if (strHeader == "content-length")
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2193 nLen = atoi(strValue.c_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2194 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2195 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2196 return nLen;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2197 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2198
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2199 int ReadHTTP(std::basic_istream<char>& stream, map<string, string>& mapHeadersRet, string& strMessageRet)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2200 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2201 mapHeadersRet.clear();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2202 strMessageRet = "";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2203
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2204 // Read status
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2205 int nStatus = ReadHTTPStatus(stream);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2206
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2207 // Read header
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2208 int nLen = ReadHTTPHeader(stream, mapHeadersRet);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2209 if (nLen < 0 \|\| nLen > MAX_SIZE)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2210 return 500;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2211
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2212 // Read message
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2213 if (nLen > 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2214 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2215 vector<char> vch(nLen);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2216 stream.read(&vch[0], nLen);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2217 strMessageRet = string(vch.begin(), vch.end());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2218 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2219
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2220 return nStatus;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2221 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2222
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2223 bool HTTPAuthorized(map<string, string>& mapHeaders)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2224 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2225 string strAuth = mapHeaders["authorization"];
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2226 if (strAuth.substr(0,6) != "Basic ")
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2227 return false;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2228 string strUserPass64 = strAuth.substr(6); boost::trim(strUserPass64);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2229 string strUserPass = DecodeBase64(strUserPass64);
1541 d9bb9c516845 Speed up RPC authentication (reworked pull from Joel Katz) Gavin Andresen <gavinandresen@gmail.com> parents: 1533 diff changeset	2230 return strUserPass == strRPCUserColonPass;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2231 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2232
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2233 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2234 // JSON-RPC protocol. Bitcoin speaks version 1.0 for maximum compatibility,
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2235 // but uses JSON-RPC 1.1/2.0 standards for parts of the 1.0 standard that were
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2236 // unspecified (HTTP errors and contents of 'error').
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2237 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2238 // 1.0 spec: http://json-rpc.org/wiki/specification
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2239 // 1.2 spec: http://groups.google.com/group/json-rpc/web/json-rpc-over-http
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2240 // http://www.codeproject.com/KB/recipes/JSON_Spirit.aspx
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2241 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2242
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2243 string JSONRPCRequest(const string& strMethod, const Array& params, const Value& id)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2244 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2245 Object request;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2246 request.push_back(Pair("method", strMethod));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2247 request.push_back(Pair("params", params));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2248 request.push_back(Pair("id", id));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2249 return write_string(Value(request), false) + "\n";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2250 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2251
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2252 string JSONRPCReply(const Value& result, const Value& error, const Value& id)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2253 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2254 Object reply;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2255 if (error.type() != null_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2256 reply.push_back(Pair("result", Value::null));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2257 else
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2258 reply.push_back(Pair("result", result));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2259 reply.push_back(Pair("error", error));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2260 reply.push_back(Pair("id", id));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2261 return write_string(Value(reply), false) + "\n";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2262 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2263
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2264 void ErrorReply(std::ostream& stream, const Object& objError, const Value& id)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2265 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2266 // Send error reply from json-rpc error object
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2267 int nStatus = 500;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2268 int code = find_value(objError, "code").get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2269 if (code == -32600) nStatus = 400;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2270 else if (code == -32601) nStatus = 404;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2271 string strReply = JSONRPCReply(Value::null, objError, id);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2272 stream << HTTPReply(nStatus, strReply) << std::flush;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2273 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2274
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2275 bool ClientAllowed(const string& strAddress)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2276 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2277 if (strAddress == asio::ip::address_v4::loopback().to_string())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2278 return true;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2279 const vector<string>& vAllow = mapMultiArgs["-rpcallowip"];
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2280 BOOST_FOREACH(string strAllow, vAllow)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2281 if (WildcardMatch(strAddress, strAllow))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2282 return true;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2283 return false;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2284 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2285
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2286 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2287 // IOStream device that speaks SSL but can also speak non-SSL
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2288 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2289 class SSLIOStreamDevice : public iostreams::device<iostreams::bidirectional> {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2290 public:
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2291 SSLIOStreamDevice(SSLStream &streamIn, bool fUseSSLIn) : stream(streamIn)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2292 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2293 fUseSSL = fUseSSLIn;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2294 fNeedHandshake = fUseSSLIn;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2295 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2296
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2297 void handshake(ssl::stream_base::handshake_type role)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2298 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2299 if (!fNeedHandshake) return;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2300 fNeedHandshake = false;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2301 stream.handshake(role);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2302 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2303 std::streamsize read(char* s, std::streamsize n)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2304 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2305 handshake(ssl::stream_base::server); // HTTPS servers read first
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2306 if (fUseSSL) return stream.read_some(asio::buffer(s, n));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2307 return stream.next_layer().read_some(asio::buffer(s, n));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2308 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2309 std::streamsize write(const char* s, std::streamsize n)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2310 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2311 handshake(ssl::stream_base::client); // HTTPS clients write first
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2312 if (fUseSSL) return asio::write(stream, asio::buffer(s, n));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2313 return asio::write(stream.next_layer(), asio::buffer(s, n));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2314 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2315 bool connect(const std::string& server, const std::string& port)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2316 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2317 ip::tcp::resolver resolver(stream.get_io_service());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2318 ip::tcp::resolver::query query(server.c_str(), port.c_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2319 ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2320 ip::tcp::resolver::iterator end;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2321 boost::system::error_code error = asio::error::host_not_found;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2322 while (error && endpoint_iterator != end)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2323 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2324 stream.lowest_layer().close();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2325 stream.lowest_layer().connect(*endpoint_iterator++, error);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2326 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2327 if (error)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2328 return false;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2329 return true;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2330 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2331
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2332 private:
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2333 bool fNeedHandshake;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2334 bool fUseSSL;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2335 SSLStream& stream;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2336 };
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2337
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2338 void ThreadRPCServer(void* parg)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2339 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2340 IMPLEMENT_RANDOMIZE_STACK(ThreadRPCServer(parg));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2341 try
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2342 {
1852 ddd932bee2e8 Symbolic names for threads Pieter Wuille <pieter.wuille@gmail.com> parents: 1834 diff changeset	2343 vnThreadsRunning[THREAD_RPCSERVER]++;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2344 ThreadRPCServer2(parg);
1852 ddd932bee2e8 Symbolic names for threads Pieter Wuille <pieter.wuille@gmail.com> parents: 1834 diff changeset	2345 vnThreadsRunning[THREAD_RPCSERVER]--;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2346 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2347 catch (std::exception& e) {
1852 ddd932bee2e8 Symbolic names for threads Pieter Wuille <pieter.wuille@gmail.com> parents: 1834 diff changeset	2348 vnThreadsRunning[THREAD_RPCSERVER]--;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2349 PrintException(&e, "ThreadRPCServer()");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2350 } catch (...) {
1852 ddd932bee2e8 Symbolic names for threads Pieter Wuille <pieter.wuille@gmail.com> parents: 1834 diff changeset	2351 vnThreadsRunning[THREAD_RPCSERVER]--;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2352 PrintException(NULL, "ThreadRPCServer()");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2353 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2354 printf("ThreadRPCServer exiting\n");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2355 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2356
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2357 void ThreadRPCServer2(void* parg)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2358 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2359 printf("ThreadRPCServer started\n");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2360
1541 d9bb9c516845 Speed up RPC authentication (reworked pull from Joel Katz) Gavin Andresen <gavinandresen@gmail.com> parents: 1533 diff changeset	2361 strRPCUserColonPass = mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"];
1800 5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay. Gregory Maxwell <greg@xiph.org> parents: 1792 diff changeset	2362 if (mapArgs["-rpcpassword"] == "")
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2363 {
1800 5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay. Gregory Maxwell <greg@xiph.org> parents: 1792 diff changeset	2364 unsigned char rand_pwd[32];
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay. Gregory Maxwell <greg@xiph.org> parents: 1792 diff changeset	2365 RAND_bytes(rand_pwd, 32);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2366 string strWhatAmI = "To use bitcoind";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2367 if (mapArgs.count("-server"))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2368 strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2369 else if (mapArgs.count("-daemon"))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2370 strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\"");
2154 10afdbfc8c58 Use a messagebox to display the error when -server is provided without providing a rpc password Wladimir J. van der Laan <laanwj@gmail.com> parents: 2152 diff changeset	2371 ThreadSafeMessageBox(strprintf(
10afdbfc8c58 Use a messagebox to display the error when -server is provided without providing a rpc password Wladimir J. van der Laan <laanwj@gmail.com> parents: 2152 diff changeset	2372 _("%s, you must set a rpcpassword in the configuration file:\n %s\n"
10afdbfc8c58 Use a messagebox to display the error when -server is provided without providing a rpc password Wladimir J. van der Laan <laanwj@gmail.com> parents: 2152 diff changeset	2373 "It is recommended you use the following random password:\n"
10afdbfc8c58 Use a messagebox to display the error when -server is provided without providing a rpc password Wladimir J. van der Laan <laanwj@gmail.com> parents: 2152 diff changeset	2374 "rpcuser=bitcoinrpc\n"
10afdbfc8c58 Use a messagebox to display the error when -server is provided without providing a rpc password Wladimir J. van der Laan <laanwj@gmail.com> parents: 2152 diff changeset	2375 "rpcpassword=%s\n"
10afdbfc8c58 Use a messagebox to display the error when -server is provided without providing a rpc password Wladimir J. van der Laan <laanwj@gmail.com> parents: 2152 diff changeset	2376 "(you do not need to remember this password)\n"
10afdbfc8c58 Use a messagebox to display the error when -server is provided without providing a rpc password Wladimir J. van der Laan <laanwj@gmail.com> parents: 2152 diff changeset	2377 "If the file does not exist, create it with owner-readable-only file permissions.\n"),
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2378 strWhatAmI.c_str(),
2207 34d7dc611b26 Use filesystem::path instead of manual string tinkering Pieter Wuille <pieter.wuille@gmail.com> parents: 2205 diff changeset	2379 GetConfigFile().string().c_str(),
2154 10afdbfc8c58 Use a messagebox to display the error when -server is provided without providing a rpc password Wladimir J. van der Laan <laanwj@gmail.com> parents: 2152 diff changeset	2380 EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32).c_str()),
10afdbfc8c58 Use a messagebox to display the error when -server is provided without providing a rpc password Wladimir J. van der Laan <laanwj@gmail.com> parents: 2152 diff changeset	2381 _("Error"), wxOK \| wxMODAL);
2152 aef73b9ddae3 support RPC stop and encryptwallet with UI Wladimir J. van der Laan <laanwj@gmail.com> parents: 2143 diff changeset	2382 QueueShutdown();
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2383 return;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2384 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2385
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2386 bool fUseSSL = GetBoolArg("-rpcssl");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2387 asio::ip::address bindAddress = mapArgs.count("-rpcallowip") ? asio::ip::address_v4::any() : asio::ip::address_v4::loopback();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2388
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2389 asio::io_service io_service;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2390 ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 8332));
2187 a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2391 ip::tcp::acceptor acceptor(io_service);
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2392 try
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2393 {
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2394 acceptor.open(endpoint.protocol());
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2395 acceptor.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2396 acceptor.bind(endpoint);
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2397 acceptor.listen(socket_base::max_connections);
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2398 }
2205 8a17a73180e3 Remove path.make_preferred() calls, and fix compiler error in bitcoinrpc RE: boost::system Gavin Andresen <gavinandresen@gmail.com> parents: 2199 diff changeset	2399 catch(boost::system::system_error &e)
2187 a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2400 {
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2401 ThreadSafeMessageBox(strprintf(_("An error occured while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2402 _("Error"), wxOK \| wxMODAL);
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2403 QueueShutdown();
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2404 return;
a9bee27b1b96 Show error message instead of exception crash when unable to bind RPC port Wladimir J. van der Laan <laanwj@gmail.com> parents: 2174 diff changeset	2405 }
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2406
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2407 ssl::context context(io_service, ssl::context::sslv23);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2408 if (fUseSSL)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2409 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2410 context.set_options(ssl::context::no_sslv2);
2184 51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2411
51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2412 filesystem::path pathCertFile(GetArg("-rpcsslcertificatechainfile", "server.cert"));
51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2413 if (!pathCertFile.is_complete()) pathCertFile = filesystem::path(GetDataDir()) / pathCertFile;
2207 34d7dc611b26 Use filesystem::path instead of manual string tinkering Pieter Wuille <pieter.wuille@gmail.com> parents: 2205 diff changeset	2414 if (filesystem::exists(pathCertFile)) context.use_certificate_chain_file(pathCertFile.string());
2184 51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2415 else printf("ThreadRPCServer ERROR: missing server certificate file %s\n", pathCertFile.string().c_str());
51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2416
51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2417 filesystem::path pathPKFile(GetArg("-rpcsslprivatekeyfile", "server.pem"));
51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2418 if (!pathPKFile.is_complete()) pathPKFile = filesystem::path(GetDataDir()) / pathPKFile;
2207 34d7dc611b26 Use filesystem::path instead of manual string tinkering Pieter Wuille <pieter.wuille@gmail.com> parents: 2205 diff changeset	2419 if (filesystem::exists(pathPKFile)) context.use_private_key_file(pathPKFile.string(), ssl::context::pem);
2184 51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2420 else printf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string().c_str());
51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2421
51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2422 string strCiphers = GetArg("-rpcsslciphers", "TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH");
51d974a0c243 updated bitcoinrpc.cpp to use make_preferred() and removed double inclusion of boost/filesystem.hpp Philip Kaufmann <phil.kaufmann@t-online.de> parents: 2174 diff changeset	2423 SSL_CTX_set_cipher_list(context.impl(), strCiphers.c_str());
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2424 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2425
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2426 loop
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2427 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2428 // Accept connection
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2429 SSLStream sslStream(io_service, context);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2430 SSLIOStreamDevice d(sslStream, fUseSSL);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2431 iostreams::stream<SSLIOStreamDevice> stream(d);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2432
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2433 ip::tcp::endpoint peer;
1852 ddd932bee2e8 Symbolic names for threads Pieter Wuille <pieter.wuille@gmail.com> parents: 1834 diff changeset	2434 vnThreadsRunning[THREAD_RPCSERVER]--;
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2435 acceptor.accept(sslStream.lowest_layer(), peer);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2436 vnThreadsRunning[4]++;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2437 if (fShutdown)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2438 return;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2439
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2440 // Restrict callers by IP
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2441 if (!ClientAllowed(peer.address().to_string()))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2442 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2443 // Only send a 403 if we're not using SSL to prevent a DoS during the SSL handshake.
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2444 if (!fUseSSL)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2445 stream << HTTPReply(403, "") << std::flush;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2446 continue;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2447 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2448
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2449 map<string, string> mapHeaders;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2450 string strRequest;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2451
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2452 boost::thread api_caller(ReadHTTP, boost::ref(stream), boost::ref(mapHeaders), boost::ref(strRequest));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2453 if (!api_caller.timed_join(boost::posix_time::seconds(GetArg("-rpctimeout", 30))))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2454 { // Timed out:
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2455 acceptor.cancel();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2456 printf("ThreadRPCServer ReadHTTP timeout\n");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2457 continue;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2458 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2459
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2460 // Check authorization
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2461 if (mapHeaders.count("authorization") == 0)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2462 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2463 stream << HTTPReply(401, "") << std::flush;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2464 continue;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2465 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2466 if (!HTTPAuthorized(mapHeaders))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2467 {
1800 5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay. Gregory Maxwell <greg@xiph.org> parents: 1792 diff changeset	2468 printf("ThreadRPCServer incorrect password attempt from %s\n",peer.address().to_string().c_str());
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay. Gregory Maxwell <greg@xiph.org> parents: 1792 diff changeset	2469 /* Deter brute-forcing short passwords.
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay. Gregory Maxwell <greg@xiph.org> parents: 1792 diff changeset	2470 If this results in a DOS the user really
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay. Gregory Maxwell <greg@xiph.org> parents: 1792 diff changeset	2471 shouldn't have their RPC port exposed.*/
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay. Gregory Maxwell <greg@xiph.org> parents: 1792 diff changeset	2472 if (mapArgs["-rpcpassword"].size() < 20)
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay. Gregory Maxwell <greg@xiph.org> parents: 1792 diff changeset	2473 Sleep(250);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2474
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2475 stream << HTTPReply(401, "") << std::flush;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2476 continue;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2477 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2478
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2479 Value id = Value::null;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2480 try
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2481 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2482 // Parse request
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2483 Value valRequest;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2484 if (!read_string(strRequest, valRequest) \|\| valRequest.type() != obj_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2485 throw JSONRPCError(-32700, "Parse error");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2486 const Object& request = valRequest.get_obj();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2487
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2488 // Parse id now so errors from here on will have the id
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2489 id = find_value(request, "id");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2490
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2491 // Parse method
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2492 Value valMethod = find_value(request, "method");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2493 if (valMethod.type() == null_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2494 throw JSONRPCError(-32600, "Missing method");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2495 if (valMethod.type() != str_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2496 throw JSONRPCError(-32600, "Method must be a string");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2497 string strMethod = valMethod.get_str();
1363 5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution Forrest Voight <forrest@forre.st> parents: 1358 diff changeset	2498 if (strMethod != "getwork" && strMethod != "getmemorypool")
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2499 printf("ThreadRPCServer method=%s\n", strMethod.c_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2500
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2501 // Parse params
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2502 Value valParams = find_value(request, "params");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2503 Array params;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2504 if (valParams.type() == array_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2505 params = valParams.get_array();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2506 else if (valParams.type() == null_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2507 params = Array();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2508 else
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2509 throw JSONRPCError(-32600, "Params must be an array");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2510
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2511 // Find method
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2512 map<string, rpcfn_type>::iterator mi = mapCallTable.find(strMethod);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2513 if (mi == mapCallTable.end())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2514 throw JSONRPCError(-32601, "Method not found");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2515
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2516 // Observe safe mode
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2517 string strWarning = GetWarnings("rpc");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2518 if (strWarning != "" && !GetBoolArg("-disablesafemode") && !setAllowInSafeMode.count(strMethod))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2519 throw JSONRPCError(-2, string("Safe mode: ") + strWarning);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2520
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2521 try
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2522 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2523 // Execute
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	2524 Value result;
2190 60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK Pieter Wuille <pieter.wuille@gmail.com> parents: 2174 diff changeset	2525 {
60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK Pieter Wuille <pieter.wuille@gmail.com> parents: 2174 diff changeset	2526 LOCK2(cs_main, pwalletMain->cs_wallet);
1274 d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1264 diff changeset	2527 result = ((mi).second)(params, false);
2190 60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK Pieter Wuille <pieter.wuille@gmail.com> parents: 2174 diff changeset	2528 }
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2529
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2530 // Send reply
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2531 string strReply = JSONRPCReply(result, Value::null, id);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2532 stream << HTTPReply(200, strReply) << std::flush;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2533 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2534 catch (std::exception& e)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2535 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2536 ErrorReply(stream, JSONRPCError(-1, e.what()), id);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2537 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2538 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2539 catch (Object& objError)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2540 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2541 ErrorReply(stream, objError, id);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2542 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2543 catch (std::exception& e)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2544 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2545 ErrorReply(stream, JSONRPCError(-32700, e.what()), id);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2546 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2547 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2548 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2549
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2550
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2551
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2552
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2553 Object CallRPC(const string& strMethod, const Array& params)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2554 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2555 if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2556 throw runtime_error(strprintf(
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2557 _("You must set rpcpassword=<password> in the configuration file:\n%s\n"
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2558 "If the file does not exist, create it with owner-readable-only file permissions."),
2207 34d7dc611b26 Use filesystem::path instead of manual string tinkering Pieter Wuille <pieter.wuille@gmail.com> parents: 2205 diff changeset	2559 GetConfigFile().string().c_str()));
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2560
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2561 // Connect to localhost
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2562 bool fUseSSL = GetBoolArg("-rpcssl");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2563 asio::io_service io_service;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2564 ssl::context context(io_service, ssl::context::sslv23);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2565 context.set_options(ssl::context::no_sslv2);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2566 SSLStream sslStream(io_service, context);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2567 SSLIOStreamDevice d(sslStream, fUseSSL);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2568 iostreams::stream<SSLIOStreamDevice> stream(d);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2569 if (!d.connect(GetArg("-rpcconnect", "127.0.0.1"), GetArg("-rpcport", "8332")))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2570 throw runtime_error("couldn't connect to server");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2571
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2572 // HTTP basic authentication
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2573 string strUserPass64 = EncodeBase64(mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2574 map<string, string> mapRequestHeaders;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2575 mapRequestHeaders["Authorization"] = string("Basic ") + strUserPass64;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2576
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2577 // Send request
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2578 string strRequest = JSONRPCRequest(strMethod, params, 1);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2579 string strPost = HTTPPost(strRequest, mapRequestHeaders);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2580 stream << strPost << std::flush;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2581
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2582 // Receive reply
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2583 map<string, string> mapHeaders;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2584 string strReply;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2585 int nStatus = ReadHTTP(stream, mapHeaders, strReply);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2586 if (nStatus == 401)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2587 throw runtime_error("incorrect rpcuser or rpcpassword (authorization failed)");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2588 else if (nStatus >= 400 && nStatus != 400 && nStatus != 404 && nStatus != 500)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2589 throw runtime_error(strprintf("server returned HTTP error %d", nStatus));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2590 else if (strReply.empty())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2591 throw runtime_error("no response from server");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2592
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2593 // Parse reply
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2594 Value valReply;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2595 if (!read_string(strReply, valReply))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2596 throw runtime_error("couldn't parse reply from server");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2597 const Object& reply = valReply.get_obj();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2598 if (reply.empty())
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2599 throw runtime_error("expected reply to have result, error and id properties");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2600
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2601 return reply;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2602 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2603
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2604
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2605
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2606
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2607 template<typename T>
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2608 void ConvertTo(Value& value)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2609 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2610 if (value.type() == str_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2611 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2612 // reinterpret string as unquoted json value
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2613 Value value2;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2614 if (!read_string(value.get_str(), value2))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2615 throw runtime_error("type mismatch");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2616 value = value2.get_value<T>();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2617 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2618 else
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2619 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2620 value = value.get_value<T>();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2621 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2622 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2623
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2624 int CommandLineRPC(int argc, char *argv[])
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2625 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2626 string strPrint;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2627 int nRet = 0;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2628 try
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2629 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2630 // Skip switches
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2631 while (argc > 1 && IsSwitchChar(argv[1][0]))
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2632 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2633 argc--;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2634 argv++;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2635 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2636
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2637 // Method
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2638 if (argc < 2)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2639 throw runtime_error("too few parameters");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2640 string strMethod = argv[1];
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2641
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2642 // Parameters default to strings
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2643 Array params;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2644 for (int i = 2; i < argc; i++)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2645 params.push_back(argv[i]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2646 int n = params.size();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2647
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2648 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2649 // Special case non-string parameter types
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2650 //
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2651 if (strMethod == "setgenerate" && n > 0) ConvertTo<bool>(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2652 if (strMethod == "setgenerate" && n > 1) ConvertTo<boost::int64_t>(params[1]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2653 if (strMethod == "sendtoaddress" && n > 1) ConvertTo<double>(params[1]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2654 if (strMethod == "settxfee" && n > 0) ConvertTo<double>(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2655 if (strMethod == "getreceivedbyaddress" && n > 1) ConvertTo<boost::int64_t>(params[1]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2656 if (strMethod == "getreceivedbyaccount" && n > 1) ConvertTo<boost::int64_t>(params[1]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2657 if (strMethod == "listreceivedbyaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2658 if (strMethod == "listreceivedbyaddress" && n > 1) ConvertTo<bool>(params[1]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2659 if (strMethod == "listreceivedbyaccount" && n > 0) ConvertTo<boost::int64_t>(params[0]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2660 if (strMethod == "listreceivedbyaccount" && n > 1) ConvertTo<bool>(params[1]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2661 if (strMethod == "getbalance" && n > 1) ConvertTo<boost::int64_t>(params[1]);
1627 1a843331dea9 New RPC commands: getblockhash and getblock Gavin Andresen <gavinandresen@gmail.com> parents: 1618 diff changeset	2662 if (strMethod == "getblockhash" && n > 0) ConvertTo<boost::int64_t>(params[0]);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2663 if (strMethod == "move" && n > 2) ConvertTo<double>(params[2]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2664 if (strMethod == "move" && n > 3) ConvertTo<boost::int64_t>(params[3]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2665 if (strMethod == "sendfrom" && n > 2) ConvertTo<double>(params[2]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2666 if (strMethod == "sendfrom" && n > 3) ConvertTo<boost::int64_t>(params[3]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2667 if (strMethod == "listtransactions" && n > 1) ConvertTo<boost::int64_t>(params[1]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2668 if (strMethod == "listtransactions" && n > 2) ConvertTo<boost::int64_t>(params[2]);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2669 if (strMethod == "listaccounts" && n > 0) ConvertTo<boost::int64_t>(params[0]);
1186 69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin Wladimir J. van der Laan <laanwj@gmail.com> parents: 1184 diff changeset	2670 if (strMethod == "walletpassphrase" && n > 1) ConvertTo<boost::int64_t>(params[1]);
1382 f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin Gavin Andresen <gavinandresen@gmail.com> parents: 1378 diff changeset	2671 if (strMethod == "listsinceblock" && n > 1) ConvertTo<boost::int64_t>(params[1]);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2672 if (strMethod == "sendmany" && n > 1)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2673 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2674 string s = params[1].get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2675 Value v;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2676 if (!read_string(s, v) \|\| v.type() != obj_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2677 throw runtime_error("type mismatch");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2678 params[1] = v.get_obj();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2679 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2680 if (strMethod == "sendmany" && n > 2) ConvertTo<boost::int64_t>(params[2]);
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	2681 if (strMethod == "addmultisigaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]);
dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	2682 if (strMethod == "addmultisigaddress" && n > 1)
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	2683 {
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	2684 string s = params[1].get_str();
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	2685 Value v;
057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	2686 if (!read_string(s, v) \|\| v.type() != array_type)
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1750 diff changeset	2687 throw runtime_error("type mismatch "+s);
1600 dc663e46a784 OP_EVAL implementation Gavin Andresen <gavinandresen@gmail.com> parents: 1598 diff changeset	2688 params[1] = v.get_array();
1598 057a59e89d51 Support 3 new multisignature IsStandard transactions Gavin Andresen <gavinandresen@gmail.com> parents: 1588 diff changeset	2689 }
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2690
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2691 // Execute
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2692 Object reply = CallRPC(strMethod, params);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2693
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2694 // Parse reply
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2695 const Value& result = find_value(reply, "result");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2696 const Value& error = find_value(reply, "error");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2697
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2698 if (error.type() != null_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2699 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2700 // Error
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2701 strPrint = "error: " + write_string(error, false);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2702 int code = find_value(error.get_obj(), "code").get_int();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2703 nRet = abs(code);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2704 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2705 else
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2706 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2707 // Result
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2708 if (result.type() == null_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2709 strPrint = "";
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2710 else if (result.type() == str_type)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2711 strPrint = result.get_str();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2712 else
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2713 strPrint = write_string(result, true);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2714 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2715 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2716 catch (std::exception& e)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2717 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2718 strPrint = string("error: ") + e.what();
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2719 nRet = 87;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2720 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2721 catch (...)
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2722 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2723 PrintException(NULL, "CommandLineRPC()");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2724 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2725
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2726 if (strPrint != "")
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2727 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2728 fprintf((nRet == 0 ? stdout : stderr), "%s\n", strPrint.c_str());
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2729 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2730 return nRet;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2731 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2732
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2733
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2734
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2735
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2736 #ifdef TEST
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2737 int main(int argc, char *argv[])
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2738 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2739 #ifdef _MSC_VER
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2740 // Turn off microsoft heap dump noise
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2741 _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2742 _CrtSetReportFile(_CRT_WARN, CreateFile("NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0));
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2743 #endif
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2744 setbuf(stdin, NULL);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2745 setbuf(stdout, NULL);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2746 setbuf(stderr, NULL);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2747
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2748 try
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2749 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2750 if (argc >= 2 && string(argv[1]) == "-server")
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2751 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2752 printf("server ready\n");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2753 ThreadRPCServer(NULL);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2754 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2755 else
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2756 {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2757 return CommandLineRPC(argc, argv);
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2758 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2759 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2760 catch (std::exception& e) {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2761 PrintException(&e, "main()");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2762 } catch (...) {
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2763 PrintException(NULL, "main()");
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2764 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2765 return 0;
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2766 }
855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: diff changeset	2767 #endif

Mercurial > hg > bitcoin

annotate src/bitcoinrpc.cpp @ 2246:b26677f778d1 draft