Mercurial > hg > bitcoin

annotate src/bitcoinrpc.cpp @ 2412:1199f19e41c6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add block "confirmations" to getblock, mainly for identifying orphans
author Luke Dashjr <luke-jr+git@utopios.org>
date Wed, 22 Feb 2012 13:26:25 -0500
parents 41ad02ac7759
children 55deced142f4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
2274
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2256
diff changeset
6 #include "main.h"
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2256
diff changeset
7 #include "wallet.h"
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
8 #include "db.h"
2275
fd09fd11692a Move CWalletDB code to new walletdb module.
Jeff Garzik <jeff@garzik.org>
parents: 2274
diff changeset
9 #include "walletdb.h"
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
10 #include "net.h"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
11 #include "init.h"
2274
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2256
diff changeset
12 #include "ui_interface.h"
2294
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
13 #include "bitcoinrpc.h"
2274
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2256
diff changeset
14
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
15 #undef printf
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
16 #include <boost/asio.hpp>
1583
df45e8721f53 Key import and export
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1582
diff changeset
17 #include <boost/filesystem.hpp>
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
18 #include <boost/iostreams/concepts.hpp>
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
19 #include <boost/iostreams/stream.hpp>
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
20 #include <boost/algorithm/string.hpp>
1582
a562176d7552 Preparations for key import/export
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1580
diff changeset
21 #include <boost/lexical_cast.hpp>
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
22 #include <boost/asio/ssl.hpp>
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
23 #include <boost/filesystem/fstream.hpp>
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
24 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
25
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
26 #define printf OutputDebugStringF
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
27 // 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
28 // 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
29 // 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
30 // 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
31
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
32 using namespace std;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
33 using namespace boost;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
34 using namespace boost::asio;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
35 using namespace json_spirit;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
36
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
37 void ThreadRPCServer2(void* parg);
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
2288
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
129 void TxToJSON(const CTransaction &tx, Object& entry)
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
130 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
131 entry.push_back(Pair("version", tx.nVersion));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
132 entry.push_back(Pair("locktime", (boost::int64_t)tx.nLockTime));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
133 entry.push_back(Pair("size", (boost::int64_t)::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION)));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
134 Array vin;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
135 BOOST_FOREACH(const CTxIn& txin, tx.vin)
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
136 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
137 Object in;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
138 if (tx.IsCoinBase())
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
139 in.push_back(Pair("coinbase", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
140 else
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
141 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
142 Object prevout;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
143 prevout.push_back(Pair("hash", txin.prevout.hash.GetHex()));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
144 prevout.push_back(Pair("n", (boost::int64_t)txin.prevout.n));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
145 in.push_back(Pair("prevout", prevout));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
146 in.push_back(Pair("scriptSig", txin.scriptSig.ToString()));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
147 }
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
148 in.push_back(Pair("sequence", (boost::int64_t)txin.nSequence));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
149 vin.push_back(in);
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
150 }
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
151 entry.push_back(Pair("vin", vin));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
152 Array vout;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
153 BOOST_FOREACH(const CTxOut& txout, tx.vout)
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
154 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
155 Object out;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
156 out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
157 out.push_back(Pair("scriptPubKey", txout.scriptPubKey.ToString()));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
158 vout.push_back(out);
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
159 }
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
160 entry.push_back(Pair("vout", vout));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
161 }
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
162
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
163 string AccountFromValue(const Value& value)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
164 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
165 string strAccount = value.get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
166 if (strAccount == "*")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
167 throw JSONRPCError(-11, "Invalid account name");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
168 return strAccount;
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
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
171 Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
172 {
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
173 Object result;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
174 result.push_back(Pair("hash", block.GetHash().GetHex()));
2412
1199f19e41c6 Add block "confirmations" to getblock, mainly for identifying orphans
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2405
diff changeset
175 CMerkleTx txGen(block.vtx[0]);
1199f19e41c6 Add block "confirmations" to getblock, mainly for identifying orphans
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2405
diff changeset
176 txGen.SetMerkleBranch(&block);
1199f19e41c6 Add block "confirmations" to getblock, mainly for identifying orphans
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2405
diff changeset
177 result.push_back(Pair("confirmations", (int)txGen.GetDepthInMainChain()));
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
178 result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION)));
1900
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
179 result.push_back(Pair("height", blockindex->nHeight));
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
180 result.push_back(Pair("version", block.nVersion));
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
181 result.push_back(Pair("merkleroot", block.hashMerkleRoot.GetHex()));
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
182 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
183 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
184 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
185 result.push_back(Pair("difficulty", GetDifficulty(blockindex)));
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
186 Array txhashes;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
187 BOOST_FOREACH (const CTransaction&tx, block.vtx)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
188 txhashes.push_back(tx.GetHash().GetHex());
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
189 result.push_back(Pair("tx", txhashes));
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
190
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
191 if (blockindex->pprev)
1900
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
192 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
193 if (blockindex->pnext)
1900
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
194 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
195 return result;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
196 }
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
197
1181
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
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 /// 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
202 ///
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
203
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
204 string CRPCTable::help(string strCommand) const
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
205 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
206 string strRet;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
207 set<rpcfn_type> setDone;
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
208 for (map<string, const CRPCCommand*>::const_iterator mi = mapCommands.begin(); mi != mapCommands.end(); ++mi)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
209 {
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
210 const CRPCCommand *pcmd = mi->second;
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
211 string strMethod = mi->first;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
212 // 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
213 if (strMethod == "getamountreceived" ||
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
214 strMethod == "getallreceived" ||
1490
f5b3cf558f89 Deprecate RPC getblocknumber
Michael Hendricks <michael@ndrix.org>
parents: 1388
diff changeset
215 strMethod == "getblocknumber" || // deprecated
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
216 (strMethod.find("label") != string::npos))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
217 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
218 if (strCommand != "" && strMethod != strCommand)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
219 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
220 try
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
221 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
222 Array params;
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
223 rpcfn_type pfn = pcmd->actor;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
224 if (setDone.insert(pfn).second)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
225 (*pfn)(params, true);
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 catch (std::exception& e)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
228 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
229 // Help text is returned in an exception
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
230 string strHelp = string(e.what());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
231 if (strCommand == "")
2255
7e66f9a59926 The string class returns string::npos, when find() fails.
Jeff Garzik <jeff@garzik.org>
parents: 2246
diff changeset
232 if (strHelp.find('\n') != string::npos)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
233 strHelp = strHelp.substr(0, strHelp.find('\n'));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
234 strRet += strHelp + "\n";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
235 }
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 if (strRet == "")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
238 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
239 strRet = strRet.substr(0,strRet.size()-1);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
240 return strRet;
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
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
243 Value help(const Array& params, bool fHelp)
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
244 {
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
245 if (fHelp || params.size() > 1)
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
246 throw runtime_error(
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
247 "help [command]\n"
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
248 "List commands, or get help for a command.");
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
249
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
250 string strCommand;
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
251 if (params.size() > 0)
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
252 strCommand = params[0].get_str();
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
253
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
254 return tableRPC.help(strCommand);
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
255 }
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
256
1181
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 Value stop(const Array& params, bool fHelp)
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 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
261 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
262 "stop\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
263 "Stop bitcoin server.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
264 // 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
265 QueueShutdown();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
266 return "bitcoin server stopping";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
267 }
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
270 Value getblockcount(const Array& params, bool fHelp)
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 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
273 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
274 "getblockcount\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
275 "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
276
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
277 return nBestHeight;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
278 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
279
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
280
1490
f5b3cf558f89 Deprecate RPC getblocknumber
Michael Hendricks <michael@ndrix.org>
parents: 1388
diff changeset
281 // deprecated
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
282 Value getblocknumber(const Array& params, bool fHelp)
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 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
285 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
286 "getblocknumber\n"
1490
f5b3cf558f89 Deprecate RPC getblocknumber
Michael Hendricks <michael@ndrix.org>
parents: 1388
diff changeset
287 "Deprecated. Use getblockcount.");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
288
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
289 return nBestHeight;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
290 }
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
293 Value getconnectioncount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
294 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
295 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
296 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
297 "getconnectioncount\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
298 "Returns the number of connections to other nodes.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
299
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
300 return (int)vNodes.size();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
301 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
302
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
303
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
304 Value getdifficulty(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
305 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
306 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
307 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
308 "getdifficulty\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
309 "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
310
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
311 return GetDifficulty();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
312 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
313
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
314
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
315 Value getgenerate(const Array& params, bool fHelp)
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 (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
318 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
319 "getgenerate\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
320 "Returns true or false.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
321
1920
bffd14be46a8 bitcoind changes to stop storing settings in wallet.dat.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1900
diff changeset
322 return GetBoolArg("-gen");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
323 }
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
326 Value setgenerate(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
327 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
328 if (fHelp || params.size() < 1 || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
329 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
330 "setgenerate <generate> [genproclimit]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
331 "<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
332 "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
333
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
334 bool fGenerate = true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
335 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
336 fGenerate = params[0].get_bool();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
337
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
338 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
339 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
340 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
341 mapArgs["-genproclimit"] = itostr(nGenProcLimit);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
342 if (nGenProcLimit == 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
343 fGenerate = false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
344 }
1920
bffd14be46a8 bitcoind changes to stop storing settings in wallet.dat.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1900
diff changeset
345 mapArgs["-gen"] = (fGenerate ? "1" : "0");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
346
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
347 GenerateBitcoins(fGenerate, pwalletMain);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
348 return Value::null;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
349 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
350
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
351
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
352 Value gethashespersec(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
353 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
354 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
355 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
356 "gethashespersec\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
357 "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
358
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
359 if (GetTimeMillis() - nHPSTimerStart > 8000)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
360 return (boost::int64_t)0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
361 return (boost::int64_t)dHashesPerSec;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
362 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
363
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
364
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
365 Value getinfo(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
366 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
367 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
368 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
369 "getinfo\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
370 "Returns an object containing various state info.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
371
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
372 Object obj;
1584
a67f13278e2c Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents: 1541
diff changeset
373 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
374 obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION));
2086
394961982d80 Introduce explicit -walletupgrade option
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2072
diff changeset
375 obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
376 obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
377 obj.push_back(Pair("blocks", (int)nBestHeight));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
378 obj.push_back(Pair("connections", (int)vNodes.size()));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
379 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
380 obj.push_back(Pair("difficulty", (double)GetDifficulty()));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
381 obj.push_back(Pair("testnet", fTestNet));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
382 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
383 obj.push_back(Pair("keypoolsize", pwalletMain->GetKeyPoolSize()));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
384 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
385 if (pwalletMain->IsCrypted())
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
386 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
387 obj.push_back(Pair("errors", GetWarnings("statusbar")));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
388 return obj;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
389 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
390
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
391
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
392 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
393 {
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
394 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
395 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
396 "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
397 "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
398
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
399 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
400 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
401 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
402 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
403 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
404 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
405 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
406 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
407 obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
2252
a52e8d9c2638 CTxMemPool: encapsulate AddToMemoryPoolUnchecked(), RemoveFromMemoryPool(),
Jeff Garzik <jeff@garzik.org>
parents: 2246
diff changeset
408 obj.push_back(Pair("pooledtx", (uint64_t)mempool.size()));
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
409 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
410 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
411 }
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
412
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
413
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
414 Value getnewaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
415 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
416 if (fHelp || params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
417 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
418 "getnewaddress [account]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
419 "Returns a new bitcoin address for receiving payments. "
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
420 "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
421 "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
422
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
423 // 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
424 string strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
425 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
426 strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
427
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
428 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
429 pwalletMain->TopUpKeyPool();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
430
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
431 // 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
432 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
433 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
434 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
435 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
436
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
437 pwalletMain->SetAddressBookName(address, strAccount);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
438
1256
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1220
diff changeset
439 return address.ToString();
1181
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
442
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
443 CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
444 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
445 CWalletDB walletdb(pwalletMain->strWalletFile);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
446
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
447 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
448 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
449
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
450 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
451
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
452 // 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
453 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
454 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
455 CScript scriptPubKey;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
456 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
457 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
458 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
459 ++it)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
460 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
461 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
462 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
463 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
464 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
465 }
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
466 }
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
467
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
468 // 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
469 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
470 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
471 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
472 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
473
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
474 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
475 walletdb.WriteAccount(strAccount, account);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
476 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
477
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
478 return CBitcoinAddress(account.vchPubKey);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
479 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
480
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
481 Value getaccountaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
482 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
483 if (fHelp || params.size() != 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
484 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
485 "getaccountaddress <account>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
486 "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
487
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
488 // 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
489 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
490
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
491 Value ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
492
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
493 ret = GetAccountAddress(strAccount).ToString();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
494
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
495 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
496 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
497
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
500 Value setaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
501 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
502 if (fHelp || params.size() < 1 || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
503 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
504 "setaccount <bitcoinaddress> <account>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
505 "Sets the account associated with the given address.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
506
1256
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1220
diff changeset
507 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
508 if (!address.IsValid())
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
509 throw JSONRPCError(-5, "Invalid bitcoin address");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
510
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
511
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
512 string strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
513 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
514 strAccount = AccountFromValue(params[1]);
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 // 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
517 if (pwalletMain->mapAddressBook.count(address))
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
518 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
519 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
520 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
521 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
522 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
523
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
524 pwalletMain->SetAddressBookName(address, strAccount);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
525
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
526 return Value::null;
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
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 Value getaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
531 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
532 if (fHelp || params.size() != 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
533 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
534 "getaccount <bitcoinaddress>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
535 "Returns the account associated with the given address.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
536
1256
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1220
diff changeset
537 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
538 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
539 throw JSONRPCError(-5, "Invalid bitcoin address");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
540
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
541 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
542 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
543 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
544 strAccount = (*mi).second;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
545 return strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
546 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
547
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
548
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
549 Value getaddressesbyaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
550 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
551 if (fHelp || params.size() != 1)
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 "getaddressesbyaccount <account>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
554 "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
555
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
556 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
557
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
558 // Find all addresses that have the given account
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
559 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
560 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
561 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
562 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
563 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
564 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
565 ret.push_back(address.ToString());
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
566 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
567 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
568 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
569
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
570 Value settxfee(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
571 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
572 if (fHelp || params.size() < 1 || params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
573 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
574 "settxfee <amount>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
575 "<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
576
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
577 // 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
578 int64 nAmount = 0;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
579 if (params[0].get_real() != 0.0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
580 nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
581
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
582 nTransactionFee = nAmount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
583 return true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
584 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
585
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
586 Value sendtoaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
587 {
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
588 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
589 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
590 "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
591 "<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
592 "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
593 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
594 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
595 "sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
596 "<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
597
1256
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1220
diff changeset
598 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
599 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
600 throw JSONRPCError(-5, "Invalid bitcoin address");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
601
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
602 // 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
603 int64 nAmount = AmountFromValue(params[1]);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
604
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
605 // Wallet comments
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
606 CWalletTx wtx;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
607 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
608 wtx.mapValue["comment"] = params[2].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
609 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
610 wtx.mapValue["to"] = params[3].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
611
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
612 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
613 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
614
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
615 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
616 if (strError != "")
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
617 throw JSONRPCError(-4, strError);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
618
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
619 return wtx.GetHash().GetHex();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
620 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
621
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
622 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
623 {
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
624 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
625 throw runtime_error(
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
626 "signmessage <bitcoinaddress> <message>\n"
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
627 "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
628
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
629 if (pwalletMain->IsLocked())
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
630 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
631
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
632 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
633 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
634
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
635 CBitcoinAddress addr(strAddress);
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
636 if (!addr.IsValid())
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
637 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
638
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
639 CKey key;
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
640 if (!pwalletMain->GetKey(addr, key))
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
641 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
642
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
643 CDataStream ss(SER_GETHASH, 0);
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
644 ss << strMessageMagic;
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
645 ss << strMessage;
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
646
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
647 vector<unsigned char> vchSig;
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
648 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
649 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
650
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
651 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
652 }
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
653
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
654 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
655 {
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
656 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
657 throw runtime_error(
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
658 "verifymessage <bitcoinaddress> <signature> <message>\n"
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
659 "Verify a signed message");
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
660
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
661 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
662 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
663 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
664
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
665 CBitcoinAddress addr(strAddress);
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
666 if (!addr.IsValid())
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
667 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
668
1331
b427db8574f1 base64-based sign/verify
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1330
diff changeset
669 bool fInvalid = false;
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
670 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
671
b427db8574f1 base64-based sign/verify
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1330
diff changeset
672 if (fInvalid)
b427db8574f1 base64-based sign/verify
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1330
diff changeset
673 throw JSONRPCError(-5, "Malformed base64 encoding");
b427db8574f1 base64-based sign/verify
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1330
diff changeset
674
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
675 CDataStream ss(SER_GETHASH, 0);
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
676 ss << strMessageMagic;
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
677 ss << strMessage;
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
678
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
679 CKey key;
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
680 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
681 return false;
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
682
1580
d7f244465cd6 Add GetSecret() and GetKeys() to CKeyStore
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1541
diff changeset
683 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
684 }
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
685
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
686
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
687 Value getreceivedbyaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
688 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
689 if (fHelp || params.size() < 1 || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
690 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
691 "getreceivedbyaddress <bitcoinaddress> [minconf=1]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
692 "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
693
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
694 // Bitcoin address
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
695 CBitcoinAddress address = CBitcoinAddress(params[0].get_str());
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
696 CScript scriptPubKey;
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
697 if (!address.IsValid())
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
698 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
699 scriptPubKey.SetBitcoinAddress(address);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
700 if (!IsMine(*pwalletMain,scriptPubKey))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
701 return (double)0.0;
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
708 // 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
709 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
710 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
711 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
712 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
713 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
714 continue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
715
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
716 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
717 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
718 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
719 nAmount += txout.nValue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
720 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
721
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
722 return ValueFromAmount(nAmount);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
723 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
724
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
725
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
726 void GetAccountAddresses(string strAccount, set<CBitcoinAddress>& setAddress)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
727 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
728 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
729 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
730 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
731 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
732 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
733 setAddress.insert(address);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
734 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
735 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
736
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
737
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
738 Value getreceivedbyaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
739 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
740 if (fHelp || params.size() < 1 || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
741 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
742 "getreceivedbyaccount <account> [minconf=1]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
743 "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
744
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
745 // Minimum confirmations
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
746 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
747 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
748 nMinDepth = params[1].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
749
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
750 // 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
751 string strAccount = AccountFromValue(params[0]);
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
752 set<CBitcoinAddress> setAddress;
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
753 GetAccountAddresses(strAccount, setAddress);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
754
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
755 // 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
756 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
757 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
758 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
759 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
760 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
761 continue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
762
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
763 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
764 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
765 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
766 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
767 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
768 nAmount += txout.nValue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
769 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
770 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
771
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
772 return (double)nAmount / (double)COIN;
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
775
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
776 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
777 {
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
778 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
779
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
780 // 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
781 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
782 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
783 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
784 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
785 continue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
786
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
787 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
788 wtx.GetAccountAmounts(strAccount, nGenerated, nReceived, nSent, nFee);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
789
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
790 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
791 nBalance += nReceived;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
792 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
793 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
794
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
795 // 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
796 nBalance += walletdb.GetAccountCreditDebit(strAccount);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
797
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
798 return nBalance;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
799 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
800
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
801 int64 GetAccountBalance(const string& strAccount, int nMinDepth)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
802 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
803 CWalletDB walletdb(pwalletMain->strWalletFile);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
804 return GetAccountBalance(walletdb, strAccount, nMinDepth);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
805 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
806
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 Value getbalance(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
809 {
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
810 if (fHelp || params.size() > 2)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
811 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
812 "getbalance [account] [minconf=1]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
813 "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
814 "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
815
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
816 if (params.size() == 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
817 return ValueFromAmount(pwalletMain->GetBalance());
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 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
820 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
821 nMinDepth = params[1].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
822
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
823 if (params[0].get_str() == "*") {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
824 // Calculate total balance a different way from GetBalance()
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
825 // (GetBalance() sums up all unspent TxOuts)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
826 // 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
827 int64 nBalance = 0;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
828 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
829 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
830 const CWalletTx& wtx = (*it).second;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
831 if (!wtx.IsFinal())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
832 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
833
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
834 int64 allGeneratedImmature, allGeneratedMature, allFee;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
835 allGeneratedImmature = allGeneratedMature = allFee = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
836 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
837 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
838 list<pair<CBitcoinAddress, int64> > listSent;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
839 wtx.GetAmounts(allGeneratedImmature, allGeneratedMature, listReceived, listSent, allFee, strSentAccount);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
840 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
841 {
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
842 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
843 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
844 }
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
845 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
846 nBalance -= r.second;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
847 nBalance -= allFee;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
848 nBalance += allGeneratedMature;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
849 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
850 return ValueFromAmount(nBalance);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
851 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
852
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
853 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
854
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
855 int64 nBalance = GetAccountBalance(strAccount, nMinDepth);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
856
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
857 return ValueFromAmount(nBalance);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
858 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
859
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
860
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
861 Value movecmd(const Array& params, bool fHelp)
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 if (fHelp || params.size() < 3 || params.size() > 5)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
864 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
865 "move <fromaccount> <toaccount> <amount> [minconf=1] [comment]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
866 "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
867
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
868 string strFrom = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
869 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
870 int64 nAmount = AmountFromValue(params[2]);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
871 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
872 // 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
873 (void)params[3].get_int();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
874 string strComment;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
875 if (params.size() > 4)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
876 strComment = params[4].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
877
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
878 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
879 walletdb.TxnBegin();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
880
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 nNow = GetAdjustedTime();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
882
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
883 // Debit
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
884 CAccountingEntry debit;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
885 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
886 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
887 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
888 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
889 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
890 walletdb.WriteAccountingEntry(debit);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
891
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
892 // Credit
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
893 CAccountingEntry credit;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
894 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
895 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
896 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
897 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
898 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
899 walletdb.WriteAccountingEntry(credit);
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 walletdb.TxnCommit();
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
902
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
903 return true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
904 }
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
907 Value sendfrom(const Array& params, bool fHelp)
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 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
910 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
911 "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
912 "<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
913 "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
914 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
915 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
916 "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
917 "<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
918
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
919 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
920 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
921 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
922 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
923 int64 nAmount = AmountFromValue(params[2]);
1181
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() > 3)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
926 nMinDepth = params[3].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() > 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
931 wtx.mapValue["comment"] = params[4].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
932 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
933 wtx.mapValue["to"] = params[5].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
934
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
935 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
936 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
937
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
938 // 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
939 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
940 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
941 throw JSONRPCError(-6, "Account has insufficient funds");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
942
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
943 // Send
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
944 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
945 if (strError != "")
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
946 throw JSONRPCError(-4, strError);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
947
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
948 return wtx.GetHash().GetHex();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
949 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
950
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
951
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
952 Value sendmany(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
953 {
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
954 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
955 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
956 "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
957 "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
958 "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
959 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
960 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
961 "sendmany <fromaccount> {address:amount,...} [minconf=1] [comment]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
962 "amounts are double-precision floating point numbers");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
963
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
964 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
965 Object sendTo = params[1].get_obj();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
966 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
967 if (params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
968 nMinDepth = params[2].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
969
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
970 CWalletTx wtx;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
971 wtx.strFromAccount = strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
972 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
973 wtx.mapValue["comment"] = params[3].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
974
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
975 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
976 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
977
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers"
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1615
diff changeset
978 int64 totalAmount = 0;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
979 BOOST_FOREACH(const Pair& s, sendTo)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
980 {
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
981 CBitcoinAddress address(s.name_);
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
982 if (!address.IsValid())
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
983 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
984
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
985 if (setAddress.count(address))
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
986 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
987 setAddress.insert(address);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
988
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
989 CScript scriptPubKey;
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
990 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
991 int64 nAmount = AmountFromValue(s.value_);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
992 totalAmount += nAmount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
993
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
994 vecSend.push_back(make_pair(scriptPubKey, nAmount));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
995 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
996
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
997 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
998 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
999
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1000 // 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
1001 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
1002 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
1003 throw JSONRPCError(-6, "Account has insufficient funds");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1004
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1005 // Send
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1006 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
1007 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
1008 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
1009 if (!fCreated)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1010 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1011 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
1012 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
1013 throw JSONRPCError(-4, "Transaction creation failed");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1014 }
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1015 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
1016 throw JSONRPCError(-4, "Transaction commit failed");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1017
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1018 return wtx.GetHash().GetHex();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1019 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1020
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1021 Value addmultisigaddress(const Array& params, bool fHelp)
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1022 {
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1023 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
1024 {
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1025 string msg = "addmultisigaddress <nrequired> <'[\"key\",\"key\"]'> [account]\n"
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1026 "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
1027 "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
1028 "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
1029 throw runtime_error(msg);
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1030 }
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1031
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1032 int nRequired = params[0].get_int();
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1033 const Array& keys = params[1].get_array();
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1034 string strAccount;
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1035 if (params.size() > 2)
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1036 strAccount = AccountFromValue(params[2]);
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1037
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1038 // Gather public keys
2359
2dea5179cfd9 Fixed non-sensical error message
Peter Todd <pete@petertodd.org>
parents: 2327
diff changeset
1039 if (nRequired < 1)
2dea5179cfd9 Fixed non-sensical error message
Peter Todd <pete@petertodd.org>
parents: 2327
diff changeset
1040 throw runtime_error("a multisignature address must require at least one key to redeem");
2dea5179cfd9 Fixed non-sensical error message
Peter Todd <pete@petertodd.org>
parents: 2327
diff changeset
1041 if ((int)keys.size() < nRequired)
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1042 throw runtime_error(
2359
2dea5179cfd9 Fixed non-sensical error message
Peter Todd <pete@petertodd.org>
parents: 2327
diff changeset
1043 strprintf("not enough keys supplied "
2dea5179cfd9 Fixed non-sensical error message
Peter Todd <pete@petertodd.org>
parents: 2327
diff changeset
1044 "(got %d keys, but need at least %d to redeem)", keys.size(), nRequired));
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1045 std::vector<CKey> pubkeys;
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1046 pubkeys.resize(keys.size());
2256
341e07b996f2 Fix loop index var types, fixing many minor sign comparison warnings
Jeff Garzik <jeff@garzik.org>
parents: 2255
diff changeset
1047 for (unsigned int i = 0; i < keys.size(); i++)
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 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
1050
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1051 // 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
1052 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
1053 if (address.IsValid())
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1054 {
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1055 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
1056 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
1057 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
1058 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
1059 if (!pwalletMain->GetPubKey(address, vchPubKey))
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1060 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
1061 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
1062 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
1063 throw runtime_error(" Invalid public key: "+ks);
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1064 }
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1065
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1066 // Case 2: hex public key
1755
30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress
Gavin Andresen <gavinandresen@gmail.com>
parents: 1752
diff changeset
1067 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
1068 {
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1069 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
1070 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
1071 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
1072 }
1755
30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress
Gavin Andresen <gavinandresen@gmail.com>
parents: 1752
diff changeset
1073 else
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1074 {
1755
30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress
Gavin Andresen <gavinandresen@gmail.com>
parents: 1752
diff changeset
1075 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
1076 }
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1077 }
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1078
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1079 // Construct using pay-to-script-hash:
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1080 CScript inner;
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1081 inner.SetMultisig(nRequired, pubkeys);
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1082
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1083 uint160 scriptHash = Hash160(inner);
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1084 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
1085 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
1086 pwalletMain->AddCScript(inner);
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1087 CBitcoinAddress address;
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1088 address.SetScriptHash160(scriptHash);
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1089
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1090 pwalletMain->SetAddressBookName(address, strAccount);
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1091 return address.ToString();
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1092 }
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1093
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1094
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1095 struct tallyitem
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1096 {
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
1097 int64 nAmount;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1098 int nConf;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1099 tallyitem()
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1100 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1101 nAmount = 0;
1594
e79944b2d430 Use std::numeric_limits<> for typesafe INT_MAX/etc
Gavin Andresen <gavinandresen@gmail.com>
parents: 1590
diff changeset
1102 nConf = std::numeric_limits<int>::max();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1103 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1104 };
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1105
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1106 Value ListReceived(const Array& params, bool fByAccounts)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1107 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1108 // Minimum confirmations
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1109 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1110 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1111 nMinDepth = params[0].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1112
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1113 // Whether to include empty accounts
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1114 bool fIncludeEmpty = false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1115 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1116 fIncludeEmpty = params[1].get_bool();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1117
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1118 // Tally
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
1119 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
1120 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
1121 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1122 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
1123
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1124 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
1125 continue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1126
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1127 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
1128 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
1129 continue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1130
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1131 BOOST_FOREACH(const CTxOut& txout, wtx.vout)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1132 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1133 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
1134 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
1135 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1136
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1137 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
1138 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
1139 item.nConf = min(item.nConf, nDepth);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1140 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1141 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1142
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1143 // Reply
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1144 Array ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1145 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
1146 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
1147 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1148 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
1149 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
1150 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
1151 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
1152 continue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1153
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
1154 int64 nAmount = 0;
1594
e79944b2d430 Use std::numeric_limits<> for typesafe INT_MAX/etc
Gavin Andresen <gavinandresen@gmail.com>
parents: 1590
diff changeset
1155 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
1156 if (it != mapTally.end())
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1157 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1158 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
1159 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
1160 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1161
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1162 if (fByAccounts)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1163 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1164 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
1165 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
1166 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
1167 }
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1168 else
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1169 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1170 Object obj;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1171 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
1172 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
1173 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
1174 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
1175 ret.push_back(obj);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1176 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1177 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1178
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1179 if (fByAccounts)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1180 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1181 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
1182 {
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
1183 int64 nAmount = (*it).second.nAmount;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1184 int nConf = (*it).second.nConf;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1185 Object obj;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1186 obj.push_back(Pair("account", (*it).first));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1187 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
1188 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
1189 ret.push_back(obj);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1190 }
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1193 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1194 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1195
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1196 Value listreceivedbyaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1197 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1198 if (fHelp || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1199 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1200 "listreceivedbyaddress [minconf=1] [includeempty=false]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1201 "[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
1202 "[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
1203 "Returns an array of objects containing:\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1204 " \"address\" : receiving address\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1205 " \"account\" : the account of the receiving address\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1206 " \"amount\" : total amount received by the address\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1207 " \"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
1208
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1209 return ListReceived(params, false);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1210 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1211
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1212 Value listreceivedbyaccount(const Array& params, bool fHelp)
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 if (fHelp || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1215 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1216 "listreceivedbyaccount [minconf=1] [includeempty=false]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1217 "[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
1218 "[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
1219 "Returns an array of objects containing:\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1220 " \"account\" : the account of the receiving addresses\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1221 " \"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
1222 " \"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
1223
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1224 return ListReceived(params, true);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1225 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1226
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1227 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
1228 {
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
1229 int64 nGeneratedImmature, nGeneratedMature, nFee;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1230 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
1231 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
1232 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
1233
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1234 wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1235
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1236 bool fAllAccounts = (strAccount == string("*"));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1237
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1238 // Generated blocks assigned to account ""
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1239 if ((nGeneratedMature+nGeneratedImmature) != 0 && (fAllAccounts || strAccount == ""))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1240 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1241 Object entry;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1242 entry.push_back(Pair("account", string("")));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1243 if (nGeneratedImmature)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1244 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1245 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
1246 entry.push_back(Pair("amount", ValueFromAmount(nGeneratedImmature)));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1247 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1248 else
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 entry.push_back(Pair("category", "generate"));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1251 entry.push_back(Pair("amount", ValueFromAmount(nGeneratedMature)));
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 if (fLong)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1254 WalletTxToJSON(wtx, entry);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1255 ret.push_back(entry);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1256 }
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 // Sent
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1259 if ((!listSent.empty() || nFee != 0) && (fAllAccounts || strAccount == strSentAccount))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1260 {
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
1261 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
1262 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1263 Object entry;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1264 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
1265 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
1266 entry.push_back(Pair("category", "send"));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1267 entry.push_back(Pair("amount", ValueFromAmount(-s.second)));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1268 entry.push_back(Pair("fee", ValueFromAmount(-nFee)));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1269 if (fLong)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1270 WalletTxToJSON(wtx, entry);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1271 ret.push_back(entry);
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 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1274
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1275 // Received
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1276 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
1277 {
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
1278 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
1279 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1280 string account;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1281 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
1282 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
1283 if (fAllAccounts || (account == strAccount))
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1284 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1285 Object entry;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1286 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
1287 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
1288 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
1289 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
1290 if (fLong)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1291 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
1292 ret.push_back(entry);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1293 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1294 }
2246
b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2219
diff changeset
1295 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1296 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1297
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1298 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
1299 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1300 bool fAllAccounts = (strAccount == string("*"));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1301
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1302 if (fAllAccounts || acentry.strAccount == strAccount)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1303 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1304 Object entry;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1305 entry.push_back(Pair("account", acentry.strAccount));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1306 entry.push_back(Pair("category", "move"));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1307 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
1308 entry.push_back(Pair("amount", ValueFromAmount(acentry.nCreditDebit)));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1309 entry.push_back(Pair("otheraccount", acentry.strOtherAccount));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1310 entry.push_back(Pair("comment", acentry.strComment));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1311 ret.push_back(entry);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1312 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1313 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1314
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1315 Value listtransactions(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1316 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1317 if (fHelp || params.size() > 3)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1318 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1319 "listtransactions [account] [count=10] [from=0]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1320 "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
1321
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1322 string strAccount = "*";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1323 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1324 strAccount = params[0].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1325 int nCount = 10;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1326 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1327 nCount = params[1].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1328 int nFrom = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1329 if (params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1330 nFrom = params[2].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1331
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1332 if (nCount < 0)
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1333 throw JSONRPCError(-8, "Negative count");
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1334 if (nFrom < 0)
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1335 throw JSONRPCError(-8, "Negative from");
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1336
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1337 Array ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1338 CWalletDB walletdb(pwalletMain->strWalletFile);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1339
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1340 // 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
1341 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
1342 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
1343 TxItems txByTime;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1344
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1345 // 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
1346 // 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
1347 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
1348 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1349 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
1350 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
1351 }
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1352 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
1353 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
1354 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
1355 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1356 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
1357 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1358
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1359 // 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
1360 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
1361 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1362 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
1363 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
1364 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
1365 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
1366 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
1367 AcentryToJSON(*pacentry, strAccount, ret);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1368
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1369 if (ret.size() >= (nCount+nFrom)) break;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1370 }
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1371 // ret is newest to oldest
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
1372
2311
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
1373 if (nFrom > (int)ret.size())
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
1374 nFrom = ret.size();
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
1375 if ((nFrom + nCount) > (int)ret.size())
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
1376 nCount = ret.size() - nFrom;
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1377 Array::iterator first = ret.begin();
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1378 std::advance(first, nFrom);
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1379 Array::iterator last = ret.begin();
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1380 std::advance(last, nFrom+nCount);
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1381
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1382 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
1383 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
1384
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1385 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
1386
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1387 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1388 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1389
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1390 Value listaccounts(const Array& params, bool fHelp)
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 if (fHelp || params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1393 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1394 "listaccounts [minconf=1]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1395 "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
1396
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1397 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1398 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1399 nMinDepth = params[0].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1400
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
1401 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
1402 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
1403 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
1404 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
1405 }
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1406
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1407 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
1408 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1409 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
1410 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
1411 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
1412 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
1413 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
1414 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
1415 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
1416 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
1417 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
1418 if (wtx.GetDepthInMainChain() >= nMinDepth)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1419 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1420 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
1421 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
1422 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
1423 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
1424 else
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1425 mapAccountBalances[""] += r.second;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1426 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1427 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1428
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1429 list<CAccountingEntry> acentries;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1430 CWalletDB(pwalletMain->strWalletFile).ListAccountCreditDebit("*", acentries);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1431 BOOST_FOREACH(const CAccountingEntry& entry, acentries)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1432 mapAccountBalances[entry.strAccount] += entry.nCreditDebit;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1433
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1434 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
1435 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
1436 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
1437 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1438 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1439 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1440
1382
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1441 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
1442 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1443 if (fHelp)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1444 throw runtime_error(
2319
b155de017684 listsinceblock: rpc param blockid -> blockhash
freewil <sean@eternalrise.com>
parents: 2311
diff changeset
1445 "listsinceblock [blockhash] [target-confirmations]\n"
b155de017684 listsinceblock: rpc param blockid -> blockhash
freewil <sean@eternalrise.com>
parents: 2311
diff changeset
1446 "Get all transactions in blocks since block [blockhash], or all transactions if omitted");
1382
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1447
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1448 CBlockIndex *pindex = NULL;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1449 int target_confirms = 1;
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 if (params.size() > 0)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1452 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1453 uint256 blockId = 0;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1454
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1455 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
1456 pindex = CBlockLocator(blockId).GetBlockIndex();
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
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1459 if (params.size() > 1)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1460 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1461 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
1462
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1463 if (target_confirms < 1)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1464 throw JSONRPCError(-8, "Invalid parameter");
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1465 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1466
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1467 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
1468
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1469 Array transactions;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1470
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1471 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
1472 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1473 CWalletTx tx = (*it).second;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1474
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1475 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
1476 ListTransactions(tx, "*", 0, true, transactions);
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1477 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1478
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1479 uint256 lastblock;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1480
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1481 if (target_confirms == 1)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1482 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1483 lastblock = hashBestChain;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1484 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1485 else
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1486 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1487 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
1488
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1489 CBlockIndex *block;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1490 for (block = pindexBest;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1491 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
1492 block = block->pprev) { }
1382
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1493
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1494 lastblock = block ? block->GetBlockHash() : 0;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1495 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1496
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1497 Object ret;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1498 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
1499 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
1500
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1501 return ret;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1502 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1503
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1504 Value gettransaction(const Array& params, bool fHelp)
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 if (fHelp || params.size() != 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1507 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1508 "gettransaction <txid>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1509 "Get detailed information about <txid>");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1510
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1511 uint256 hash;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1512 hash.SetHex(params[0].get_str());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1513
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1514 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
1515
2288
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1516 if (pwalletMain->mapWallet.count(hash))
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1517 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1518 const CWalletTx& wtx = pwalletMain->mapWallet[hash];
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1519
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1520 TxToJSON(wtx, entry);
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1521
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1522 int64 nCredit = wtx.GetCredit();
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1523 int64 nDebit = wtx.GetDebit();
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1524 int64 nNet = nCredit - nDebit;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1525 int64 nFee = (wtx.IsFromMe() ? wtx.GetValueOut() - nDebit : 0);
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1526
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1527 entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1528 if (wtx.IsFromMe())
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1529 entry.push_back(Pair("fee", ValueFromAmount(nFee)));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1530
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1531 WalletTxToJSON(wtx, entry);
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1532
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1533 Array details;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1534 ListTransactions(pwalletMain->mapWallet[hash], "*", 0, false, details);
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1535 entry.push_back(Pair("details", details));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1536 }
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1537 else
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1538 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1539 CTransaction tx;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1540 uint256 hashBlock = 0;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1541 if (GetTransaction(hash, tx, hashBlock))
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1542 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1543 entry.push_back(Pair("txid", hash.GetHex()));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1544 TxToJSON(tx, entry);
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1545 if (hashBlock == 0)
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1546 entry.push_back(Pair("confirmations", 0));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1547 else
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1548 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1549 entry.push_back(Pair("blockhash", hashBlock.GetHex()));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1550 map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashBlock);
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1551 if (mi != mapBlockIndex.end() && (*mi).second)
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1552 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1553 CBlockIndex* pindex = (*mi).second;
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1554 if (pindex->IsInMainChain())
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1555 {
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1556 entry.push_back(Pair("confirmations", 1 + nBestHeight - pindex->nHeight));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1557 entry.push_back(Pair("time", (boost::int64_t)pindex->nTime));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1558 }
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1559 else
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1560 entry.push_back(Pair("confirmations", 0));
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1561 }
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1562 }
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1563 }
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1564 else
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1565 throw JSONRPCError(-5, "No information available about transaction");
377eedafc770 gettransaction RPC for non-wallet transactions
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2280
diff changeset
1566 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1567
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1568 return entry;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1569 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1570
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1571
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1572 Value backupwallet(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1573 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1574 if (fHelp || params.size() != 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1575 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1576 "backupwallet <destination>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1577 "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
1578
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1579 string strDest = params[0].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1580 BackupWallet(*pwalletMain, strDest);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1581
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1582 return Value::null;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1583 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1584
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1585
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1586 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
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->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
1589 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
1590 "keypoolrefill\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1591 "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
1592 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
1593 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
1594 "keypoolrefill\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1595 "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
1596
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1597 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
1598 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
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 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
1601
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1602 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
1603 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
1604
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1605 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
1606 }
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
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1609 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
1610 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1611 pwalletMain->TopUpKeyPool();
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1612 }
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 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
1615 {
1942
aa7f644075af Resolves issue #922 - "wallet passphrase timeout of several years doesn't work"
Gregory Maxwell <greg@xiph.org>
parents: 1920
diff changeset
1616 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
1617
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1618 ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime);
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1619
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1620 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
1621 {
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1622 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
1623
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1624 do
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1625 {
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1626 if (nWalletUnlockTime==0)
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1627 break;
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1628 int64 nToSleep = nWalletUnlockTime - GetTimeMillis();
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1629 if (nToSleep <= 0)
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1630 break;
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1631
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1632 LEAVE_CRITICAL_SECTION(cs_nWalletUnlockTime);
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1633 Sleep(nToSleep);
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1634 ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime);
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1635
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1636 } while(1);
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1637
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1638 if (nWalletUnlockTime)
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1639 {
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1640 nWalletUnlockTime = 0;
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1641 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
1642 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1643 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1644 else
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1645 {
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1646 if (nWalletUnlockTime < nMyWakeTime)
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1647 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
1648 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1649
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1650 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
1651
1942
aa7f644075af Resolves issue #922 - "wallet passphrase timeout of several years doesn't work"
Gregory Maxwell <greg@xiph.org>
parents: 1920
diff changeset
1652 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
1653 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1654
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1655 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
1656 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1657 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
1658 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
1659 "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
1660 "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
1661 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1662 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1663 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
1664 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
1665
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1666 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
1667 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
1668
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1669 // 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
1670 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
1671 strWalletPass.reserve(100);
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1672 // 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
1673 // 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
1674 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
1675
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1676 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
1677 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1678 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
1679 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
1680 }
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1681 else
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1682 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
1683 "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
1684 "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
1685
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1686 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
1687 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
1688 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
1689
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1690 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
1691 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1692
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 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
1695 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1696 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
1697 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
1698 "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
1699 "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
1700 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1701 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1702 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
1703 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
1704
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1705 // 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
1706 // 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
1707 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
1708 strOldWalletPass.reserve(100);
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1709 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
1710
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1711 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
1712 strNewWalletPass.reserve(100);
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1713 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
1714
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1715 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
1716 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
1717 "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
1718 "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
1719
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1720 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
1721 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
1722
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1723 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
1724 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1725
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1726
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1727 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
1728 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1729 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
1730 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
1731 "walletlock\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1732 "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
1733 "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
1734 "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
1735 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1736 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1737 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
1738 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
1739
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1740 {
2190
60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2174
diff changeset
1741 LOCK(cs_nWalletUnlockTime);
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1742 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
1743 nWalletUnlockTime = 0;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1744 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1745
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1746 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
1747 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1748
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1749
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1750 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
1751 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1752 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
1753 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
1754 "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
1755 "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
1756 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1757 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1758 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
1759 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
1760
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1761 // 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
1762 // 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
1763 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
1764 strWalletPass.reserve(100);
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1765 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
1766
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1767 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
1768 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
1769 "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
1770 "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
1771
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1772 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
1773 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
1774
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1493
diff changeset
1775 // 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
1776 // 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
1777 // 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
1778 QueueShutdown();
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1493
diff changeset
1779 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
1780 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1781
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1782
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1783 Value validateaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1784 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1785 if (fHelp || params.size() != 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1786 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1787 "validateaddress <bitcoinaddress>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1788 "Return information about <bitcoinaddress>.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1789
1256
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1220
diff changeset
1790 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
1791 bool isValid = address.IsValid();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1792
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1793 Object ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1794 ret.push_back(Pair("isvalid", isValid));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1795 if (isValid)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1796 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1797 // Call Hash160ToAddress() so we always return current ADDRESSVERSION
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1798 // version of the address:
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
1799 string currentAddress = address.ToString();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1800 ret.push_back(Pair("address", currentAddress));
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1801 if (pwalletMain->HaveKey(address))
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1802 {
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1803 ret.push_back(Pair("ismine", true));
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1804 std::vector<unsigned char> vchPubKey;
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1805 pwalletMain->GetPubKey(address, vchPubKey);
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1806 ret.push_back(Pair("pubkey", HexStr(vchPubKey)));
1734
adac2d60ce43 Compressed pubkeys
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1627
diff changeset
1807 CKey key;
adac2d60ce43 Compressed pubkeys
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1627
diff changeset
1808 key.SetPubKey(vchPubKey);
adac2d60ce43 Compressed pubkeys
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1627
diff changeset
1809 ret.push_back(Pair("iscompressed", key.IsCompressed()));
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1810 }
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1811 else if (pwalletMain->HaveCScript(address.GetHash160()))
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1812 {
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1813 ret.push_back(Pair("isscript", true));
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1814 CScript subscript;
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1815 pwalletMain->GetCScript(address.GetHash160(), subscript);
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1816 ret.push_back(Pair("ismine", ::IsMine(*pwalletMain, subscript)));
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1817 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
1818 txnouttype whichType;
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1819 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
1820 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
1821 ret.push_back(Pair("script", GetTxnOutputType(whichType)));
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1822 Array a;
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1823 BOOST_FOREACH(const CBitcoinAddress& addr, addresses)
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1824 a.push_back(addr.ToString());
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1825 ret.push_back(Pair("addresses", a));
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1826 if (whichType == TX_MULTISIG)
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1827 ret.push_back(Pair("sigsrequired", nRequired));
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1828 }
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1829 else
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1830 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
1831 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
1832 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
1833 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1834 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1835 }
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 Value getwork(const Array& params, bool fHelp)
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 if (fHelp || params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1840 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1841 "getwork [data]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1842 "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
1843 " \"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
1844 " \"data\" : block data\n"
1337
447bba2f0a56 deprecate midstate and hash1 in getwork
Nils Schneider <nils.schneider@gmail.com>
parents: 1320
diff changeset
1845 " \"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
1846 " \"target\" : little endian hash target\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1847 "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
1848
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1849 if (vNodes.empty())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1850 throw JSONRPCError(-9, "Bitcoin is not connected!");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1851
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1852 if (IsInitialBlockDownload())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1853 throw JSONRPCError(-10, "Bitcoin is downloading blocks...");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1854
1292
024a12d5558d Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1274
diff changeset
1855 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
1856 static mapNewBlock_t mapNewBlock;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1857 static vector<CBlock*> vNewBlock;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1858 static CReserveKey reservekey(pwalletMain);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1859
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1860 if (params.size() == 0)
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 // Update block
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1863 static unsigned int nTransactionsUpdatedLast;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1864 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
1865 static int64 nStart;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1866 static CBlock* pblock;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1867 if (pindexPrev != pindexBest ||
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1868 (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1869 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1870 if (pindexPrev != pindexBest)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1871 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1872 // Deallocate old blocks since they're obsolete now
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1873 mapNewBlock.clear();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1874 BOOST_FOREACH(CBlock* pblock, vNewBlock)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1875 delete pblock;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1876 vNewBlock.clear();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1877 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1878 nTransactionsUpdatedLast = nTransactionsUpdated;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1879 pindexPrev = pindexBest;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1880 nStart = GetTime();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1881
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1882 // Create new block
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1883 pblock = CreateNewBlock(reservekey);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1884 if (!pblock)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1885 throw JSONRPCError(-7, "Out of memory");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1886 vNewBlock.push_back(pblock);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1887 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1888
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1889 // Update nTime
1854
cdea646ab88a Fix issue #848 : broken mining on testnet
Gavin Andresen <gavinandresen@gmail.com>
parents: 1834
diff changeset
1890 pblock->UpdateTime(pindexPrev);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1891 pblock->nNonce = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1892
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1893 // Update nExtraNonce
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1894 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
1895 IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1896
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1897 // Save
1292
024a12d5558d Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1274
diff changeset
1898 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
1899
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1900 // Prebuild hash buffers
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1901 char pmidstate[32];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1902 char pdata[128];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1903 char phash1[64];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1904 FormatHashBuffers(pblock, pmidstate, pdata, phash1);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1905
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1906 uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1907
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1908 Object result;
1337
447bba2f0a56 deprecate midstate and hash1 in getwork
Nils Schneider <nils.schneider@gmail.com>
parents: 1320
diff changeset
1909 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
1910 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
1911 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
1912 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
1913 return result;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1914 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1915 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1916 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1917 // Parse parameters
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1918 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
1919 if (vchData.size() != 128)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1920 throw JSONRPCError(-8, "Invalid parameter");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1921 CBlock* pdata = (CBlock*)&vchData[0];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1922
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1923 // Byte reverse
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1924 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
1925 ((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
1926
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1927 // Get saved block
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1928 if (!mapNewBlock.count(pdata->hashMerkleRoot))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1929 return false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1930 CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1931
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1932 pblock->nTime = pdata->nTime;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1933 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
1934 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
1935 pblock->hashMerkleRoot = pblock->BuildMerkleTree();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1936
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1937 return CheckWork(pblock, *pwalletMain, reservekey);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1938 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1939 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1940
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1941
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
1942 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
1943 {
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 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
1945 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
1946 "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
1947 "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
1948 " \"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
1949 " \"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
1950 " \"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
1951 " \"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
1952 " \"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
1953 " \"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
1954 " \"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
1955 " \"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
1956 " \"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
1957 "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
1958
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
1959 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
1960 {
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
1961 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
1962 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
1963
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
1964 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
1965 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
1966
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
1967 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
1968
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
1969 // 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
1970 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
1971 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
1972 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
1973 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
1974 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
1975 (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
1976 {
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
1977 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
1978 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
1979 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
1980
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
1981 // 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
1982 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
1983 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
1984 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
1985 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
1986 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
1987 }
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
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
1989 // Update nTime
1854
cdea646ab88a Fix issue #848 : broken mining on testnet
Gavin Andresen <gavinandresen@gmail.com>
parents: 1834
diff changeset
1990 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
1991 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
1992
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
1993 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
1994 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
1995 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
1996 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
1997
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
1998 CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
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
1999 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
2000
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
2001 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
2002 }
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
2003
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
2004 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
2005 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
2006 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
2007 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
2008 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
2009 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
2010 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
2011 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
2012 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
2013 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
2014
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
2015 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
2016 }
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
2017 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
2018 {
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
2019 // Parse parameters
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
2020 CDataStream ssBlock(ParseHex(params[0].get_str()), SER_NETWORK, PROTOCOL_VERSION);
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
2021 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
2022 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
2023
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
2024 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
2025 }
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
2026 }
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
2027
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2028 Value getblockhash(const Array& params, bool fHelp)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2029 {
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2030 if (fHelp || params.size() != 1)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2031 throw runtime_error(
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2032 "getblockhash <index>\n"
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2033 "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
2034
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2035 int nHeight = params[0].get_int();
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2036 if (nHeight < 0 || nHeight > nBestHeight)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2037 throw runtime_error("Block number out of range.");
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2038
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2039 CBlock block;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2040 CBlockIndex* pblockindex = mapBlockIndex[hashBestChain];
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2041 while (pblockindex->nHeight > nHeight)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2042 pblockindex = pblockindex->pprev;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2043 return pblockindex->phashBlock->GetHex();
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2044 }
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2045
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2046 Value getblock(const Array& params, bool fHelp)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2047 {
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2048 if (fHelp || params.size() != 1)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2049 throw runtime_error(
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2050 "getblock <hash>\n"
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2051 "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
2052
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2053 std::string strHash = params[0].get_str();
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2054 uint256 hash(strHash);
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2055
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2056 if (mapBlockIndex.count(hash) == 0)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2057 throw JSONRPCError(-5, "Block not found");
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2058
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2059 CBlock block;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2060 CBlockIndex* pblockindex = mapBlockIndex[hash];
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2061 block.ReadFromDisk(pblockindex, true);
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2062
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2063 return blockToJSON(block, pblockindex);
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2064 }
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2065
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
2066
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2067
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2068
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2069
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2070
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2071
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2072
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2073
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2074
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2075
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2076 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2077 // Call Table
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2078 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2079
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2080
2294
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
2081 static const CRPCCommand vRPCCommands[] =
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2082 { // name function safe mode?
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2083 // ------------------------ ----------------------- ----------
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2084 { "help", &help, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2085 { "stop", &stop, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2086 { "getblockcount", &getblockcount, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2087 { "getblocknumber", &getblocknumber, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2088 { "getconnectioncount", &getconnectioncount, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2089 { "getdifficulty", &getdifficulty, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2090 { "getgenerate", &getgenerate, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2091 { "setgenerate", &setgenerate, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2092 { "gethashespersec", &gethashespersec, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2093 { "getinfo", &getinfo, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2094 { "getmininginfo", &getmininginfo, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2095 { "getnewaddress", &getnewaddress, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2096 { "getaccountaddress", &getaccountaddress, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2097 { "setaccount", &setaccount, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2098 { "getaccount", &getaccount, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2099 { "getaddressesbyaccount", &getaddressesbyaccount, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2100 { "sendtoaddress", &sendtoaddress, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2101 { "getreceivedbyaddress", &getreceivedbyaddress, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2102 { "getreceivedbyaccount", &getreceivedbyaccount, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2103 { "listreceivedbyaddress", &listreceivedbyaddress, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2104 { "listreceivedbyaccount", &listreceivedbyaccount, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2105 { "backupwallet", &backupwallet, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2106 { "keypoolrefill", &keypoolrefill, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2107 { "walletpassphrase", &walletpassphrase, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2108 { "walletpassphrasechange", &walletpassphrasechange, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2109 { "walletlock", &walletlock, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2110 { "encryptwallet", &encryptwallet, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2111 { "validateaddress", &validateaddress, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2112 { "getbalance", &getbalance, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2113 { "move", &movecmd, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2114 { "sendfrom", &sendfrom, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2115 { "sendmany", &sendmany, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2116 { "addmultisigaddress", &addmultisigaddress, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2117 { "getblock", &getblock, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2118 { "getblockhash", &getblockhash, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2119 { "gettransaction", &gettransaction, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2120 { "listtransactions", &listtransactions, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2121 { "signmessage", &signmessage, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2122 { "verifymessage", &verifymessage, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2123 { "getwork", &getwork, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2124 { "listaccounts", &listaccounts, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2125 { "settxfee", &settxfee, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2126 { "getmemorypool", &getmemorypool, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2127 { "listsinceblock", &listsinceblock, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2128 { "dumpprivkey", &dumpprivkey, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2129 { "importprivkey", &importprivkey, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2130 };
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2131
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2132 CRPCTable::CRPCTable()
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2133 {
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2134 unsigned int vcidx;
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2135 for (vcidx = 0; vcidx < (sizeof(vRPCCommands) / sizeof(vRPCCommands[0])); vcidx++)
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2136 {
2294
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
2137 const CRPCCommand *pcmd;
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2138
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2139 pcmd = &vRPCCommands[vcidx];
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2140 mapCommands[pcmd->name] = pcmd;
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2141 }
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2142 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2143
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2144 const CRPCCommand *CRPCTable::operator[](string name) const
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2145 {
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2146 map<string, const CRPCCommand*>::const_iterator it = mapCommands.find(name);
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2147 if (it == mapCommands.end())
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2148 return NULL;
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2149 return (*it).second;
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2150 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2151
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2152 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2153 // HTTP protocol
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2154 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2155 // 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
2156 // 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
2157 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2158
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2159 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
2160 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2161 ostringstream s;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2162 s << "POST / HTTP/1.1\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2163 << "User-Agent: bitcoin-json-rpc/" << FormatFullVersion() << "\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2164 << "Host: 127.0.0.1\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2165 << "Content-Type: application/json\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2166 << "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
2167 << "Connection: close\r\n"
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2168 << "Accept: application/json\r\n";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2169 BOOST_FOREACH(const PAIRTYPE(string, string)& item, mapRequestHeaders)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2170 s << item.first << ": " << item.second << "\r\n";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2171 s << "\r\n" << strMsg;
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 return s.str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2174 }
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 string rfc1123Time()
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2177 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2178 char buffer[64];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2179 time_t now;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2180 time(&now);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2181 struct tm* now_gmt = gmtime(&now);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2182 string locale(setlocale(LC_TIME, NULL));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2183 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
2184 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
2185 setlocale(LC_TIME, locale.c_str());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2186 return string(buffer);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2187 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2188
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2189 static string HTTPReply(int nStatus, const string& strMsg)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2190 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2191 if (nStatus == 401)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2192 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
2193 "Date: %s\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2194 "Server: bitcoin-json-rpc/%s\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2195 "WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2196 "Content-Type: text/html\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2197 "Content-Length: 296\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2198 "\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2199 "<!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
2200 "\"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
2201 "<HTML>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2202 "<HEAD>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2203 "<TITLE>Error</TITLE>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2204 "<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
2205 "</HEAD>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2206 "<BODY><H1>401 Unauthorized.</H1></BODY>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2207 "</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
2208 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
2209 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
2210 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
2211 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
2212 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
2213 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
2214 else cStatus = "";
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2215 return strprintf(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2216 "HTTP/1.1 %d %s\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2217 "Date: %s\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2218 "Connection: close\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2219 "Content-Length: %d\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2220 "Content-Type: application/json\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2221 "Server: bitcoin-json-rpc/%s\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2222 "\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2223 "%s",
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2224 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
2225 cStatus,
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2226 rfc1123Time().c_str(),
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2227 strMsg.size(),
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2228 FormatFullVersion().c_str(),
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2229 strMsg.c_str());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2230 }
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 int ReadHTTPStatus(std::basic_istream<char>& stream)
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 string str;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2235 getline(stream, str);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2236 vector<string> vWords;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2237 boost::split(vWords, str, boost::is_any_of(" "));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2238 if (vWords.size() < 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2239 return 500;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2240 return atoi(vWords[1].c_str());
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 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
2244 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2245 int nLen = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2246 loop
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2247 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2248 string str;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2249 std::getline(stream, str);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2250 if (str.empty() || str == "\r")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2251 break;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2252 string::size_type nColon = str.find(":");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2253 if (nColon != string::npos)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2254 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2255 string strHeader = str.substr(0, nColon);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2256 boost::trim(strHeader);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2257 boost::to_lower(strHeader);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2258 string strValue = str.substr(nColon+1);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2259 boost::trim(strValue);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2260 mapHeadersRet[strHeader] = strValue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2261 if (strHeader == "content-length")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2262 nLen = atoi(strValue.c_str());
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 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2265 return nLen;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2266 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2267
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2268 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
2269 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2270 mapHeadersRet.clear();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2271 strMessageRet = "";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2272
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2273 // Read status
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2274 int nStatus = ReadHTTPStatus(stream);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2275
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2276 // Read header
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2277 int nLen = ReadHTTPHeader(stream, mapHeadersRet);
2311
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
2278 if (nLen < 0 || nLen > (int)MAX_SIZE)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2279 return 500;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2280
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2281 // Read message
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2282 if (nLen > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2283 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2284 vector<char> vch(nLen);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2285 stream.read(&vch[0], nLen);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2286 strMessageRet = string(vch.begin(), vch.end());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2287 }
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 return nStatus;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2290 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2291
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2292 bool HTTPAuthorized(map<string, string>& mapHeaders)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2293 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2294 string strAuth = mapHeaders["authorization"];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2295 if (strAuth.substr(0,6) != "Basic ")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2296 return false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2297 string strUserPass64 = strAuth.substr(6); boost::trim(strUserPass64);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2298 string strUserPass = DecodeBase64(strUserPass64);
1541
d9bb9c516845 Speed up RPC authentication (reworked pull from Joel Katz)
Gavin Andresen <gavinandresen@gmail.com>
parents: 1533
diff changeset
2299 return strUserPass == strRPCUserColonPass;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2300 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2301
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 // 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
2304 // 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
2305 // unspecified (HTTP errors and contents of 'error').
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2306 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2307 // 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
2308 // 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
2309 // 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
2310 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2311
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2312 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
2313 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2314 Object request;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2315 request.push_back(Pair("method", strMethod));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2316 request.push_back(Pair("params", params));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2317 request.push_back(Pair("id", id));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2318 return write_string(Value(request), false) + "\n";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2319 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2320
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2321 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
2322 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2323 Object reply;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2324 if (error.type() != null_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2325 reply.push_back(Pair("result", Value::null));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2326 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2327 reply.push_back(Pair("result", result));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2328 reply.push_back(Pair("error", error));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2329 reply.push_back(Pair("id", id));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2330 return write_string(Value(reply), false) + "\n";
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2333 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
2334 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2335 // Send error reply from json-rpc error object
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2336 int nStatus = 500;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2337 int code = find_value(objError, "code").get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2338 if (code == -32600) nStatus = 400;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2339 else if (code == -32601) nStatus = 404;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2340 string strReply = JSONRPCReply(Value::null, objError, id);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2341 stream << HTTPReply(nStatus, strReply) << std::flush;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2342 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2343
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2344 bool ClientAllowed(const string& strAddress)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2345 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2346 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
2347 return true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2348 const vector<string>& vAllow = mapMultiArgs["-rpcallowip"];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2349 BOOST_FOREACH(string strAllow, vAllow)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2350 if (WildcardMatch(strAddress, strAllow))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2351 return true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2352 return false;
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
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 // 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
2357 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2358 class SSLIOStreamDevice : public iostreams::device<iostreams::bidirectional> {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2359 public:
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2360 SSLIOStreamDevice(SSLStream &streamIn, bool fUseSSLIn) : stream(streamIn)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2361 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2362 fUseSSL = fUseSSLIn;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2363 fNeedHandshake = fUseSSLIn;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2364 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2365
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2366 void handshake(ssl::stream_base::handshake_type role)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2367 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2368 if (!fNeedHandshake) return;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2369 fNeedHandshake = false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2370 stream.handshake(role);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2371 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2372 std::streamsize read(char* s, std::streamsize n)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2373 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2374 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
2375 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
2376 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
2377 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2378 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
2379 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2380 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
2381 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
2382 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
2383 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2384 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
2385 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2386 ip::tcp::resolver resolver(stream.get_io_service());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2387 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
2388 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
2389 ip::tcp::resolver::iterator end;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2390 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
2391 while (error && endpoint_iterator != end)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2392 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2393 stream.lowest_layer().close();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2394 stream.lowest_layer().connect(*endpoint_iterator++, error);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2395 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2396 if (error)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2397 return false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2398 return true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2399 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2400
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2401 private:
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2402 bool fNeedHandshake;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2403 bool fUseSSL;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2404 SSLStream& stream;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2405 };
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 void ThreadRPCServer(void* parg)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2408 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2409 IMPLEMENT_RANDOMIZE_STACK(ThreadRPCServer(parg));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2410 try
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2411 {
1852
ddd932bee2e8 Symbolic names for threads
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1834
diff changeset
2412 vnThreadsRunning[THREAD_RPCSERVER]++;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2413 ThreadRPCServer2(parg);
1852
ddd932bee2e8 Symbolic names for threads
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1834
diff changeset
2414 vnThreadsRunning[THREAD_RPCSERVER]--;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2415 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2416 catch (std::exception& e) {
1852
ddd932bee2e8 Symbolic names for threads
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1834
diff changeset
2417 vnThreadsRunning[THREAD_RPCSERVER]--;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2418 PrintException(&e, "ThreadRPCServer()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2419 } catch (...) {
1852
ddd932bee2e8 Symbolic names for threads
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1834
diff changeset
2420 vnThreadsRunning[THREAD_RPCSERVER]--;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2421 PrintException(NULL, "ThreadRPCServer()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2422 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2423 printf("ThreadRPCServer exiting\n");
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 void ThreadRPCServer2(void* parg)
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 printf("ThreadRPCServer started\n");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2429
1541
d9bb9c516845 Speed up RPC authentication (reworked pull from Joel Katz)
Gavin Andresen <gavinandresen@gmail.com>
parents: 1533
diff changeset
2430 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
2431 if (mapArgs["-rpcpassword"] == "")
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2432 {
1800
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay.
Gregory Maxwell <greg@xiph.org>
parents: 1792
diff changeset
2433 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
2434 RAND_bytes(rand_pwd, 32);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2435 string strWhatAmI = "To use bitcoind";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2436 if (mapArgs.count("-server"))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2437 strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2438 else if (mapArgs.count("-daemon"))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2439 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
2440 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
2441 _("%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
2442 "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
2443 "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
2444 "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
2445 "(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
2446 "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
2447 strWhatAmI.c_str(),
2207
34d7dc611b26 Use filesystem::path instead of manual string tinkering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2205
diff changeset
2448 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
2449 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
2450 _("Error"), wxOK | wxMODAL);
2152
aef73b9ddae3 support RPC stop and encryptwallet with UI
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2143
diff changeset
2451 QueueShutdown();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2452 return;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2453 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2454
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2455 bool fUseSSL = GetBoolArg("-rpcssl");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2456 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
2457
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2458 asio::io_service io_service;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2459 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
2460 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
2461 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
2462 {
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
2463 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
2464 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
2465 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
2466 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
2467 }
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
2468 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
2469 {
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
2470 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
2471 _("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
2472 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
2473 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
2474 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2475
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2476 ssl::context context(io_service, ssl::context::sslv23);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2477 if (fUseSSL)
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 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
2480
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
2481 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
2482 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
2483 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
2484 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
2485
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
2486 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
2487 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
2488 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
2489 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
2490
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
2491 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
2492 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
2493 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2494
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2495 loop
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2496 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2497 // Accept connection
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2498 SSLStream sslStream(io_service, context);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2499 SSLIOStreamDevice d(sslStream, fUseSSL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2500 iostreams::stream<SSLIOStreamDevice> stream(d);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2501
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2502 ip::tcp::endpoint peer;
1852
ddd932bee2e8 Symbolic names for threads
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1834
diff changeset
2503 vnThreadsRunning[THREAD_RPCSERVER]--;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2504 acceptor.accept(sslStream.lowest_layer(), peer);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2505 vnThreadsRunning[4]++;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2506 if (fShutdown)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2507 return;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2508
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2509 // Restrict callers by IP
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2510 if (!ClientAllowed(peer.address().to_string()))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2511 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2512 // 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
2513 if (!fUseSSL)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2514 stream << HTTPReply(403, "") << std::flush;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2515 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2516 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2517
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2518 map<string, string> mapHeaders;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2519 string strRequest;
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 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
2522 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
2523 { // Timed out:
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2524 acceptor.cancel();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2525 printf("ThreadRPCServer ReadHTTP timeout\n");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2526 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2527 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2528
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2529 // Check authorization
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2530 if (mapHeaders.count("authorization") == 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2531 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2532 stream << HTTPReply(401, "") << std::flush;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2533 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2534 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2535 if (!HTTPAuthorized(mapHeaders))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2536 {
1800
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay.
Gregory Maxwell <greg@xiph.org>
parents: 1792
diff changeset
2537 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
2538 /* 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
2539 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
2540 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
2541 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
2542 Sleep(250);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2543
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2544 stream << HTTPReply(401, "") << std::flush;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2545 continue;
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 Value id = Value::null;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2549 try
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 // Parse request
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2552 Value valRequest;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2553 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
2554 throw JSONRPCError(-32700, "Parse error");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2555 const Object& request = valRequest.get_obj();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2556
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2557 // 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
2558 id = find_value(request, "id");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2559
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2560 // Parse method
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2561 Value valMethod = find_value(request, "method");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2562 if (valMethod.type() == null_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2563 throw JSONRPCError(-32600, "Missing method");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2564 if (valMethod.type() != str_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2565 throw JSONRPCError(-32600, "Method must be a string");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2566 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
2567 if (strMethod != "getwork" && strMethod != "getmemorypool")
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2568 printf("ThreadRPCServer method=%s\n", strMethod.c_str());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2569
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2570 // Parse params
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2571 Value valParams = find_value(request, "params");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2572 Array params;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2573 if (valParams.type() == array_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2574 params = valParams.get_array();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2575 else if (valParams.type() == null_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2576 params = Array();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2577 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2578 throw JSONRPCError(-32600, "Params must be an array");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2579
2374
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2580 Value result = tableRPC.execute(strMethod, params);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2581
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2582 // Send reply
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2583 string strReply = JSONRPCReply(result, Value::null, id);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2584 stream << HTTPReply(200, strReply) << std::flush;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2585 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2586 catch (Object& objError)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2587 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2588 ErrorReply(stream, objError, id);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2589 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2590 catch (std::exception& e)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2591 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2592 ErrorReply(stream, JSONRPCError(-32700, e.what()), id);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2593 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2594 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2595 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2596
2374
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2597 json_spirit::Value CRPCTable::execute(const std::string &strMethod, const json_spirit::Array &params) const
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2598 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2599 // Find method
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2600 const CRPCCommand *pcmd = tableRPC[strMethod];
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2601 if (!pcmd)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2602 throw JSONRPCError(-32601, "Method not found");
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2603
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2604 // Observe safe mode
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2605 string strWarning = GetWarnings("rpc");
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2606 if (strWarning != "" && !GetBoolArg("-disablesafemode") &&
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2607 !pcmd->okSafeMode)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2608 throw JSONRPCError(-2, string("Safe mode: ") + strWarning);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2609
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2610 try
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2611 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2612 // Execute
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2613 Value result;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2614 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2615 LOCK2(cs_main, pwalletMain->cs_wallet);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2616 result = pcmd->actor(params, false);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2617 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2618 return result;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2619 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2620 catch (std::exception& e)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2621 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2622 throw JSONRPCError(-1, e.what());
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2623 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2624 }
1181
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2627 Object CallRPC(const string& strMethod, const Array& params)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2628 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2629 if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2630 throw runtime_error(strprintf(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2631 _("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
2632 "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
2633 GetConfigFile().string().c_str()));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2634
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2635 // Connect to localhost
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2636 bool fUseSSL = GetBoolArg("-rpcssl");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2637 asio::io_service io_service;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2638 ssl::context context(io_service, ssl::context::sslv23);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2639 context.set_options(ssl::context::no_sslv2);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2640 SSLStream sslStream(io_service, context);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2641 SSLIOStreamDevice d(sslStream, fUseSSL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2642 iostreams::stream<SSLIOStreamDevice> stream(d);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2643 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
2644 throw runtime_error("couldn't connect to server");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2645
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2646 // HTTP basic authentication
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2647 string strUserPass64 = EncodeBase64(mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2648 map<string, string> mapRequestHeaders;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2649 mapRequestHeaders["Authorization"] = string("Basic ") + strUserPass64;
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 // Send request
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2652 string strRequest = JSONRPCRequest(strMethod, params, 1);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2653 string strPost = HTTPPost(strRequest, mapRequestHeaders);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2654 stream << strPost << std::flush;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2655
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2656 // Receive reply
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2657 map<string, string> mapHeaders;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2658 string strReply;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2659 int nStatus = ReadHTTP(stream, mapHeaders, strReply);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2660 if (nStatus == 401)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2661 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
2662 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
2663 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
2664 else if (strReply.empty())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2665 throw runtime_error("no response from server");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2666
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2667 // Parse reply
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2668 Value valReply;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2669 if (!read_string(strReply, valReply))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2670 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
2671 const Object& reply = valReply.get_obj();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2672 if (reply.empty())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2673 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
2674
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2675 return reply;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2676 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2677
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2678
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2681 template<typename T>
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2682 void ConvertTo(Value& value)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2683 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2684 if (value.type() == str_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2685 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2686 // reinterpret string as unquoted json value
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2687 Value value2;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2688 if (!read_string(value.get_str(), value2))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2689 throw runtime_error("type mismatch");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2690 value = value2.get_value<T>();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2691 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2692 else
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 value = value.get_value<T>();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2695 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2696 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2697
2374
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2698 // Convert strings to command-specific RPC representation
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2699 Array RPCConvertValues(const std::string &strMethod, const std::vector<std::string> &strParams)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2700 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2701 Array params;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2702 BOOST_FOREACH(const std::string &param, strParams)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2703 params.push_back(param);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2704
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2705 int n = params.size();
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2706
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2707 //
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2708 // Special case non-string parameter types
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2709 //
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2710 if (strMethod == "setgenerate" && n > 0) ConvertTo<bool>(params[0]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2711 if (strMethod == "setgenerate" && n > 1) ConvertTo<boost::int64_t>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2712 if (strMethod == "sendtoaddress" && n > 1) ConvertTo<double>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2713 if (strMethod == "settxfee" && n > 0) ConvertTo<double>(params[0]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2714 if (strMethod == "getreceivedbyaddress" && n > 1) ConvertTo<boost::int64_t>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2715 if (strMethod == "getreceivedbyaccount" && n > 1) ConvertTo<boost::int64_t>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2716 if (strMethod == "listreceivedbyaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2717 if (strMethod == "listreceivedbyaddress" && n > 1) ConvertTo<bool>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2718 if (strMethod == "listreceivedbyaccount" && n > 0) ConvertTo<boost::int64_t>(params[0]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2719 if (strMethod == "listreceivedbyaccount" && n > 1) ConvertTo<bool>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2720 if (strMethod == "getbalance" && n > 1) ConvertTo<boost::int64_t>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2721 if (strMethod == "getblockhash" && n > 0) ConvertTo<boost::int64_t>(params[0]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2722 if (strMethod == "move" && n > 2) ConvertTo<double>(params[2]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2723 if (strMethod == "move" && n > 3) ConvertTo<boost::int64_t>(params[3]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2724 if (strMethod == "sendfrom" && n > 2) ConvertTo<double>(params[2]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2725 if (strMethod == "sendfrom" && n > 3) ConvertTo<boost::int64_t>(params[3]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2726 if (strMethod == "listtransactions" && n > 1) ConvertTo<boost::int64_t>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2727 if (strMethod == "listtransactions" && n > 2) ConvertTo<boost::int64_t>(params[2]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2728 if (strMethod == "listaccounts" && n > 0) ConvertTo<boost::int64_t>(params[0]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2729 if (strMethod == "walletpassphrase" && n > 1) ConvertTo<boost::int64_t>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2730 if (strMethod == "listsinceblock" && n > 1) ConvertTo<boost::int64_t>(params[1]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2731 if (strMethod == "sendmany" && n > 1)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2732 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2733 string s = params[1].get_str();
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2734 Value v;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2735 if (!read_string(s, v) || v.type() != obj_type)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2736 throw runtime_error("type mismatch");
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2737 params[1] = v.get_obj();
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2738 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2739 if (strMethod == "sendmany" && n > 2) ConvertTo<boost::int64_t>(params[2]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2740 if (strMethod == "addmultisigaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2741 if (strMethod == "addmultisigaddress" && n > 1)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2742 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2743 string s = params[1].get_str();
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2744 Value v;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2745 if (!read_string(s, v) || v.type() != array_type)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2746 throw runtime_error("type mismatch "+s);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2747 params[1] = v.get_array();
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2748 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2749 return params;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2750 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2751
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2752 int CommandLineRPC(int argc, char *argv[])
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2753 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2754 string strPrint;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2755 int nRet = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2756 try
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2757 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2758 // Skip switches
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2759 while (argc > 1 && IsSwitchChar(argv[1][0]))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2760 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2761 argc--;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2762 argv++;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2763 }
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 // Method
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2766 if (argc < 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2767 throw runtime_error("too few parameters");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2768 string strMethod = argv[1];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2769
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2770 // Parameters default to strings
2374
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2771 std::vector<std::string> strParams(&argv[2], &argv[argc]);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2772 Array params = RPCConvertValues(strMethod, strParams);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2773
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2774 // Execute
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2775 Object reply = CallRPC(strMethod, params);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2776
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2777 // Parse reply
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2778 const Value& result = find_value(reply, "result");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2779 const Value& error = find_value(reply, "error");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2780
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2781 if (error.type() != null_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2782 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2783 // Error
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2784 strPrint = "error: " + write_string(error, false);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2785 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
2786 nRet = abs(code);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2787 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2788 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2789 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2790 // Result
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2791 if (result.type() == null_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2792 strPrint = "";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2793 else if (result.type() == str_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2794 strPrint = result.get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2795 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2796 strPrint = write_string(result, true);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2797 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2798 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2799 catch (std::exception& e)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2800 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2801 strPrint = string("error: ") + e.what();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2802 nRet = 87;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2803 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2804 catch (...)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2805 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2806 PrintException(NULL, "CommandLineRPC()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2807 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2808
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2809 if (strPrint != "")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2810 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2811 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
2812 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2813 return nRet;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2814 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2815
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2816
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2817
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2818
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2819 #ifdef TEST
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2820 int main(int argc, char *argv[])
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2821 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2822 #ifdef _MSC_VER
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2823 // Turn off microsoft heap dump noise
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2824 _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2825 _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
2826 #endif
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2827 setbuf(stdin, NULL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2828 setbuf(stdout, NULL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2829 setbuf(stderr, NULL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2830
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2831 try
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2832 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2833 if (argc >= 2 && string(argv[1]) == "-server")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2834 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2835 printf("server ready\n");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2836 ThreadRPCServer(NULL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2837 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2838 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2839 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2840 return CommandLineRPC(argc, argv);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2841 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2842 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2843 catch (std::exception& e) {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2844 PrintException(&e, "main()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2845 } catch (...) {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2846 PrintException(NULL, "main()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2847 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2848 return 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2849 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2850 #endif
2294
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
2851
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
2852 const CRPCTable tableRPC;