Mercurial > hg > bitcoin

annotate src/bitcoinrpc.cpp @ 3152:bf716647e542 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor: SignSignature/VerifyScript Minor refactor to support signrawtx signing/verifying transactions when it might only have the previous transaction's txid and txOut.
author Gavin Andresen <gavinandresen@gmail.com>
date Thu, 21 Jun 2012 17:05:42 -0400
parents 0bd236db489f
children 39bfd8cd4cd7
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
2607
98dbb2aa4f5a Update License in File Headers
Fordy <fanquake@gmail.com>
parents: 2593
diff changeset
4 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
1181
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"
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
13 #include "base58.h"
2294
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
14 #include "bitcoinrpc.h"
2274
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2256
diff changeset
15
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
16 #undef printf
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
17 #include <boost/asio.hpp>
3080
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
18 #include <boost/asio/ip/v6_only.hpp>
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
19 #include <boost/bind.hpp>
1583
df45e8721f53 Key import and export
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1582
diff changeset
20 #include <boost/filesystem.hpp>
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
21 #include <boost/foreach.hpp>
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
22 #include <boost/iostreams/concepts.hpp>
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
23 #include <boost/iostreams/stream.hpp>
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
24 #include <boost/algorithm/string.hpp>
1582
a562176d7552 Preparations for key import/export
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1580
diff changeset
25 #include <boost/lexical_cast.hpp>
2746
246ba5ba6805 introduce a new StartShutdown() function, which starts a thread with Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits)
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2723
diff changeset
26 #include <boost/asio/ssl.hpp>
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
27 #include <boost/filesystem/fstream.hpp>
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
28 #include <boost/shared_ptr.hpp>
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
29 #include <list>
2169
fab353e96776 Remove USE_SSL #define
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
30
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
31 #define printf OutputDebugStringF
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
32 // 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
33 // 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
34 // 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
35 // 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
36
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
37 using namespace std;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
38 using namespace boost;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
39 using namespace boost::asio;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
40 using namespace json_spirit;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
41
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
42 void ThreadRPCServer2(void* parg);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
43
1541
d9bb9c516845 Speed up RPC authentication (reworked pull from Joel Katz)
Gavin Andresen <gavinandresen@gmail.com>
parents: 1533
diff changeset
44 static std::string strRPCUserColonPass;
d9bb9c516845 Speed up RPC authentication (reworked pull from Joel Katz)
Gavin Andresen <gavinandresen@gmail.com>
parents: 1533
diff changeset
45
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
46 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
47 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
48
3121
7012c18c2ac1 Create new rpcnet module, and move 'getconnectioncount' RPC to it
Jeff Garzik <jgarzik@exmulti.com>
parents: 3115
diff changeset
49 extern Value getconnectioncount(const Array& params, bool fHelp);
3122
7e82edef942e RPC: add 'getpeerinfo', returning easy-to-retrieve per-CNode data
Jeff Garzik <jgarzik@exmulti.com>
parents: 3121
diff changeset
50 extern Value getpeerinfo(const Array& params, bool fHelp);
1583
df45e8721f53 Key import and export
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1582
diff changeset
51 extern Value dumpprivkey(const Array& params, bool fHelp);
df45e8721f53 Key import and export
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1582
diff changeset
52 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
53
2413
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
54 const Object emptyobj;
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
55
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
56 void ThreadRPCServer3(void* parg);
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
57
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
58 Object JSONRPCError(int code, const string& message)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
59 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
60 Object error;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
61 error.push_back(Pair("code", code));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
62 error.push_back(Pair("message", message));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
63 return error;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
64 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
65
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
66 double GetDifficulty(const CBlockIndex* blockindex = NULL)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
67 {
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
68 // 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
69 // minimum difficulty = 1.0.
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
70 if (blockindex == NULL)
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 if (pindexBest == NULL)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
73 return 1.0;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
74 else
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
75 blockindex = pindexBest;
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
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
78 int nShift = (blockindex->nBits >> 24) & 0xff;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
79
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
80 double dDiff =
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
81 (double)0x0000ffff / (double)(blockindex->nBits & 0x00ffffff);
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 while (nShift < 29)
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 dDiff *= 256.0;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
86 nShift++;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
87 }
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
88 while (nShift > 29)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
89 {
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
90 dDiff /= 256.0;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
91 nShift--;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
92 }
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
93
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
94 return dDiff;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
95 }
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
96
1181
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 int64 AmountFromValue(const Value& value)
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 double dAmount = value.get_real();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
101 if (dAmount <= 0.0 || dAmount > 21000000.0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
102 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
103 int64 nAmount = roundint64(dAmount * COIN);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
104 if (!MoneyRange(nAmount))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
105 throw JSONRPCError(-3, "Invalid amount");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
106 return nAmount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
107 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
108
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
109 Value ValueFromAmount(int64 amount)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
110 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
111 return (double)amount / (double)COIN;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
112 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
113
1900
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
114 std::string
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
115 HexBits(unsigned int nBits)
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
116 {
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
117 union {
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
118 int32_t nBits;
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
119 char cBits[4];
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
120 } uBits;
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
121 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
122 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
123 }
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
124
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
125 static std::string
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
126 HelpRequiringPassphrase()
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
127 {
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
128 return pwalletMain->IsCrypted()
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
129 ? "\nrequires wallet passphrase to be set with walletpassphrase first"
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
130 : "";
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
131 }
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
132
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
133 static inline void
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
134 EnsureWalletIsUnlocked()
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
135 {
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
136 if (pwalletMain->IsLocked())
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
137 throw JSONRPCError(-13, "Error: Please enter the wallet passphrase with walletpassphrase first.");
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
138 }
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
139
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
140 void WalletTxToJSON(const CWalletTx& wtx, Object& entry)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
141 {
1590
820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
142 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
143 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
144 if (confirms)
820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
145 {
820c00b48391 Merge branch 'txn_block_info' of https://github.com/luke-jr/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
146 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
147 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
148 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
149 entry.push_back(Pair("txid", wtx.GetHash().GetHex()));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
150 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
151 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
152 entry.push_back(Pair(item.first, item.second));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
153 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
154
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
155 string AccountFromValue(const Value& value)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
156 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
157 string strAccount = value.get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
158 if (strAccount == "*")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
159 throw JSONRPCError(-11, "Invalid account name");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
160 return strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
161 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
162
3151
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
163 Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex)
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
164 {
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
165 Object result;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
166 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
167 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
168 txGen.SetMerkleBranch(&block);
1199f19e41c6 Add block "confirmations" to getblock, mainly for identifying orphans
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2405
diff changeset
169 result.push_back(Pair("confirmations", (int)txGen.GetDepthInMainChain()));
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
170 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
171 result.push_back(Pair("height", blockindex->nHeight));
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
172 result.push_back(Pair("version", block.nVersion));
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
173 result.push_back(Pair("merkleroot", block.hashMerkleRoot.GetHex()));
3151
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
174 Array txs;
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
175 BOOST_FOREACH(const CTransaction&tx, block.vtx)
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
176 txs.push_back(tx.GetHash().GetHex());
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
177 result.push_back(Pair("tx", txs));
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
178 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
179 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
180 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
181 result.push_back(Pair("difficulty", GetDifficulty(blockindex)));
2413
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
182
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
183 if (blockindex->pprev)
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("previousblockhash", blockindex->pprev->GetBlockHash().GetHex()));
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
185 if (blockindex->pnext)
1900
7ce608dfe20e Cleanup JSON-RPC getblock output to be consistent
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1869
diff changeset
186 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
187 return result;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
188 }
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
189
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
190
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
191
2413
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
192
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
193 ///
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
194 /// 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
195 ///
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
196
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
197 string CRPCTable::help(string strCommand) const
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 string strRet;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
200 set<rpcfn_type> setDone;
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
201 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
202 {
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
203 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
204 string strMethod = mi->first;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
205 // We already filter duplicates, but these deprecated screw up the sort order
2608
4394920b7888 JSON-RPC: remove 'getblocknumber' deprecated RPC
Jeff Garzik <jgarzik@exmulti.com>
parents: 2593
diff changeset
206 if (strMethod.find("label") != string::npos)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
207 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
208 if (strCommand != "" && strMethod != strCommand)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
209 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
210 try
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
211 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
212 Array params;
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
213 rpcfn_type pfn = pcmd->actor;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
214 if (setDone.insert(pfn).second)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
215 (*pfn)(params, true);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
216 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
217 catch (std::exception& e)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
218 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
219 // Help text is returned in an exception
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
220 string strHelp = string(e.what());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
221 if (strCommand == "")
2255
7e66f9a59926 The string class returns string::npos, when find() fails.
Jeff Garzik <jeff@garzik.org>
parents: 2246
diff changeset
222 if (strHelp.find('\n') != string::npos)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
223 strHelp = strHelp.substr(0, strHelp.find('\n'));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
224 strRet += strHelp + "\n";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
225 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
226 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
227 if (strRet == "")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
228 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
229 strRet = strRet.substr(0,strRet.size()-1);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
230 return strRet;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
231 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
232
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
233 Value help(const Array& params, bool fHelp)
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
234 {
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
235 if (fHelp || params.size() > 1)
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
236 throw runtime_error(
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
237 "help [command]\n"
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
238 "List commands, or get help for a command.");
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
239
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
240 string strCommand;
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
241 if (params.size() > 0)
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
242 strCommand = params[0].get_str();
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
243
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
244 return tableRPC.help(strCommand);
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
245 }
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
246
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
247
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
248 Value stop(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
249 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
250 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
251 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
252 "stop\n"
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
253 "Stop Bitcoin server.");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
254 // Shutdown will take long enough that the response should get back
2746
246ba5ba6805 introduce a new StartShutdown() function, which starts a thread with Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits)
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2723
diff changeset
255 StartShutdown();
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
256 return "Bitcoin server stopping";
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
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 Value getblockcount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
261 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
262 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
263 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
264 "getblockcount\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
265 "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
266
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
267 return nBestHeight;
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
271 Value getdifficulty(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
272 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
273 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
274 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
275 "getdifficulty\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
276 "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
277
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
278 return GetDifficulty();
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
281
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
282 Value getgenerate(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 "getgenerate\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
287 "Returns true or false.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
288
1920
bffd14be46a8 bitcoind changes to stop storing settings in wallet.dat.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1900
diff changeset
289 return GetBoolArg("-gen");
1181
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 setgenerate(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() < 1 || params.size() > 2)
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 "setgenerate <generate> [genproclimit]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
298 "<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
299 "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
300
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
301 bool fGenerate = true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
302 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
303 fGenerate = params[0].get_bool();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
304
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
305 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
306 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
307 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
308 mapArgs["-genproclimit"] = itostr(nGenProcLimit);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
309 if (nGenProcLimit == 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
310 fGenerate = false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
311 }
1920
bffd14be46a8 bitcoind changes to stop storing settings in wallet.dat.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1900
diff changeset
312 mapArgs["-gen"] = (fGenerate ? "1" : "0");
1181
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 GenerateBitcoins(fGenerate, pwalletMain);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
315 return Value::null;
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
318
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
319 Value gethashespersec(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
320 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
321 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
322 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
323 "gethashespersec\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
324 "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
325
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
326 if (GetTimeMillis() - nHPSTimerStart > 8000)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
327 return (boost::int64_t)0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
328 return (boost::int64_t)dHashesPerSec;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
329 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
330
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
331
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
332 Value getinfo(const Array& params, bool fHelp)
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 if (fHelp || params.size() != 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
335 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
336 "getinfo\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
337 "Returns an object containing various state info.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
338
2706
2e7f831240f5 Rework network config settings
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2688
diff changeset
339 CService addrProxy;
2e7f831240f5 Rework network config settings
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2688
diff changeset
340 GetProxy(NET_IPV4, addrProxy);
2e7f831240f5 Rework network config settings
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2688
diff changeset
341
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
342 Object obj;
1584
a67f13278e2c Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents: 1541
diff changeset
343 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
344 obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION));
2086
394961982d80 Introduce explicit -walletupgrade option
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2072
diff changeset
345 obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
346 obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
347 obj.push_back(Pair("blocks", (int)nBestHeight));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
348 obj.push_back(Pair("connections", (int)vNodes.size()));
2706
2e7f831240f5 Rework network config settings
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2688
diff changeset
349 obj.push_back(Pair("proxy", (addrProxy.IsValid() ? addrProxy.ToStringIPPort() : string())));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
350 obj.push_back(Pair("difficulty", (double)GetDifficulty()));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
351 obj.push_back(Pair("testnet", fTestNet));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
352 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
353 obj.push_back(Pair("keypoolsize", pwalletMain->GetKeyPoolSize()));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
354 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
355 if (pwalletMain->IsCrypted())
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
356 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
357 obj.push_back(Pair("errors", GetWarnings("statusbar")));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
358 return obj;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
359 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
360
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
361
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
362 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
363 {
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
364 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
365 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
366 "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
367 "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
368
4b0c13de5387 Add new "getmininginfo" JSON-RPC method, with mining-only fields moved out of "getinfo"
Luke Dashjr <luke-jr+git@utopios.org>
parents: 1734
diff changeset
369 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
370 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
371 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
372 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
373 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
374 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
375 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
376 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
377 obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
2252
a52e8d9c2638 CTxMemPool: encapsulate AddToMemoryPoolUnchecked(), RemoveFromMemoryPool(),
Jeff Garzik <jeff@garzik.org>
parents: 2246
diff changeset
378 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
379 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
380 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
381 }
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
382
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
383
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
384 Value getnewaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
385 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
386 if (fHelp || params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
387 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
388 "getnewaddress [account]\n"
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
389 "Returns a new Bitcoin address for receiving payments. "
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
390 "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
391 "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
392
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
393 // 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
394 string strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
395 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
396 strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
397
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
398 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
399 pwalletMain->TopUpKeyPool();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
400
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
401 // Generate a new key that is added to wallet
2687
2cca172f83a9 Encapsulate public keys in CPubKey
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2676
diff changeset
402 CPubKey newKey;
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
403 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
404 throw JSONRPCError(-12, "Error: Keypool ran out, please call keypoolrefill first");
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
405 CKeyID keyID = newKey.GetID();
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
406
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
407 pwalletMain->SetAddressBookName(keyID, strAccount);
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
408
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
409 return CBitcoinAddress(keyID).ToString();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
410 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
411
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
412
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
413 CBitcoinAddress GetAccountAddress(string strAccount, bool bForceNew=false)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
414 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
415 CWalletDB walletdb(pwalletMain->strWalletFile);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
416
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
417 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
418 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
419
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
420 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
421
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
422 // Check if the current key has been used
2687
2cca172f83a9 Encapsulate public keys in CPubKey
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2676
diff changeset
423 if (account.vchPubKey.IsValid())
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
424 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
425 CScript scriptPubKey;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
426 scriptPubKey.SetDestination(account.vchPubKey.GetID());
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
427 for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin();
2687
2cca172f83a9 Encapsulate public keys in CPubKey
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2676
diff changeset
428 it != pwalletMain->mapWallet.end() && account.vchPubKey.IsValid();
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
429 ++it)
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 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
432 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
433 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
434 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
435 }
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
436 }
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
437
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
438 // Generate a new key
2687
2cca172f83a9 Encapsulate public keys in CPubKey
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2676
diff changeset
439 if (!account.vchPubKey.IsValid() || bForceNew || bKeyUsed)
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
440 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
441 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
442 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
443
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
444 pwalletMain->SetAddressBookName(account.vchPubKey.GetID(), strAccount);
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
445 walletdb.WriteAccount(strAccount, account);
1181
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
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
448 return CBitcoinAddress(account.vchPubKey.GetID());
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
449 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
450
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
451 Value getaccountaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
452 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
453 if (fHelp || params.size() != 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
454 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
455 "getaccountaddress <account>\n"
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
456 "Returns the current Bitcoin address for receiving payments to this account.");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
457
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
458 // 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
459 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
460
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
461 Value ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
462
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
463 ret = GetAccountAddress(strAccount).ToString();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
464
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
465 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
466 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
467
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
468
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
469
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
470 Value setaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
471 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
472 if (fHelp || params.size() < 1 || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
473 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
474 "setaccount <bitcoinaddress> <account>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
475 "Sets the account associated with the given address.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
476
1256
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1220
diff changeset
477 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
478 if (!address.IsValid())
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
479 throw JSONRPCError(-5, "Invalid Bitcoin address");
1181
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
482 string strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
483 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
484 strAccount = AccountFromValue(params[1]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
485
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
486 // Detect when changing the account of an address that is the 'unused current key' of another account:
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
487 if (pwalletMain->mapAddressBook.count(address.Get()))
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
488 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
489 string strOldAccount = pwalletMain->mapAddressBook[address.Get()];
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
490 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
491 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
492 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
493
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
494 pwalletMain->SetAddressBookName(address.Get(), strAccount);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
495
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
496 return Value::null;
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 getaccount(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)
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 "getaccount <bitcoinaddress>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
505 "Returns 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());
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1220
diff changeset
508 if (!address.IsValid())
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
509 throw JSONRPCError(-5, "Invalid Bitcoin address");
1181
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 string strAccount;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
512 map<CTxDestination, string>::iterator mi = pwalletMain->mapAddressBook.find(address.Get());
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
513 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
514 strAccount = (*mi).second;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
515 return strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
516 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
517
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
518
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
519 Value getaddressesbyaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
520 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
521 if (fHelp || params.size() != 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
522 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
523 "getaddressesbyaccount <account>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
524 "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
525
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
526 string strAccount = AccountFromValue(params[0]);
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 // Find all addresses that have the given account
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
529 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
530 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
531 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
532 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
533 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
534 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
535 ret.push_back(address.ToString());
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
536 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
537 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
538 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
539
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
540 Value settxfee(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
541 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
542 if (fHelp || params.size() < 1 || params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
543 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
544 "settxfee <amount>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
545 "<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
546
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
547 // 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
548 int64 nAmount = 0;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
549 if (params[0].get_real() != 0.0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
550 nAmount = AmountFromValue(params[0]); // rejects 0.0 amounts
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
551
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
552 nTransactionFee = nAmount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
553 return true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
554 }
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 Value sendtoaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
557 {
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
558 if (fHelp || params.size() < 2 || params.size() > 4)
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
559 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
560 "sendtoaddress <bitcoinaddress> <amount> [comment] [comment-to]\n"
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
561 "<amount> is a real and is rounded to the nearest 0.00000001"
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
562 + HelpRequiringPassphrase());
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
563
1256
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1220
diff changeset
564 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
565 if (!address.IsValid())
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
566 throw JSONRPCError(-5, "Invalid Bitcoin address");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
567
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
568 // 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
569 int64 nAmount = AmountFromValue(params[1]);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
570
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
571 // Wallet comments
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
572 CWalletTx wtx;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
573 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
574 wtx.mapValue["comment"] = params[2].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
575 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
576 wtx.mapValue["to"] = params[3].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
577
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
578 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
579 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
580
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
581 string strError = pwalletMain->SendMoneyToDestination(address.Get(), nAmount, wtx);
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
582 if (strError != "")
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
583 throw JSONRPCError(-4, strError);
1181
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 return wtx.GetHash().GetHex();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
586 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
587
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
588 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
589 {
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
590 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
591 throw runtime_error(
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
592 "signmessage <bitcoinaddress> <message>\n"
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
593 "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
594
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
595 EnsureWalletIsUnlocked();
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
596
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
597 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
598 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
599
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
600 CBitcoinAddress addr(strAddress);
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
601 if (!addr.IsValid())
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
602 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
603
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
604 CKeyID keyID;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
605 if (!addr.GetKeyID(keyID))
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
606 throw JSONRPCError(-3, "Address does not refer to key");
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
607
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
608 CKey key;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
609 if (!pwalletMain->GetKey(keyID, key))
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
610 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
611
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
612 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
613 ss << strMessageMagic;
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
614 ss << strMessage;
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
615
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
616 vector<unsigned char> vchSig;
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
617 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
618 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
619
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
620 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
621 }
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
622
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
623 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
624 {
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
625 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
626 throw runtime_error(
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
627 "verifymessage <bitcoinaddress> <signature> <message>\n"
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
628 "Verify a signed message");
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
629
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
630 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
631 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
632 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
633
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
634 CBitcoinAddress addr(strAddress);
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
635 if (!addr.IsValid())
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
636 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
637
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
638 CKeyID keyID;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
639 if (!addr.GetKeyID(keyID))
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
640 throw JSONRPCError(-3, "Address does not refer to key");
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
641
1331
b427db8574f1 base64-based sign/verify
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1330
diff changeset
642 bool fInvalid = false;
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
643 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
644
b427db8574f1 base64-based sign/verify
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1330
diff changeset
645 if (fInvalid)
b427db8574f1 base64-based sign/verify
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1330
diff changeset
646 throw JSONRPCError(-5, "Malformed base64 encoding");
b427db8574f1 base64-based sign/verify
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1330
diff changeset
647
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
648 CDataStream ss(SER_GETHASH, 0);
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
649 ss << strMessageMagic;
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
650 ss << strMessage;
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
651
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
652 CKey key;
1333
7efc4fb78051 Use key recovery for message signatures
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1331
diff changeset
653 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
654 return false;
1330
1537d1a22f34 Incorporate pubkey in signature, check based on address
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1329
diff changeset
655
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
656 return (key.GetPubKey().GetID() == keyID);
1329
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
657 }
22f52365d86b Sign and verify message with bitcoin address and public key
Khalahan <khal@bitcoin-contact.org>
parents: 1327
diff changeset
658
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
659
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
660 Value getreceivedbyaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
661 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
662 if (fHelp || params.size() < 1 || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
663 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
664 "getreceivedbyaddress <bitcoinaddress> [minconf=1]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
665 "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
666
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
667 // Bitcoin address
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
668 CBitcoinAddress address = CBitcoinAddress(params[0].get_str());
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
669 CScript scriptPubKey;
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
670 if (!address.IsValid())
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
671 throw JSONRPCError(-5, "Invalid Bitcoin address");
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
672 scriptPubKey.SetDestination(address.Get());
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
673 if (!IsMine(*pwalletMain,scriptPubKey))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
674 return (double)0.0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
675
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
676 // Minimum confirmations
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
677 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
678 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
679 nMinDepth = params[1].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
680
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
681 // 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
682 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
683 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
684 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
685 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
686 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
687 continue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
688
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
689 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
690 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
691 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
692 nAmount += txout.nValue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
693 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
694
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
695 return ValueFromAmount(nAmount);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
696 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
697
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
698
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
699 void GetAccountAddresses(string strAccount, set<CTxDestination>& setAddress)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
700 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
701 BOOST_FOREACH(const PAIRTYPE(CTxDestination, string)& item, pwalletMain->mapAddressBook)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
702 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
703 const CTxDestination& address = item.first;
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
704 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
705 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
706 setAddress.insert(address);
1181
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 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
709
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
710 Value getreceivedbyaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
711 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
712 if (fHelp || params.size() < 1 || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
713 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
714 "getreceivedbyaccount <account> [minconf=1]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
715 "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
716
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
717 // Minimum confirmations
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
718 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
719 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
720 nMinDepth = params[1].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
721
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
722 // 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
723 string strAccount = AccountFromValue(params[0]);
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
724 set<CTxDestination> setAddress;
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
725 GetAccountAddresses(strAccount, setAddress);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
726
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
727 // 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
728 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
729 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
730 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
731 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
732 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
733 continue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
734
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
735 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
736 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
737 CTxDestination address;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
738 if (ExtractDestination(txout.scriptPubKey, address) && IsMine(*pwalletMain, 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
739 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
740 nAmount += txout.nValue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
741 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
742 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
743
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
744 return (double)nAmount / (double)COIN;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
745 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
746
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
747
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
748 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
749 {
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
750 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
751
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
752 // 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
753 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
754 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
755 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
756 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
757 continue;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
758
1616
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers"
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1615
diff changeset
759 int64 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
760 wtx.GetAccountAmounts(strAccount, nGenerated, nReceived, nSent, nFee);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
761
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
762 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
763 nBalance += nReceived;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
764 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
765 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
766
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
767 // 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
768 nBalance += walletdb.GetAccountCreditDebit(strAccount);
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 return nBalance;
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
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
773 int64 GetAccountBalance(const string& strAccount, int nMinDepth)
1181
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 CWalletDB walletdb(pwalletMain->strWalletFile);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
776 return GetAccountBalance(walletdb, strAccount, nMinDepth);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
777 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
778
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
779
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
780 Value getbalance(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
781 {
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
782 if (fHelp || params.size() > 2)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
783 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
784 "getbalance [account] [minconf=1]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
785 "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
786 "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
787
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
788 if (params.size() == 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
789 return ValueFromAmount(pwalletMain->GetBalance());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
790
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
791 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
792 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
793 nMinDepth = params[1].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
794
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
795 if (params[0].get_str() == "*") {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
796 // Calculate total balance a different way from GetBalance()
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
797 // (GetBalance() sums up all unspent TxOuts)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
798 // 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
799 int64 nBalance = 0;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
800 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
801 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
802 const CWalletTx& wtx = (*it).second;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
803 if (!wtx.IsFinal())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
804 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
805
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
806 int64 allGeneratedImmature, allGeneratedMature, allFee;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
807 allGeneratedImmature = allGeneratedMature = allFee = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
808 string strSentAccount;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
809 list<pair<CTxDestination, int64> > listReceived;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
810 list<pair<CTxDestination, int64> > listSent;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
811 wtx.GetAmounts(allGeneratedImmature, allGeneratedMature, listReceived, listSent, allFee, strSentAccount);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
812 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
813 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
814 BOOST_FOREACH(const PAIRTYPE(CTxDestination,int64)& r, listReceived)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
815 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
816 }
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
817 BOOST_FOREACH(const PAIRTYPE(CTxDestination,int64)& r, listSent)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
818 nBalance -= r.second;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
819 nBalance -= allFee;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
820 nBalance += allGeneratedMature;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
821 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
822 return ValueFromAmount(nBalance);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
823 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
824
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
825 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
826
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 = GetAccountBalance(strAccount, nMinDepth);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
828
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
829 return ValueFromAmount(nBalance);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
830 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
831
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
832
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
833 Value movecmd(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
834 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
835 if (fHelp || params.size() < 3 || params.size() > 5)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
836 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
837 "move <fromaccount> <toaccount> <amount> [minconf=1] [comment]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
838 "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
839
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
840 string strFrom = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
841 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
842 int64 nAmount = AmountFromValue(params[2]);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
843 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
844 // 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
845 (void)params[3].get_int();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
846 string strComment;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
847 if (params.size() > 4)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
848 strComment = params[4].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
849
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
850 CWalletDB walletdb(pwalletMain->strWalletFile);
2552
5389f4e6b4e1 Always check return values of TxnBegin() and TxnCommit()
Jeff Garzik <jgarzik@exmulti.com>
parents: 2527
diff changeset
851 if (!walletdb.TxnBegin())
5389f4e6b4e1 Always check return values of TxnBegin() and TxnCommit()
Jeff Garzik <jgarzik@exmulti.com>
parents: 2527
diff changeset
852 throw JSONRPCError(-20, "database error");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
853
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
854 int64 nNow = GetAdjustedTime();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
855
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
856 // Debit
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
857 CAccountingEntry debit;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
858 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
859 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
860 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
861 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
862 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
863 walletdb.WriteAccountingEntry(debit);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
864
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
865 // Credit
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
866 CAccountingEntry credit;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
867 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
868 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
869 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
870 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
871 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
872 walletdb.WriteAccountingEntry(credit);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
873
2552
5389f4e6b4e1 Always check return values of TxnBegin() and TxnCommit()
Jeff Garzik <jgarzik@exmulti.com>
parents: 2527
diff changeset
874 if (!walletdb.TxnCommit())
5389f4e6b4e1 Always check return values of TxnBegin() and TxnCommit()
Jeff Garzik <jgarzik@exmulti.com>
parents: 2527
diff changeset
875 throw JSONRPCError(-20, "database error");
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
876
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
877 return true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
878 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
879
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
880
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
881 Value sendfrom(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
882 {
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
883 if (fHelp || params.size() < 3 || params.size() > 6)
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
884 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
885 "sendfrom <fromaccount> <tobitcoinaddress> <amount> [minconf=1] [comment] [comment-to]\n"
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
886 "<amount> is a real and is rounded to the nearest 0.00000001"
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
887 + HelpRequiringPassphrase());
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
888
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
889 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
890 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
891 if (!address.IsValid())
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
892 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
893 int64 nAmount = AmountFromValue(params[2]);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
894 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
895 if (params.size() > 3)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
896 nMinDepth = params[3].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
897
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
898 CWalletTx wtx;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
899 wtx.strFromAccount = strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
900 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
901 wtx.mapValue["comment"] = params[4].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
902 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
903 wtx.mapValue["to"] = params[5].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
904
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
905 EnsureWalletIsUnlocked();
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
906
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
907 // 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
908 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
909 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
910 throw JSONRPCError(-6, "Account has insufficient funds");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
911
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
912 // Send
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
913 string strError = pwalletMain->SendMoneyToDestination(address.Get(), nAmount, wtx);
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
914 if (strError != "")
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
915 throw JSONRPCError(-4, strError);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
916
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
917 return wtx.GetHash().GetHex();
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
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
920
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
921 Value sendmany(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
922 {
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
923 if (fHelp || params.size() < 2 || params.size() > 4)
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
924 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
925 "sendmany <fromaccount> {address:amount,...} [minconf=1] [comment]\n"
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
926 "amounts are double-precision floating point numbers"
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
927 + HelpRequiringPassphrase());
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
928
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
929 string strAccount = AccountFromValue(params[0]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
930 Object sendTo = params[1].get_obj();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
931 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
932 if (params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
933 nMinDepth = params[2].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
934
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
935 CWalletTx wtx;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
936 wtx.strFromAccount = strAccount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
937 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
938 wtx.mapValue["comment"] = params[3].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
939
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
940 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
941 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
942
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers"
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1615
diff changeset
943 int64 totalAmount = 0;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
944 BOOST_FOREACH(const Pair& s, sendTo)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
945 {
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
946 CBitcoinAddress address(s.name_);
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
947 if (!address.IsValid())
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
948 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
949
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
950 if (setAddress.count(address))
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
951 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
952 setAddress.insert(address);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
953
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
954 CScript scriptPubKey;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
955 scriptPubKey.SetDestination(address.Get());
2746
246ba5ba6805 introduce a new StartShutdown() function, which starts a thread with Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits)
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2723
diff changeset
956 int64 nAmount = AmountFromValue(s.value_);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
957 totalAmount += nAmount;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
958
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
959 vecSend.push_back(make_pair(scriptPubKey, nAmount));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
960 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
961
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
962 EnsureWalletIsUnlocked();
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
963
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
964 // 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
965 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
966 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
967 throw JSONRPCError(-6, "Account has insufficient funds");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
968
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
969 // Send
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
970 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
971 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
972 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
973 if (!fCreated)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
974 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
975 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
976 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
977 throw JSONRPCError(-4, "Transaction creation failed");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
978 }
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
979 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
980 throw JSONRPCError(-4, "Transaction commit failed");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
981
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
982 return wtx.GetHash().GetHex();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
983 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
984
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
985 Value addmultisigaddress(const Array& params, bool fHelp)
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
986 {
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
987 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
988 {
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
989 string msg = "addmultisigaddress <nrequired> <'[\"key\",\"key\"]'> [account]\n"
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
990 "Add a nrequired-to-sign multisignature address to the wallet\"\n"
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
991 "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
992 "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
993 throw runtime_error(msg);
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
994 }
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
995
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
996 int nRequired = params[0].get_int();
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
997 const Array& keys = params[1].get_array();
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
998 string strAccount;
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
999 if (params.size() > 2)
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1000 strAccount = AccountFromValue(params[2]);
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1001
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1002 // Gather public keys
2359
2dea5179cfd9 Fixed non-sensical error message
Peter Todd <pete@petertodd.org>
parents: 2327
diff changeset
1003 if (nRequired < 1)
2dea5179cfd9 Fixed non-sensical error message
Peter Todd <pete@petertodd.org>
parents: 2327
diff changeset
1004 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
1005 if ((int)keys.size() < nRequired)
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1006 throw runtime_error(
2359
2dea5179cfd9 Fixed non-sensical error message
Peter Todd <pete@petertodd.org>
parents: 2327
diff changeset
1007 strprintf("not enough keys supplied "
2dea5179cfd9 Fixed non-sensical error message
Peter Todd <pete@petertodd.org>
parents: 2327
diff changeset
1008 "(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
1009 std::vector<CKey> pubkeys;
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1010 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
1011 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
1012 {
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1013 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
1014
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
1015 // Case 1: Bitcoin address and we have full public key:
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1016 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
1017 if (address.IsValid())
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1018 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1019 CKeyID keyID;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1020 if (!address.GetKeyID(keyID))
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1021 throw runtime_error(
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1022 strprintf("%s does not refer to a key",ks.c_str()));
2687
2cca172f83a9 Encapsulate public keys in CPubKey
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2676
diff changeset
1023 CPubKey vchPubKey;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1024 if (!pwalletMain->GetPubKey(keyID, vchPubKey))
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1025 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
1026 strprintf("no full public key for address %s",ks.c_str()));
2687
2cca172f83a9 Encapsulate public keys in CPubKey
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2676
diff changeset
1027 if (!vchPubKey.IsValid() || !pubkeys[i].SetPubKey(vchPubKey))
1777
addcc9fb01f5 Fixed addmultisigaddress if looking up public keys from locked wallets.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1759
diff changeset
1028 throw runtime_error(" Invalid public key: "+ks);
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1029 }
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1030
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1031 // Case 2: hex public key
1755
30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress
Gavin Andresen <gavinandresen@gmail.com>
parents: 1752
diff changeset
1032 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
1033 {
2687
2cca172f83a9 Encapsulate public keys in CPubKey
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2676
diff changeset
1034 CPubKey vchPubKey(ParseHex(ks));
2cca172f83a9 Encapsulate public keys in CPubKey
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2676
diff changeset
1035 if (!vchPubKey.IsValid() || !pubkeys[i].SetPubKey(vchPubKey))
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1036 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
1037 }
1755
30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress
Gavin Andresen <gavinandresen@gmail.com>
parents: 1752
diff changeset
1038 else
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1039 {
1755
30050ce9b291 Remove base58 encoding from validateaddress/addmultisigaddress
Gavin Andresen <gavinandresen@gmail.com>
parents: 1752
diff changeset
1040 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
1041 }
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1042 }
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1043
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1044 // Construct using pay-to-script-hash:
1600
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1045 CScript inner;
dc663e46a784 OP_EVAL implementation
Gavin Andresen <gavinandresen@gmail.com>
parents: 1598
diff changeset
1046 inner.SetMultisig(nRequired, pubkeys);
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1047 CScriptID innerID = inner.GetID();
1752
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Gavin Andresen <gavinandresen@gmail.com>
parents: 1750
diff changeset
1048 pwalletMain->AddCScript(inner);
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1049
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1050 pwalletMain->SetAddressBookName(innerID, strAccount);
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1051 return CBitcoinAddress(innerID).ToString();
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1052 }
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1053
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1054
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1055 struct tallyitem
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1056 {
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
1057 int64 nAmount;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1058 int nConf;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1059 tallyitem()
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1060 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1061 nAmount = 0;
1594
e79944b2d430 Use std::numeric_limits<> for typesafe INT_MAX/etc
Gavin Andresen <gavinandresen@gmail.com>
parents: 1590
diff changeset
1062 nConf = std::numeric_limits<int>::max();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1063 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1064 };
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1065
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1066 Value ListReceived(const Array& params, bool fByAccounts)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1067 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1068 // Minimum confirmations
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1069 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1070 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1071 nMinDepth = params[0].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1072
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1073 // Whether to include empty accounts
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1074 bool fIncludeEmpty = false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1075 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1076 fIncludeEmpty = params[1].get_bool();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1077
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1078 // Tally
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
1079 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
1080 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
1081 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1082 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
1083
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1084 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
1085 continue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1086
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1087 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
1088 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
1089 continue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1090
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1091 BOOST_FOREACH(const CTxOut& txout, wtx.vout)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1092 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1093 CTxDestination address;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1094 if (!ExtractDestination(txout.scriptPubKey, address) || !IsMine(*pwalletMain, address))
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1095 continue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1096
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1097 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
1098 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
1099 item.nConf = min(item.nConf, nDepth);
1181
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 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1102
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1103 // Reply
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1104 Array ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1105 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
1106 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
1107 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1108 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
1109 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
1110 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
1111 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
1112 continue;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1113
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
1114 int64 nAmount = 0;
1594
e79944b2d430 Use std::numeric_limits<> for typesafe INT_MAX/etc
Gavin Andresen <gavinandresen@gmail.com>
parents: 1590
diff changeset
1115 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
1116 if (it != mapTally.end())
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1117 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1118 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
1119 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
1120 }
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 if (fByAccounts)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1123 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1124 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
1125 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
1126 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
1127 }
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1128 else
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1129 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1130 Object obj;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1131 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
1132 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
1133 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
1134 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
1135 ret.push_back(obj);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1136 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1137 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1138
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1139 if (fByAccounts)
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 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
1142 {
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
1143 int64 nAmount = (*it).second.nAmount;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1144 int nConf = (*it).second.nConf;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1145 Object obj;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1146 obj.push_back(Pair("account", (*it).first));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1147 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
1148 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
1149 ret.push_back(obj);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1150 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1151 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1152
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1153 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1154 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1155
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1156 Value listreceivedbyaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1157 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1158 if (fHelp || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1159 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1160 "listreceivedbyaddress [minconf=1] [includeempty=false]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1161 "[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
1162 "[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
1163 "Returns an array of objects containing:\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1164 " \"address\" : receiving address\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1165 " \"account\" : the account of the receiving address\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1166 " \"amount\" : total amount received by the address\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1167 " \"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
1168
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1169 return ListReceived(params, false);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1170 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1171
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1172 Value listreceivedbyaccount(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1173 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1174 if (fHelp || params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1175 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1176 "listreceivedbyaccount [minconf=1] [includeempty=false]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1177 "[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
1178 "[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
1179 "Returns an array of objects containing:\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1180 " \"account\" : the account of the receiving addresses\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1181 " \"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
1182 " \"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
1183
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1184 return ListReceived(params, true);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1185 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1186
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1187 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
1188 {
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
1189 int64 nGeneratedImmature, nGeneratedMature, nFee;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1190 string strSentAccount;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1191 list<pair<CTxDestination, int64> > listReceived;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1192 list<pair<CTxDestination, 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
1193
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1194 wtx.GetAmounts(nGeneratedImmature, nGeneratedMature, listReceived, listSent, nFee, strSentAccount);
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 bool fAllAccounts = (strAccount == string("*"));
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 // Generated blocks assigned to account ""
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1199 if ((nGeneratedMature+nGeneratedImmature) != 0 && (fAllAccounts || strAccount == ""))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1200 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1201 Object entry;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1202 entry.push_back(Pair("account", string("")));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1203 if (nGeneratedImmature)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1204 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1205 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
1206 entry.push_back(Pair("amount", ValueFromAmount(nGeneratedImmature)));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1207 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1208 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1209 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1210 entry.push_back(Pair("category", "generate"));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1211 entry.push_back(Pair("amount", ValueFromAmount(nGeneratedMature)));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1212 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1213 if (fLong)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1214 WalletTxToJSON(wtx, entry);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1215 ret.push_back(entry);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1216 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1217
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1218 // Sent
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1219 if ((!listSent.empty() || nFee != 0) && (fAllAccounts || strAccount == strSentAccount))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1220 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1221 BOOST_FOREACH(const PAIRTYPE(CTxDestination, int64)& s, listSent)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1222 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1223 Object entry;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1224 entry.push_back(Pair("account", strSentAccount));
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1225 entry.push_back(Pair("address", CBitcoinAddress(s.first).ToString()));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1226 entry.push_back(Pair("category", "send"));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1227 entry.push_back(Pair("amount", ValueFromAmount(-s.second)));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1228 entry.push_back(Pair("fee", ValueFromAmount(-nFee)));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1229 if (fLong)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1230 WalletTxToJSON(wtx, entry);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1231 ret.push_back(entry);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1232 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1233 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1234
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1235 // Received
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1236 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
1237 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1238 BOOST_FOREACH(const PAIRTYPE(CTxDestination, int64)& r, listReceived)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1239 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1240 string account;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1241 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
1242 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
1243 if (fAllAccounts || (account == strAccount))
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1244 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1245 Object entry;
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1246 entry.push_back(Pair("account", account));
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1247 entry.push_back(Pair("address", CBitcoinAddress(r.first).ToString()));
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1248 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
1249 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
1250 if (fLong)
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1251 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
1252 ret.push_back(entry);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1253 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1254 }
2246
b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2219
diff changeset
1255 }
1181
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 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
1259 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1260 bool fAllAccounts = (strAccount == string("*"));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1261
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1262 if (fAllAccounts || acentry.strAccount == strAccount)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1263 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1264 Object entry;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1265 entry.push_back(Pair("account", acentry.strAccount));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1266 entry.push_back(Pair("category", "move"));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1267 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
1268 entry.push_back(Pair("amount", ValueFromAmount(acentry.nCreditDebit)));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1269 entry.push_back(Pair("otheraccount", acentry.strOtherAccount));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1270 entry.push_back(Pair("comment", acentry.strComment));
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 Value listtransactions(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1276 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1277 if (fHelp || params.size() > 3)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1278 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1279 "listtransactions [account] [count=10] [from=0]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1280 "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
1281
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1282 string strAccount = "*";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1283 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1284 strAccount = params[0].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1285 int nCount = 10;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1286 if (params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1287 nCount = params[1].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1288 int nFrom = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1289 if (params.size() > 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1290 nFrom = params[2].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1291
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1292 if (nCount < 0)
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1293 throw JSONRPCError(-8, "Negative count");
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1294 if (nFrom < 0)
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1295 throw JSONRPCError(-8, "Negative from");
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1296
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1297 Array ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1298 CWalletDB walletdb(pwalletMain->strWalletFile);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1299
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1300 // 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
1301 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
1302 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
1303 TxItems txByTime;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1304
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1305 // 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
1306 // 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
1307 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
1308 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1309 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
1310 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
1311 }
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1312 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
1313 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
1314 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
1315 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1316 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
1317 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1318
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1319 // 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
1320 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
1321 {
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1322 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
1323 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
1324 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
1325 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
1326 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
1327 AcentryToJSON(*pacentry, strAccount, ret);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1328
2443
e1b3cf031d0c Kill warning from unavoidable signed/unsigned comparison in bitcoinrpc.cpp.
Gregory Maxwell <greg@xiph.org>
parents: 2414
diff changeset
1329 if ((int)ret.size() >= (nCount+nFrom)) break;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1330 }
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1331 // ret is newest to oldest
2746
246ba5ba6805 introduce a new StartShutdown() function, which starts a thread with Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits)
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2723
diff changeset
1332
2311
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
1333 if (nFrom > (int)ret.size())
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
1334 nFrom = ret.size();
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
1335 if ((nFrom + nCount) > (int)ret.size())
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
1336 nCount = ret.size() - nFrom;
2168
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1337 Array::iterator first = ret.begin();
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1338 std::advance(first, nFrom);
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1339 Array::iterator last = ret.begin();
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1340 std::advance(last, nFrom+nCount);
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1341
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1342 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
1343 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
1344
babecba95257 Bug fix listtransactions from/count handling.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2154
diff changeset
1345 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
1346
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1347 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1348 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1349
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1350 Value listaccounts(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1351 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1352 if (fHelp || params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1353 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1354 "listaccounts [minconf=1]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1355 "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
1356
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1357 int nMinDepth = 1;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1358 if (params.size() > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1359 nMinDepth = params[0].get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1360
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
1361 map<string, int64> mapAccountBalances;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1362 BOOST_FOREACH(const PAIRTYPE(CTxDestination, string)& entry, pwalletMain->mapAddressBook) {
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1363 if (IsMine(*pwalletMain, entry.first)) // This address belongs to me
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1364 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
1365 }
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1366
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1367 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
1368 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1369 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
1370 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
1371 string strSentAccount;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1372 list<pair<CTxDestination, int64> > listReceived;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1373 list<pair<CTxDestination, 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
1374 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
1375 mapAccountBalances[strSentAccount] -= nFee;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1376 BOOST_FOREACH(const PAIRTYPE(CTxDestination, 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
1377 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
1378 if (wtx.GetDepthInMainChain() >= nMinDepth)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1379 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1380 mapAccountBalances[""] += nGeneratedMature;
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1381 BOOST_FOREACH(const PAIRTYPE(CTxDestination, 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
1382 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
1383 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
1384 else
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1385 mapAccountBalances[""] += r.second;
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 }
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 list<CAccountingEntry> acentries;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1390 CWalletDB(pwalletMain->strWalletFile).ListAccountCreditDebit("*", acentries);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1391 BOOST_FOREACH(const CAccountingEntry& entry, acentries)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1392 mapAccountBalances[entry.strAccount] += entry.nCreditDebit;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1393
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1394 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
1395 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
1396 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
1397 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1398 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1399 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1400
1382
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1401 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
1402 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1403 if (fHelp)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1404 throw runtime_error(
2319
b155de017684 listsinceblock: rpc param blockid -> blockhash
freewil <sean@eternalrise.com>
parents: 2311
diff changeset
1405 "listsinceblock [blockhash] [target-confirmations]\n"
b155de017684 listsinceblock: rpc param blockid -> blockhash
freewil <sean@eternalrise.com>
parents: 2311
diff changeset
1406 "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
1407
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1408 CBlockIndex *pindex = NULL;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1409 int target_confirms = 1;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1410
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1411 if (params.size() > 0)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1412 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1413 uint256 blockId = 0;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1414
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1415 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
1416 pindex = CBlockLocator(blockId).GetBlockIndex();
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1417 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1418
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1419 if (params.size() > 1)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1420 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1421 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
1422
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1423 if (target_confirms < 1)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1424 throw JSONRPCError(-8, "Invalid parameter");
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1425 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1426
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1427 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
1428
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1429 Array transactions;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1430
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1431 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
1432 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1433 CWalletTx tx = (*it).second;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1434
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1435 if (depth == -1 || tx.GetDepthInMainChain() < depth)
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1436 ListTransactions(tx, "*", 0, true, transactions);
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1437 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1438
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1439 uint256 lastblock;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1440
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1441 if (target_confirms == 1)
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 lastblock = hashBestChain;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1444 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1445 else
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1446 {
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1447 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
1448
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1449 CBlockIndex *block;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1450 for (block = pindexBest;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1451 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
1452 block = block->pprev) { }
1382
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1453
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1454 lastblock = block ? block->GetBlockHash() : 0;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1455 }
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1456
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1457 Object ret;
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1458 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
1459 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
1460
f9e09403e449 Merge branch 'listsinceblock' of https://github.com/cdhowie/bitcoin
Gavin Andresen <gavinandresen@gmail.com>
parents: 1378
diff changeset
1461 return ret;
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
2413
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
1464 Value gettransaction(const Array& params, bool fHelp)
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
1465 {
3151
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1466 if (fHelp || params.size() != 1)
2413
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
1467 throw runtime_error(
3151
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1468 "gettransaction <txid>\n"
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1469 "Get detailed information about in-wallet transaction <txid>");
2413
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
1470
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
1471 uint256 hash;
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
1472 hash.SetHex(params[0].get_str());
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
1473
55deced142f4 Second parameter to JSON-RPC getblock/gettransaction: decompositions
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2412
diff changeset
1474 Object entry;
3151
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1475 if (!pwalletMain->mapWallet.count(hash))
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1476 throw JSONRPCError(-5, "Invalid or non-wallet transaction id");
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1477 const CWalletTx& wtx = pwalletMain->mapWallet[hash];
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1478
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1479 int64 nCredit = wtx.GetCredit();
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1480 int64 nDebit = wtx.GetDebit();
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1481 int64 nNet = nCredit - nDebit;
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1482 int64 nFee = (wtx.IsFromMe() ? wtx.GetValueOut() - nDebit : 0);
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1483
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1484 entry.push_back(Pair("amount", ValueFromAmount(nNet - nFee)));
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1485 if (wtx.IsFromMe())
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1486 entry.push_back(Pair("fee", ValueFromAmount(nFee)));
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1487
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1488 WalletTxToJSON(wtx, entry);
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1489
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1490 Array details;
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1491 ListTransactions(wtx, "*", 0, false, details);
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1492 entry.push_back(Pair("details", details));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1493
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1494 return entry;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1495 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1496
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1497
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1498 Value backupwallet(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1499 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1500 if (fHelp || params.size() != 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1501 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1502 "backupwallet <destination>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1503 "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
1504
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1505 string strDest = params[0].get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1506 BackupWallet(*pwalletMain, strDest);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1507
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1508 return Value::null;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1509 }
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
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1512 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
1513 {
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
1514 if (fHelp || params.size() > 0)
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1515 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1516 "keypoolrefill\n"
2619
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
1517 "Fills the keypool."
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
1518 + HelpRequiringPassphrase());
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
1519
0f61092b4367 Shared code for wallet lock help and check
Luke Dashjr <luke-jr+git@utopios.org>
parents: 2608
diff changeset
1520 EnsureWalletIsUnlocked();
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1521
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1522 pwalletMain->TopUpKeyPool();
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1523
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1524 if (pwalletMain->GetKeyPoolSize() < GetArg("-keypool", 100))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1525 throw JSONRPCError(-4, "Error refreshing keypool.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1526
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1527 return Value::null;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1528 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1529
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1530
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1531 void ThreadTopUpKeyPool(void* parg)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1532 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1533 pwalletMain->TopUpKeyPool();
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1534 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1535
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1536 void ThreadCleanWalletPassphrase(void* parg)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1537 {
1942
aa7f644075af Resolves issue #922 - "wallet passphrase timeout of several years doesn't work"
Gregory Maxwell <greg@xiph.org>
parents: 1920
diff changeset
1538 int64 nMyWakeTime = GetTimeMillis() + *((int64*)parg) * 1000;
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1539
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1540 ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime);
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1541
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1542 if (nWalletUnlockTime == 0)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1543 {
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1544 nWalletUnlockTime = nMyWakeTime;
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1545
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1546 do
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1547 {
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1548 if (nWalletUnlockTime==0)
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1549 break;
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1550 int64 nToSleep = nWalletUnlockTime - GetTimeMillis();
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1551 if (nToSleep <= 0)
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1552 break;
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1553
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1554 LEAVE_CRITICAL_SECTION(cs_nWalletUnlockTime);
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1555 Sleep(nToSleep);
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1556 ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime);
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1557
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1558 } while(1);
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1559
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1560 if (nWalletUnlockTime)
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1561 {
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1562 nWalletUnlockTime = 0;
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1563 pwalletMain->Lock();
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1564 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1565 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1566 else
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1567 {
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1568 if (nWalletUnlockTime < nMyWakeTime)
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1569 nWalletUnlockTime = nMyWakeTime;
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1570 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1571
1833
b1be8c6fa967 Fix wallet locking locking
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1828
diff changeset
1572 LEAVE_CRITICAL_SECTION(cs_nWalletUnlockTime);
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1573
1942
aa7f644075af Resolves issue #922 - "wallet passphrase timeout of several years doesn't work"
Gregory Maxwell <greg@xiph.org>
parents: 1920
diff changeset
1574 delete (int64*)parg;
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1575 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1576
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1577 Value walletpassphrase(const Array& params, bool fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1578 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1579 if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1580 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1581 "walletpassphrase <passphrase> <timeout>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1582 "Stores the wallet decryption key in memory for <timeout> seconds.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1583 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1584 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1585 if (!pwalletMain->IsCrypted())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1586 throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletpassphrase was called.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1587
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1588 if (!pwalletMain->IsLocked())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1589 throw JSONRPCError(-17, "Error: Wallet is already unlocked.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1590
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1591 // Note that the walletpassphrase is stored in params[0] which is not mlock()ed
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1592 SecureString strWalletPass;
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1593 strWalletPass.reserve(100);
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1594 // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string)
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1595 // Alternately, find a way to make params[0] mlock()'d to begin with.
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1596 strWalletPass = params[0].get_str().c_str();
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1597
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1598 if (strWalletPass.length() > 0)
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1599 {
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1600 if (!pwalletMain->Unlock(strWalletPass))
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1601 throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect.");
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1602 }
1274
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1603 else
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1604 throw runtime_error(
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1605 "walletpassphrase <passphrase> <timeout>\n"
d8a2cdd23fdb Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1264
diff changeset
1606 "Stores the wallet decryption key in memory for <timeout> seconds.");
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1607
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1608 CreateThread(ThreadTopUpKeyPool, NULL);
1942
aa7f644075af Resolves issue #922 - "wallet passphrase timeout of several years doesn't work"
Gregory Maxwell <greg@xiph.org>
parents: 1920
diff changeset
1609 int64* pnSleepTime = new int64(params[1].get_int64());
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1610 CreateThread(ThreadCleanWalletPassphrase, pnSleepTime);
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1611
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1612 return Value::null;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1613 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1614
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1615
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1616 Value walletpassphrasechange(const Array& params, bool fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1617 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1618 if (pwalletMain->IsCrypted() && (fHelp || params.size() != 2))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1619 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1620 "walletpassphrasechange <oldpassphrase> <newpassphrase>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1621 "Changes the wallet passphrase from <oldpassphrase> to <newpassphrase>.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1622 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1623 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1624 if (!pwalletMain->IsCrypted())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1625 throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletpassphrasechange was called.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1626
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1627 // TODO: get rid of these .c_str() calls by implementing SecureString::operator=(std::string)
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1628 // Alternately, find a way to make params[0] mlock()'d to begin with.
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1629 SecureString strOldWalletPass;
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1630 strOldWalletPass.reserve(100);
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1631 strOldWalletPass = params[0].get_str().c_str();
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1632
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1633 SecureString strNewWalletPass;
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1634 strNewWalletPass.reserve(100);
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1635 strNewWalletPass = params[1].get_str().c_str();
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1636
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1637 if (strOldWalletPass.length() < 1 || strNewWalletPass.length() < 1)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1638 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1639 "walletpassphrasechange <oldpassphrase> <newpassphrase>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1640 "Changes the wallet passphrase from <oldpassphrase> to <newpassphrase>.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1641
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1642 if (!pwalletMain->ChangeWalletPassphrase(strOldWalletPass, strNewWalletPass))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1643 throw JSONRPCError(-14, "Error: The wallet passphrase entered was incorrect.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1644
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1645 return Value::null;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1646 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1647
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1648
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1649 Value walletlock(const Array& params, bool fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1650 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1651 if (pwalletMain->IsCrypted() && (fHelp || params.size() != 0))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1652 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1653 "walletlock\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1654 "Removes the wallet encryption key from memory, locking the wallet.\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1655 "After calling this method, you will need to call walletpassphrase again\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1656 "before being able to call any methods which require the wallet to be unlocked.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1657 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1658 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1659 if (!pwalletMain->IsCrypted())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1660 throw JSONRPCError(-15, "Error: running with an unencrypted wallet, but walletlock was called.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1661
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1662 {
2190
60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2174
diff changeset
1663 LOCK(cs_nWalletUnlockTime);
1834
1961ebec6e7d Extra wallet locking fixes
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1833
diff changeset
1664 pwalletMain->Lock();
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1665 nWalletUnlockTime = 0;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1666 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1667
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1668 return Value::null;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1669 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1670
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1671
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1672 Value encryptwallet(const Array& params, bool fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1673 {
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1674 if (!pwalletMain->IsCrypted() && (fHelp || params.size() != 1))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1675 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1676 "encryptwallet <passphrase>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1677 "Encrypts the wallet with <passphrase>.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1678 if (fHelp)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1679 return true;
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1680 if (pwalletMain->IsCrypted())
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1681 throw JSONRPCError(-15, "Error: running with an encrypted wallet, but encryptwallet was called.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1682
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1683 // TODO: get rid of this .c_str() by implementing SecureString::operator=(std::string)
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1684 // Alternately, find a way to make params[0] mlock()'d to begin with.
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1685 SecureString strWalletPass;
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1686 strWalletPass.reserve(100);
1533
d0ccfedf2957 Implement an mlock()'d string class for storing passphrases
Dylan Noblesmith <nobled@dreamwidth.org>
parents: 1521
diff changeset
1687 strWalletPass = params[0].get_str().c_str();
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1688
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1689 if (strWalletPass.length() < 1)
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1690 throw runtime_error(
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1691 "encryptwallet <passphrase>\n"
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1692 "Encrypts the wallet with <passphrase>.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1693
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1694 if (!pwalletMain->EncryptWallet(strWalletPass))
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1695 throw JSONRPCError(-16, "Error: Failed to encrypt the wallet.");
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1696
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1493
diff changeset
1697 // BDB seems to have a bad habit of writing old data into
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1493
diff changeset
1698 // slack space in .dat files; that is bad if the old data is
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1493
diff changeset
1699 // unencrypted private keys. So:
2746
246ba5ba6805 introduce a new StartShutdown() function, which starts a thread with Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits)
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2723
diff changeset
1700 StartShutdown();
2618
56d80f7ce10c change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2608
diff changeset
1701 return "wallet encrypted; Bitcoin server stopping, restart to run with encrypted wallet";
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1702 }
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1703
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1704 class DescribeAddressVisitor : public boost::static_visitor<Object>
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1705 {
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1706 public:
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1707 Object operator()(const CNoDestination &dest) const { return Object(); }
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1708
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1709 Object operator()(const CKeyID &keyID) const {
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1710 Object obj;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1711 CPubKey vchPubKey;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1712 pwalletMain->GetPubKey(keyID, vchPubKey);
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1713 obj.push_back(Pair("isscript", false));
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1714 obj.push_back(Pair("pubkey", HexStr(vchPubKey.Raw())));
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1715 obj.push_back(Pair("iscompressed", vchPubKey.IsCompressed()));
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1716 return obj;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1717 }
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1718
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1719 Object operator()(const CScriptID &scriptID) const {
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1720 Object obj;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1721 obj.push_back(Pair("isscript", true));
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1722 CScript subscript;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1723 pwalletMain->GetCScript(scriptID, subscript);
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1724 std::vector<CTxDestination> addresses;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1725 txnouttype whichType;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1726 int nRequired;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1727 ExtractDestinations(subscript, whichType, addresses, nRequired);
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1728 obj.push_back(Pair("script", GetTxnOutputType(whichType)));
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1729 Array a;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1730 BOOST_FOREACH(const CTxDestination& addr, addresses)
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1731 a.push_back(CBitcoinAddress(addr).ToString());
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1732 obj.push_back(Pair("addresses", a));
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1733 if (whichType == TX_MULTISIG)
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1734 obj.push_back(Pair("sigsrequired", nRequired));
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1735 return obj;
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1736 }
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1737 };
1186
69323e942d0e Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1184
diff changeset
1738
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1739 Value validateaddress(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1740 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1741 if (fHelp || params.size() != 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1742 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1743 "validateaddress <bitcoinaddress>\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1744 "Return information about <bitcoinaddress>.");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1745
1256
3a687b55c04b Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1220
diff changeset
1746 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
1747 bool isValid = address.IsValid();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1748
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1749 Object ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1750 ret.push_back(Pair("isvalid", isValid));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1751 if (isValid)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1752 {
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1753 CTxDestination dest = address.Get();
1220
e69e63528ec2 Merge remote branch 'upstream/master'
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1186
diff changeset
1754 string currentAddress = address.ToString();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1755 ret.push_back(Pair("address", currentAddress));
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1756 bool fMine = IsMine(*pwalletMain, dest);
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1757 ret.push_back(Pair("ismine", fMine));
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1758 if (fMine) {
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1759 Object detail = boost::apply_visitor(DescribeAddressVisitor(), dest);
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1760 ret.insert(ret.end(), detail.begin(), detail.end());
1598
057a59e89d51 Support 3 new multisignature IsStandard transactions
Gavin Andresen <gavinandresen@gmail.com>
parents: 1588
diff changeset
1761 }
2688
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1762 if (pwalletMain->mapAddressBook.count(dest))
2c65e5d626eb Refactor: split CKeyID/CScriptID/CTxDestination from CBitcoinAddress
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2687
diff changeset
1763 ret.push_back(Pair("account", pwalletMain->mapAddressBook[dest]));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1764 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1765 return ret;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1766 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1767
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1768 Value getwork(const Array& params, bool fHelp)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1769 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1770 if (fHelp || params.size() > 1)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1771 throw runtime_error(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1772 "getwork [data]\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1773 "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
1774 " \"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
1775 " \"data\" : block data\n"
1337
447bba2f0a56 deprecate midstate and hash1 in getwork
Nils Schneider <nils.schneider@gmail.com>
parents: 1320
diff changeset
1776 " \"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
1777 " \"target\" : little endian hash target\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1778 "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
1779
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1780 if (vNodes.empty())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1781 throw JSONRPCError(-9, "Bitcoin is not connected!");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1782
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1783 if (IsInitialBlockDownload())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1784 throw JSONRPCError(-10, "Bitcoin is downloading blocks...");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1785
1292
024a12d5558d Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1274
diff changeset
1786 typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
1787 static mapNewBlock_t mapNewBlock; // FIXME: thread safety
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1788 static vector<CBlock*> vNewBlock;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1789 static CReserveKey reservekey(pwalletMain);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1790
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1791 if (params.size() == 0)
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 // Update block
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1794 static unsigned int nTransactionsUpdatedLast;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1795 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
1796 static int64 nStart;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1797 static CBlock* pblock;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1798 if (pindexPrev != pindexBest ||
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1799 (nTransactionsUpdated != nTransactionsUpdatedLast && GetTime() - nStart > 60))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1800 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1801 if (pindexPrev != pindexBest)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1802 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1803 // Deallocate old blocks since they're obsolete now
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1804 mapNewBlock.clear();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1805 BOOST_FOREACH(CBlock* pblock, vNewBlock)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1806 delete pblock;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1807 vNewBlock.clear();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1808 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1809 nTransactionsUpdatedLast = nTransactionsUpdated;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1810 pindexPrev = pindexBest;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1811 nStart = GetTime();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1812
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1813 // Create new block
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1814 pblock = CreateNewBlock(reservekey);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1815 if (!pblock)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1816 throw JSONRPCError(-7, "Out of memory");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1817 vNewBlock.push_back(pblock);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1818 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1819
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1820 // Update nTime
1854
cdea646ab88a Fix issue #848 : broken mining on testnet
Gavin Andresen <gavinandresen@gmail.com>
parents: 1834
diff changeset
1821 pblock->UpdateTime(pindexPrev);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1822 pblock->nNonce = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1823
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1824 // Update nExtraNonce
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1825 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
1826 IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1827
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1828 // Save
1292
024a12d5558d Merge branch 'master' of https://github.com/bitcoin/bitcoin
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 1274
diff changeset
1829 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
1830
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1831 // Prebuild hash buffers
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1832 char pmidstate[32];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1833 char pdata[128];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1834 char phash1[64];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1835 FormatHashBuffers(pblock, pmidstate, pdata, phash1);
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 uint256 hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
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 Object result;
1337
447bba2f0a56 deprecate midstate and hash1 in getwork
Nils Schneider <nils.schneider@gmail.com>
parents: 1320
diff changeset
1840 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
1841 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
1842 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
1843 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
1844 return result;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1845 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1846 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1847 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1848 // Parse parameters
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1849 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
1850 if (vchData.size() != 128)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1851 throw JSONRPCError(-8, "Invalid parameter");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1852 CBlock* pdata = (CBlock*)&vchData[0];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1853
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1854 // Byte reverse
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1855 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
1856 ((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
1857
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1858 // Get saved block
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1859 if (!mapNewBlock.count(pdata->hashMerkleRoot))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1860 return false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1861 CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1862
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1863 pblock->nTime = pdata->nTime;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1864 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
1865 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
1866 pblock->hashMerkleRoot = pblock->BuildMerkleTree();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1867
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
1868 return CheckWork(pblock, *pwalletMain, reservekey);
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 }
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
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
1873 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
1874 {
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1875 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
1876 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
1877 "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
1878 "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
1879 " \"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
1880 " \"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
1881 " \"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
1882 " \"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
1883 " \"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
1884 " \"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
1885 " \"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
1886 " \"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
1887 " \"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
1888 "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
1889
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1890 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
1891 {
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1892 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
1893 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
1894
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1895 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
1896 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
1897
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1898 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
1899
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1900 // 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
1901 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
1902 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
1903 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
1904 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
1905 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
1906 (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
1907 {
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1908 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
1909 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
1910 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
1911
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
1912 // 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
1913 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
1914 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
1915 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
1916 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
1917 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
1918 }
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1919
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1920 // Update nTime
1854
cdea646ab88a Fix issue #848 : broken mining on testnet
Gavin Andresen <gavinandresen@gmail.com>
parents: 1834
diff changeset
1921 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
1922 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
1923
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1924 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
1925 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
1926 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
1927 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
1928
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
1929 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
1930 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
1931
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1932 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
1933 }
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
1934
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
1935 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
1936 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
1937 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
1938 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
1939 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
1940 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
1941 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
1942 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
1943 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
1944 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
1945
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
1946 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
1947 }
5bcc1d373dc1 Added RPC call 'getmemorypool' that provides everything needed to construct a block with a custom generation transaction and submit a solution
Forrest Voight <forrest@forre.st>
parents: 1358
diff changeset
1948 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
1949 {
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 // Parse parameters
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
1951 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
1952 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
1953 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
1954
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
1955 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
1956 }
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 }
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
3064
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1959 Value getrawmempool(const Array& params, bool fHelp)
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1960 {
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1961 if (fHelp || params.size() != 0)
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1962 throw runtime_error(
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1963 "getrawmempool\n"
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1964 "Returns all transaction ids in memory pool.");
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1965
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1966 vector<uint256> vtxid;
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1967 mempool.queryHashes(vtxid);
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1968
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1969 Array a;
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1970 BOOST_FOREACH(const uint256& hash, vtxid)
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1971 a.push_back(hash.ToString());
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1972
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1973 return a;
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1974 }
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
1975
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1976 Value getblockhash(const Array& params, bool fHelp)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1977 {
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1978 if (fHelp || params.size() != 1)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1979 throw runtime_error(
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1980 "getblockhash <index>\n"
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1981 "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
1982
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1983 int nHeight = params[0].get_int();
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1984 if (nHeight < 0 || nHeight > nBestHeight)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1985 throw runtime_error("Block number out of range.");
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1986
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1987 CBlock block;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1988 CBlockIndex* pblockindex = mapBlockIndex[hashBestChain];
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1989 while (pblockindex->nHeight > nHeight)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1990 pblockindex = pblockindex->pprev;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1991 return pblockindex->phashBlock->GetHex();
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1992 }
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1993
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1994 Value getblock(const Array& params, bool fHelp)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1995 {
3151
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1996 if (fHelp || params.size() != 1)
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1997 throw runtime_error(
3151
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
1998 "getblock <hash>\n"
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
1999 "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
2000
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2001 std::string strHash = params[0].get_str();
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2002 uint256 hash(strHash);
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2003
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2004 if (mapBlockIndex.count(hash) == 0)
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2005 throw JSONRPCError(-5, "Block not found");
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2006
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2007 CBlock block;
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2008 CBlockIndex* pblockindex = mapBlockIndex[hash];
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2009 block.ReadFromDisk(pblockindex, true);
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2010
3151
0bd236db489f Rework gettransaction / getblock RPC calls
Gavin Andresen <gavinandresen@gmail.com>
parents: 3142
diff changeset
2011 return blockToJSON(block, pblockindex);
1627
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2012 }
1a843331dea9 New RPC commands: getblockhash and getblock
Gavin Andresen <gavinandresen@gmail.com>
parents: 1618
diff changeset
2013
2676
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2014 Value sendrawtx(const Array& params, bool fHelp)
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2015 {
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2016 if (fHelp || params.size() < 1 || params.size() > 1)
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2017 throw runtime_error(
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2018 "sendrawtx <hex string>\n"
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2019 "Submits raw transaction (serialized, hex-encoded) to local node and network.");
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2020
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2021 // parse hex string from parameter
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2022 vector<unsigned char> txData(ParseHex(params[0].get_str()));
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2023 CDataStream ssData(txData, SER_NETWORK, PROTOCOL_VERSION);
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2024 CTransaction tx;
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2025
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2026 // deserialize binary data stream
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2027 try {
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2028 ssData >> tx;
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2029 }
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2030 catch (std::exception &e) {
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2031 throw JSONRPCError(-22, "TX decode failed");
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2032 }
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2033
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2034 // push to local node
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2035 CTxDB txdb("r");
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2036 if (!tx.AcceptToMemoryPool(txdb))
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2037 throw JSONRPCError(-22, "TX rejected");
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2038
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2039 SyncWithWallets(tx, NULL, true);
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2040
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2041 // relay to network
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2042 CInv inv(MSG_TX, tx.GetHash());
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2043 RelayInventory(inv);
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2044
2707
fbd40fb39873 Make sendrawtx return txid to be consistent with other send methods.
Gavin Andresen <gavinandresen@gmail.com>
parents: 2688
diff changeset
2045 return tx.GetHash().GetHex();
2676
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2046 }
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2047
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
2048
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2049
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2050
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2051
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2052
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2053
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2054
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2055
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2056
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2057
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2058 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2059 // Call Table
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2060 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2061
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2062
2294
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
2063 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
2064 { // name function safe mode?
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2065 // ------------------------ ----------------------- ----------
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2066 { "help", &help, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2067 { "stop", &stop, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2068 { "getblockcount", &getblockcount, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2069 { "getconnectioncount", &getconnectioncount, true },
3122
7e82edef942e RPC: add 'getpeerinfo', returning easy-to-retrieve per-CNode data
Jeff Garzik <jgarzik@exmulti.com>
parents: 3121
diff changeset
2070 { "getpeerinfo", &getpeerinfo, true },
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2071 { "getdifficulty", &getdifficulty, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2072 { "getgenerate", &getgenerate, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2073 { "setgenerate", &setgenerate, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2074 { "gethashespersec", &gethashespersec, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2075 { "getinfo", &getinfo, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2076 { "getmininginfo", &getmininginfo, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2077 { "getnewaddress", &getnewaddress, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2078 { "getaccountaddress", &getaccountaddress, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2079 { "setaccount", &setaccount, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2080 { "getaccount", &getaccount, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2081 { "getaddressesbyaccount", &getaddressesbyaccount, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2082 { "sendtoaddress", &sendtoaddress, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2083 { "getreceivedbyaddress", &getreceivedbyaddress, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2084 { "getreceivedbyaccount", &getreceivedbyaccount, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2085 { "listreceivedbyaddress", &listreceivedbyaddress, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2086 { "listreceivedbyaccount", &listreceivedbyaccount, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2087 { "backupwallet", &backupwallet, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2088 { "keypoolrefill", &keypoolrefill, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2089 { "walletpassphrase", &walletpassphrase, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2090 { "walletpassphrasechange", &walletpassphrasechange, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2091 { "walletlock", &walletlock, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2092 { "encryptwallet", &encryptwallet, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2093 { "validateaddress", &validateaddress, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2094 { "getbalance", &getbalance, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2095 { "move", &movecmd, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2096 { "sendfrom", &sendfrom, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2097 { "sendmany", &sendmany, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2098 { "addmultisigaddress", &addmultisigaddress, false },
3064
8691af55c386 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Jeff Garzik <jgarzik@exmulti.com>
parents: 2746
diff changeset
2099 { "getrawmempool", &getrawmempool, true },
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2100 { "getblock", &getblock, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2101 { "getblockhash", &getblockhash, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2102 { "gettransaction", &gettransaction, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2103 { "listtransactions", &listtransactions, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2104 { "signmessage", &signmessage, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2105 { "verifymessage", &verifymessage, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2106 { "getwork", &getwork, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2107 { "listaccounts", &listaccounts, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2108 { "settxfee", &settxfee, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2109 { "getmemorypool", &getmemorypool, true },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2110 { "listsinceblock", &listsinceblock, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2111 { "dumpprivkey", &dumpprivkey, false },
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2112 { "importprivkey", &importprivkey, false },
2676
264ca7bc2a8b JSON-RPC: Add 'sendrawtx' op, for sending pre-built TX's to network
Jeff Garzik <jgarzik@exmulti.com>
parents: 2646
diff changeset
2113 { "sendrawtx", &sendrawtx, false },
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2114 };
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2115
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2116 CRPCTable::CRPCTable()
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2117 {
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2118 unsigned int vcidx;
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2119 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
2120 {
2294
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
2121 const CRPCCommand *pcmd;
2292
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2122
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2123 pcmd = &vRPCCommands[vcidx];
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2124 mapCommands[pcmd->name] = pcmd;
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2125 }
2787ea03c90c Encapsulate RPC command dispatch in an array of CRPCCommand's
Jeff Garzik <jeff@garzik.org>
parents: 2280
diff changeset
2126 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2127
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2128 const CRPCCommand *CRPCTable::operator[](string name) const
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2129 {
2293
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2130 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
2131 if (it == mapCommands.end())
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2132 return NULL;
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2133 return (*it).second;
6edb3e47a45b Encapsulate mapCommands in class CRPCTable
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2292
diff changeset
2134 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2135
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2136 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2137 // HTTP protocol
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2138 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2139 // 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
2140 // 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
2141 //
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2142
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2143 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
2144 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2145 ostringstream s;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2146 s << "POST / HTTP/1.1\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2147 << "User-Agent: bitcoin-json-rpc/" << FormatFullVersion() << "\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2148 << "Host: 127.0.0.1\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2149 << "Content-Type: application/json\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2150 << "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
2151 << "Connection: close\r\n"
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2152 << "Accept: application/json\r\n";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2153 BOOST_FOREACH(const PAIRTYPE(string, string)& item, mapRequestHeaders)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2154 s << item.first << ": " << item.second << "\r\n";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2155 s << "\r\n" << strMsg;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2156
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2157 return s.str();
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2160 string rfc1123Time()
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2161 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2162 char buffer[64];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2163 time_t now;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2164 time(&now);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2165 struct tm* now_gmt = gmtime(&now);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2166 string locale(setlocale(LC_TIME, NULL));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2167 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
2168 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
2169 setlocale(LC_TIME, locale.c_str());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2170 return string(buffer);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2171 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2172
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2173 static string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
1181
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 if (nStatus == 401)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2176 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
2177 "Date: %s\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2178 "Server: bitcoin-json-rpc/%s\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2179 "WWW-Authenticate: Basic realm=\"jsonrpc\"\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2180 "Content-Type: text/html\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2181 "Content-Length: 296\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2182 "\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2183 "<!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
2184 "\"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
2185 "<HTML>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2186 "<HEAD>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2187 "<TITLE>Error</TITLE>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2188 "<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
2189 "</HEAD>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2190 "<BODY><H1>401 Unauthorized.</H1></BODY>\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2191 "</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
2192 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
2193 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
2194 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
2195 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
2196 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
2197 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
2198 else cStatus = "";
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2199 return strprintf(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2200 "HTTP/1.1 %d %s\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2201 "Date: %s\r\n"
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2202 "Connection: %s\r\n"
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2203 "Content-Length: %d\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2204 "Content-Type: application/json\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2205 "Server: bitcoin-json-rpc/%s\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2206 "\r\n"
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2207 "%s",
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2208 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
2209 cStatus,
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2210 rfc1123Time().c_str(),
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2211 keepalive ? "keep-alive" : "close",
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2212 strMsg.size(),
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2213 FormatFullVersion().c_str(),
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2214 strMsg.c_str());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2215 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2216
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2217 int ReadHTTPStatus(std::basic_istream<char>& stream, int &proto)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2218 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2219 string str;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2220 getline(stream, str);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2221 vector<string> vWords;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2222 boost::split(vWords, str, boost::is_any_of(" "));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2223 if (vWords.size() < 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2224 return 500;
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2225 proto = 0;
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2226 const char *ver = strstr(str.c_str(), "HTTP/1.");
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2227 if (ver != NULL)
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2228 proto = atoi(ver+7);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2229 return atoi(vWords[1].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 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
2233 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2234 int nLen = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2235 loop
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2236 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2237 string str;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2238 std::getline(stream, str);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2239 if (str.empty() || str == "\r")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2240 break;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2241 string::size_type nColon = str.find(":");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2242 if (nColon != string::npos)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2243 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2244 string strHeader = str.substr(0, nColon);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2245 boost::trim(strHeader);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2246 boost::to_lower(strHeader);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2247 string strValue = str.substr(nColon+1);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2248 boost::trim(strValue);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2249 mapHeadersRet[strHeader] = strValue;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2250 if (strHeader == "content-length")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2251 nLen = atoi(strValue.c_str());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2252 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2253 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2254 return nLen;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2255 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2256
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2257 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
2258 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2259 mapHeadersRet.clear();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2260 strMessageRet = "";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2261
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2262 // Read status
2527
396e7905991f Fix warning about uninitialized value
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2508
diff changeset
2263 int nProto = 0;
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2264 int nStatus = ReadHTTPStatus(stream, nProto);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2265
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2266 // Read header
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2267 int nLen = ReadHTTPHeader(stream, mapHeadersRet);
2311
20e40ae0d404 Add casts for unavoidable signed/unsigned comparisons
Jeff Garzik <jgarzik@exmulti.com>
parents: 2294
diff changeset
2268 if (nLen < 0 || nLen > (int)MAX_SIZE)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2269 return 500;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2270
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2271 // Read message
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2272 if (nLen > 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2273 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2274 vector<char> vch(nLen);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2275 stream.read(&vch[0], nLen);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2276 strMessageRet = string(vch.begin(), vch.end());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2277 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2278
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2279 string sConHdr = mapHeadersRet["connection"];
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2280
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2281 if ((sConHdr != "close") && (sConHdr != "keep-alive"))
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2282 {
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2283 if (nProto >= 1)
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2284 mapHeadersRet["connection"] = "keep-alive";
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2285 else
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2286 mapHeadersRet["connection"] = "close";
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2287 }
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2288
1181
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
3141
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2321 Object JSONRPCReplyObj(const Value& result, const Value& error, const Value& id)
1181
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));
3141
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2330 return reply;
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2331 }
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2332
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2333 string JSONRPCReply(const Value& result, const Value& error, const Value& id)
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2334 {
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2335 Object reply = JSONRPCReplyObj(result, error, id);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2336 return write_string(Value(reply), false) + "\n";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2337 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2338
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2339 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
2340 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2341 // Send error reply from json-rpc error object
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2342 int nStatus = 500;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2343 int code = find_value(objError, "code").get_int();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2344 if (code == -32600) nStatus = 400;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2345 else if (code == -32601) nStatus = 404;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2346 string strReply = JSONRPCReply(Value::null, objError, id);
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2347 stream << HTTPReply(nStatus, strReply, false) << std::flush;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2348 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2349
3081
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2350 bool ClientAllowed(const boost::asio::ip::address& address)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2351 {
3081
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2352 // Make sure that IPv4-compatible and IPv4-mapped IPv6 addresses are treated as IPv4 addresses
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2353 if (address.is_v6()
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2354 && (address.to_v6().is_v4_compatible()
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2355 || address.to_v6().is_v4_mapped()))
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2356 return ClientAllowed(address.to_v6().to_v4());
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2357
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2358 if (address == asio::ip::address_v4::loopback()
3083
a7419c10da64 Allow all addresses on the loopback subnet (127.0.0.0/8) not just 127.0.0.1
Giel van Schijndel <me@mortis.eu>
parents: 3082
diff changeset
2359 || address == asio::ip::address_v6::loopback()
a7419c10da64 Allow all addresses on the loopback subnet (127.0.0.0/8) not just 127.0.0.1
Giel van Schijndel <me@mortis.eu>
parents: 3082
diff changeset
2360 || (address.is_v4()
a7419c10da64 Allow all addresses on the loopback subnet (127.0.0.0/8) not just 127.0.0.1
Giel van Schijndel <me@mortis.eu>
parents: 3082
diff changeset
2361 // Chech whether IPv4 addresses match 127.0.0.0/8 (loopback subnet)
a7419c10da64 Allow all addresses on the loopback subnet (127.0.0.0/8) not just 127.0.0.1
Giel van Schijndel <me@mortis.eu>
parents: 3082
diff changeset
2362 && (address.to_v4().to_ulong() & 0xff000000) == 0x7f000000))
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2363 return true;
3081
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2364
f96d6404041f Allow clients on the IPv6 loopback as well
Giel van Schijndel <me@mortis.eu>
parents: 3080
diff changeset
2365 const string strAddress = address.to_string();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2366 const vector<string>& vAllow = mapMultiArgs["-rpcallowip"];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2367 BOOST_FOREACH(string strAllow, vAllow)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2368 if (WildcardMatch(strAddress, strAllow))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2369 return true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2370 return false;
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
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 // 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
2375 //
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2376 template <typename Protocol>
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2377 class SSLIOStreamDevice : public iostreams::device<iostreams::bidirectional> {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2378 public:
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2379 SSLIOStreamDevice(asio::ssl::stream<typename Protocol::socket> &streamIn, bool fUseSSLIn) : stream(streamIn)
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2380 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2381 fUseSSL = fUseSSLIn;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2382 fNeedHandshake = fUseSSLIn;
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
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2385 void handshake(ssl::stream_base::handshake_type role)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2386 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2387 if (!fNeedHandshake) return;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2388 fNeedHandshake = false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2389 stream.handshake(role);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2390 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2391 std::streamsize read(char* s, std::streamsize n)
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 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
2394 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
2395 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
2396 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2397 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
2398 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2399 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
2400 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
2401 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
2402 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2403 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
2404 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2405 ip::tcp::resolver resolver(stream.get_io_service());
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2406 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
2407 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
2408 ip::tcp::resolver::iterator end;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2409 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
2410 while (error && endpoint_iterator != end)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2411 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2412 stream.lowest_layer().close();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2413 stream.lowest_layer().connect(*endpoint_iterator++, error);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2414 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2415 if (error)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2416 return false;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2417 return true;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2418 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2419
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2420 private:
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2421 bool fNeedHandshake;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2422 bool fUseSSL;
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2423 asio::ssl::stream<typename Protocol::socket>& stream;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2424 };
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2425
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2426 class AcceptedConnection
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2427 {
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2428 public:
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2429 virtual ~AcceptedConnection() {}
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2430
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2431 virtual std::iostream& stream() = 0;
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2432 virtual std::string peer_address_to_string() const = 0;
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2433 virtual void close() = 0;
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2434 };
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2435
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2436 template <typename Protocol>
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2437 class AcceptedConnectionImpl : public AcceptedConnection
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2438 {
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2439 public:
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2440 AcceptedConnectionImpl(
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2441 asio::io_service& io_service,
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2442 ssl::context &context,
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2443 bool fUseSSL) :
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2444 sslStream(io_service, context),
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2445 _d(sslStream, fUseSSL),
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2446 _stream(_d)
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2447 {
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2448 }
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2449
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2450 virtual std::iostream& stream()
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2451 {
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2452 return _stream;
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2453 }
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2454
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2455 virtual std::string peer_address_to_string() const
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2456 {
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2457 return peer.address().to_string();
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2458 }
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2459
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2460 virtual void close()
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2461 {
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2462 _stream.close();
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2463 }
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2464
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2465 typename Protocol::endpoint peer;
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2466 asio::ssl::stream<typename Protocol::socket> sslStream;
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2467
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2468 private:
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2469 SSLIOStreamDevice<Protocol> _d;
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2470 iostreams::stream< SSLIOStreamDevice<Protocol> > _stream;
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2471 };
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2472
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2473 void ThreadRPCServer(void* parg)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2474 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2475 IMPLEMENT_RANDOMIZE_STACK(ThreadRPCServer(parg));
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2476 try
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2477 {
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2478 vnThreadsRunning[THREAD_RPCLISTENER]++;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2479 ThreadRPCServer2(parg);
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2480 vnThreadsRunning[THREAD_RPCLISTENER]--;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2481 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2482 catch (std::exception& e) {
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2483 vnThreadsRunning[THREAD_RPCLISTENER]--;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2484 PrintException(&e, "ThreadRPCServer()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2485 } catch (...) {
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2486 vnThreadsRunning[THREAD_RPCLISTENER]--;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2487 PrintException(NULL, "ThreadRPCServer()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2488 }
2587
b6f65be313c2 Corrected grammar. As per Principle Of Least Surprise.
R E Broadley <rebroad+github@gmail.com>
parents: 2527
diff changeset
2489 printf("ThreadRPCServer exited\n");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2490 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2491
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2492 // Forward declaration required for RPCListen
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2493 template <typename Protocol, typename SocketAcceptorService>
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2494 static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2495 ssl::context& context,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2496 bool fUseSSL,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2497 AcceptedConnection* conn,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2498 const boost::system::error_code& error);
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2499
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2500 /**
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2501 * Sets up I/O resources to accept and handle a new connection.
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2502 */
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2503 template <typename Protocol, typename SocketAcceptorService>
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2504 static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2505 ssl::context& context,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2506 const bool fUseSSL)
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2507 {
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2508 // Accept connection
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2509 AcceptedConnectionImpl<Protocol>* conn = new AcceptedConnectionImpl<Protocol>(acceptor->get_io_service(), context, fUseSSL);
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2510
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2511 acceptor->async_accept(
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2512 conn->sslStream.lowest_layer(),
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2513 conn->peer,
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2514 boost::bind(&RPCAcceptHandler<Protocol, SocketAcceptorService>,
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2515 acceptor,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2516 boost::ref(context),
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2517 fUseSSL,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2518 conn,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2519 boost::asio::placeholders::error));
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2520 }
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2521
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2522 /**
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2523 * Accept and handle incoming connection.
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2524 */
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2525 template <typename Protocol, typename SocketAcceptorService>
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2526 static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2527 ssl::context& context,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2528 const bool fUseSSL,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2529 AcceptedConnection* conn,
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2530 const boost::system::error_code& error)
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2531 {
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2532 vnThreadsRunning[THREAD_RPCLISTENER]++;
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2533
3090
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2534 // Immediately start accepting new connections, except when we're canceled or our socket is closed.
3115
d4525dc0a957 Fix build error.
Matt Corallo <matt@bluematt.me>
parents: 3114
diff changeset
2535 if (error != asio::error::operation_aborted
3090
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2536 && acceptor->is_open())
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2537 RPCListen(acceptor, context, fUseSSL);
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2538
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2539 AcceptedConnectionImpl<ip::tcp>* tcp_conn = dynamic_cast< AcceptedConnectionImpl<ip::tcp>* >(conn);
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2540
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2541 // TODO: Actually handle errors
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2542 if (error)
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2543 {
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2544 delete conn;
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2545 }
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2546
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2547 // Restrict callers by IP. It is important to
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2548 // do this before starting client thread, to filter out
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2549 // certain DoS and misbehaving clients.
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2550 else if (tcp_conn
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2551 && !ClientAllowed(tcp_conn->peer.address()))
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2552 {
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2553 // Only send a 403 if we're not using SSL to prevent a DoS during the SSL handshake.
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2554 if (!fUseSSL)
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2555 conn->stream() << HTTPReply(403, "", false) << std::flush;
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2556 delete conn;
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2557 }
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2558
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2559 // start HTTP client thread
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2560 else if (!CreateThread(ThreadRPCServer3, conn)) {
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2561 printf("Failed to create RPC server client thread\n");
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2562 delete conn;
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2563 }
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2564
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2565 vnThreadsRunning[THREAD_RPCLISTENER]--;
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2566 }
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2567
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2568 void ThreadRPCServer2(void* parg)
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 printf("ThreadRPCServer started\n");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2571
1541
d9bb9c516845 Speed up RPC authentication (reworked pull from Joel Katz)
Gavin Andresen <gavinandresen@gmail.com>
parents: 1533
diff changeset
2572 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
2573 if (mapArgs["-rpcpassword"] == "")
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2574 {
1800
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay.
Gregory Maxwell <greg@xiph.org>
parents: 1792
diff changeset
2575 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
2576 RAND_bytes(rand_pwd, 32);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2577 string strWhatAmI = "To use bitcoind";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2578 if (mapArgs.count("-server"))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2579 strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2580 else if (mapArgs.count("-daemon"))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2581 strWhatAmI = strprintf(_("To use the %s option"), "\"-daemon\"");
2640
60b19c042950 Convert UI interface to boost::signals2.
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2627
diff changeset
2582 uiInterface.ThreadSafeMessageBox(strprintf(
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
2583 _("%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
2584 "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
2585 "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
2586 "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
2587 "(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
2588 "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
2589 strWhatAmI.c_str(),
2207
34d7dc611b26 Use filesystem::path instead of manual string tinkering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2205
diff changeset
2590 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
2591 EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32).c_str()),
2642
8bc3131c2449 Make testcases build, prevent windows symbol collision
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2640
diff changeset
2592 _("Error"), CClientUIInterface::OK | CClientUIInterface::MODAL);
2746
246ba5ba6805 introduce a new StartShutdown() function, which starts a thread with Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits)
Philip Kaufmann <phil.kaufmann@t-online.de>
parents: 2723
diff changeset
2593 StartShutdown();
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2594 return;
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
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2597 const bool fUseSSL = GetBoolArg("-rpcssl");
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2598
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2599 asio::io_service io_service;
3084
1953e32fd638 Use the QueueShutdown signal to stop accepting new RPC connections
Giel van Schijndel <me@mortis.eu>
parents: 3083
diff changeset
2600
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2601 ssl::context context(io_service, ssl::context::sslv23);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2602 if (fUseSSL)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2603 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2604 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
2605
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
2606 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
2607 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
2608 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
2609 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
2610
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
2611 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
2612 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
2613 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
2614 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
2615
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
2616 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
2617 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
2618 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2619
3080
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2620 // Try a dual IPv6/IPv4 socket, falling back to separate IPv4 and IPv6 sockets
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2621 const bool loopback = !mapArgs.count("-rpcallowip");
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2622 asio::ip::address bindAddress = loopback ? asio::ip::address_v6::loopback() : asio::ip::address_v6::any();
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2623 ip::tcp::endpoint endpoint(bindAddress, GetArg("-rpcport", 8332));
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2624
3113
5ed35adc426f Use a rpc-specific queue to tell asio connections to shutdown.
Matt Corallo <matt@bluematt.me>
parents: 3112
diff changeset
2625 boost::signals2::signal<void ()> StopRequests;
5ed35adc426f Use a rpc-specific queue to tell asio connections to shutdown.
Matt Corallo <matt@bluematt.me>
parents: 3112
diff changeset
2626
3080
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2627 try
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2628 {
3090
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2629 boost::shared_ptr<ip::tcp::acceptor> acceptor(new ip::tcp::acceptor(io_service));
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2630 acceptor->open(endpoint.protocol());
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2631 acceptor->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
3080
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2632
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2633 // Try making the socket dual IPv6/IPv4 (if listening on the "any" address)
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2634 boost::system::error_code v6_only_error;
3090
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2635 acceptor->set_option(boost::asio::ip::v6_only(loopback), v6_only_error);
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2636
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2637 acceptor->bind(endpoint);
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2638 acceptor->listen(socket_base::max_connections);
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2639
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2640 RPCListen(acceptor, context, fUseSSL);
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2641 // Cancel outstanding listen-requests for this acceptor when shutting down
3113
5ed35adc426f Use a rpc-specific queue to tell asio connections to shutdown.
Matt Corallo <matt@bluematt.me>
parents: 3112
diff changeset
2642 StopRequests.connect(signals2::slot<void ()>(
3090
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2643 static_cast<void (ip::tcp::acceptor::*)()>(&ip::tcp::acceptor::close), acceptor.get())
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2644 .track(acceptor));
3080
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2645
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2646 // If dual IPv6/IPv4 failed (or we're opening loopback interfaces only), open IPv4 separately
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2647 if (loopback || v6_only_error)
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2648 {
3080
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2649 bindAddress = loopback ? asio::ip::address_v4::loopback() : asio::ip::address_v4::any();
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2650 endpoint.address(bindAddress);
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2651
3090
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2652 acceptor.reset(new ip::tcp::acceptor(io_service));
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2653 acceptor->open(endpoint.protocol());
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2654 acceptor->set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2655 acceptor->bind(endpoint);
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2656 acceptor->listen(socket_base::max_connections);
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2657
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2658 RPCListen(acceptor, context, fUseSSL);
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2659 // Cancel outstanding listen-requests for this acceptor when shutting down
3113
5ed35adc426f Use a rpc-specific queue to tell asio connections to shutdown.
Matt Corallo <matt@bluematt.me>
parents: 3112
diff changeset
2660 StopRequests.connect(signals2::slot<void ()>(
3090
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2661 static_cast<void (ip::tcp::acceptor::*)()>(&ip::tcp::acceptor::close), acceptor.get())
b50fa2ffa4bd Cancel outstanding listen ops for RPC when shutting down
Giel van Schijndel <me@mortis.eu>
parents: 3089
diff changeset
2662 .track(acceptor));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2663 }
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2664 }
3080
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2665 catch(boost::system::system_error &e)
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2666 {
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2667 uiInterface.ThreadSafeMessageBox(strprintf(_("An error occured while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2668 _("Error"), CClientUIInterface::OK | CClientUIInterface::MODAL);
3085
4488ca5b1bf8 Merge branch 'master' into async-ipv6-rpc
Giel van Schijndel <me@mortis.eu>
parents: 3084 2746
diff changeset
2669 StartShutdown();
3080
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2670 return;
0a1544df18af Add dual IPv4/IPv6 stack support to the RPC server
Giel van Schijndel <me@mortis.eu>
parents: 3079
diff changeset
2671 }
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2672
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2673 vnThreadsRunning[THREAD_RPCLISTENER]--;
3112
1d9c0011eb5a Revert "*Always* send a shutdown signal to enable custom shutdown actions"
Matt Corallo <matt@bluematt.me>
parents: 3090
diff changeset
2674 while (!fShutdown)
1d9c0011eb5a Revert "*Always* send a shutdown signal to enable custom shutdown actions"
Matt Corallo <matt@bluematt.me>
parents: 3090
diff changeset
2675 io_service.run_one();
3079
b084a97bfba3 Use asynchronous I/O to handle RPC requests
Giel van Schijndel <me@mortis.eu>
parents: 2676
diff changeset
2676 vnThreadsRunning[THREAD_RPCLISTENER]++;
3113
5ed35adc426f Use a rpc-specific queue to tell asio connections to shutdown.
Matt Corallo <matt@bluematt.me>
parents: 3112
diff changeset
2677 StopRequests();
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2678 }
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2679
3141
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2680 class JSONRequest
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2681 {
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2682 public:
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2683 Value id;
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2684 string strMethod;
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2685 Array params;
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2686
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2687 JSONRequest() { id = Value::null; }
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2688 void parse(const Value& valRequest);
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2689 };
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2690
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2691 void JSONRequest::parse(const Value& valRequest)
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2692 {
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2693 // Parse request
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2694 if (valRequest.type() != obj_type)
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2695 throw JSONRPCError(-32600, "Invalid Request object");
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2696 const Object& request = valRequest.get_obj();
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2697
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2698 // Parse id now so errors from here on will have the id
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2699 id = find_value(request, "id");
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2700
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2701 // Parse method
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2702 Value valMethod = find_value(request, "method");
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2703 if (valMethod.type() == null_type)
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2704 throw JSONRPCError(-32600, "Missing method");
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2705 if (valMethod.type() != str_type)
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2706 throw JSONRPCError(-32600, "Method must be a string");
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2707 strMethod = valMethod.get_str();
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2708 if (strMethod != "getwork" && strMethod != "getmemorypool")
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2709 printf("ThreadRPCServer method=%s\n", strMethod.c_str());
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2710
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2711 // Parse params
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2712 Value valParams = find_value(request, "params");
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2713 if (valParams.type() == array_type)
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2714 params = valParams.get_array();
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2715 else if (valParams.type() == null_type)
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2716 params = Array();
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2717 else
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2718 throw JSONRPCError(-32600, "Params must be an array");
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2719 }
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2720
3142
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2721 static Object JSONRPCExecOne(const Value& req)
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2722 {
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2723 Object rpc_result;
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2724
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2725 JSONRequest jreq;
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2726 try {
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2727 jreq.parse(req);
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2728
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2729 Value result = tableRPC.execute(jreq.strMethod, jreq.params);
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2730 rpc_result = JSONRPCReplyObj(result, Value::null, jreq.id);
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2731 }
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2732 catch (Object& objError)
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2733 {
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2734 rpc_result = JSONRPCReplyObj(Value::null, objError, jreq.id);
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2735 }
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2736 catch (std::exception& e)
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2737 {
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2738 rpc_result = JSONRPCReplyObj(Value::null,
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2739 JSONRPCError(-32700, e.what()), jreq.id);
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2740 }
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2741
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2742 return rpc_result;
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2743 }
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2744
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2745 static string JSONRPCExecBatch(const Array& vReq)
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2746 {
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2747 Array ret;
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2748 for (unsigned int reqIdx = 0; reqIdx < vReq.size(); reqIdx++)
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2749 ret.push_back(JSONRPCExecOne(vReq[reqIdx]));
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2750
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2751 return write_string(Value(ret), false) + "\n";
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2752 }
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2753
3114
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2754 static CCriticalSection cs_THREAD_RPCHANDLER;
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2755
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2756 void ThreadRPCServer3(void* parg)
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2757 {
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2758 IMPLEMENT_RANDOMIZE_STACK(ThreadRPCServer3(parg));
3114
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2759 {
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2760 LOCK(cs_THREAD_RPCHANDLER);
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2761 vnThreadsRunning[THREAD_RPCHANDLER]++;
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2762 }
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2763 AcceptedConnection *conn = (AcceptedConnection *) parg;
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2764
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2765 bool fRun = true;
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2766 loop {
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2767 if (fShutdown || !fRun)
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2768 {
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2769 conn->close();
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2770 delete conn;
3114
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2771 {
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2772 LOCK(cs_THREAD_RPCHANDLER);
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2773 --vnThreadsRunning[THREAD_RPCHANDLER];
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2774 }
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2775 return;
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2776 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2777 map<string, string> mapHeaders;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2778 string strRequest;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2779
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2780 ReadHTTP(conn->stream(), mapHeaders, strRequest);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2781
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2782 // Check authorization
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2783 if (mapHeaders.count("authorization") == 0)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2784 {
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2785 conn->stream() << HTTPReply(401, "", false) << std::flush;
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2786 break;
1181
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 if (!HTTPAuthorized(mapHeaders))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2789 {
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2790 printf("ThreadRPCServer incorrect password attempt from %s\n", conn->peer_address_to_string().c_str());
1800
5757cdb0dbfb Have bitcoind recommend a secure RPC password. Increase invalid password delay.
Gregory Maxwell <greg@xiph.org>
parents: 1792
diff changeset
2791 /* 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
2792 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
2793 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
2794 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
2795 Sleep(250);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2796
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2797 conn->stream() << HTTPReply(401, "", false) << std::flush;
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2798 break;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2799 }
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2800 if (mapHeaders["connection"] == "close")
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2801 fRun = false;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2802
3141
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2803 JSONRequest jreq;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2804 try
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 // Parse request
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2807 Value valRequest;
3142
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2808 if (!read_string(strRequest, valRequest))
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2809 throw JSONRPCError(-32700, "Parse error");
3141
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2810
3142
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2811 string strReply;
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2812
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2813 // singleton request
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2814 if (valRequest.type() == obj_type) {
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2815 jreq.parse(valRequest);
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2816
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2817 Value result = tableRPC.execute(jreq.strMethod, jreq.params);
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2818
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2819 // Send reply
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2820 strReply = JSONRPCReply(result, Value::null, jreq.id);
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2821
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2822 // array of requests
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2823 } else if (valRequest.type() == array_type)
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2824 strReply = JSONRPCExecBatch(valRequest.get_array());
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2825 else
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2826 throw JSONRPCError(-32700, "Top-level object parse error");
d625fbef5e3d RPC: add support for JSON-RPC 2.0-style request batching
Jeff Garzik <jgarzik@exmulti.com>
parents: 3141
diff changeset
2827
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2828 conn->stream() << HTTPReply(200, strReply, fRun) << std::flush;
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2829 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2830 catch (Object& objError)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2831 {
3141
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2832 ErrorReply(conn->stream(), objError, jreq.id);
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2833 break;
1181
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 catch (std::exception& e)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2836 {
3141
48fbe53e9baf RPC: break out high level JSON-RPC req/resp into their own functions
Jeff Garzik <jgarzik@exmulti.com>
parents: 3122
diff changeset
2837 ErrorReply(conn->stream(), JSONRPCError(-32700, e.what()), jreq.id);
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2838 break;
1181
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 }
2428
7011ff7102f6 RPC: Support HTTP/1.0 and HTTP/1.1, including the proper use of keep-alives
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2427
diff changeset
2841
2427
1b07c236d407 Support multi-threaded JSON-RPC
David Joel Schwartz <davidjoelschwartz@gmail.com>
parents: 2414
diff changeset
2842 delete conn;
3114
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2843 {
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2844 LOCK(cs_THREAD_RPCHANDLER);
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2845 vnThreadsRunning[THREAD_RPCHANDLER]--;
80002e29d5e7 Lock vnThreadsRunning[THREAD_RPCHANDLER].
Matt Corallo <matt@bluematt.me>
parents: 3113
diff changeset
2846 }
1181
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
2374
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2849 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
2850 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2851 // Find method
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2852 const CRPCCommand *pcmd = tableRPC[strMethod];
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2853 if (!pcmd)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2854 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
2855
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2856 // Observe safe mode
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2857 string strWarning = GetWarnings("rpc");
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2858 if (strWarning != "" && !GetBoolArg("-disablesafemode") &&
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2859 !pcmd->okSafeMode)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2860 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
2861
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2862 try
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2863 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2864 // Execute
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2865 Value result;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2866 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2867 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
2868 result = pcmd->actor(params, false);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2869 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2870 return result;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2871 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2872 catch (std::exception& e)
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2873 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2874 throw JSONRPCError(-1, e.what());
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2875 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2876 }
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2877
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2878
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2879 Object CallRPC(const string& strMethod, const Array& params)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2880 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2881 if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2882 throw runtime_error(strprintf(
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2883 _("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
2884 "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
2885 GetConfigFile().string().c_str()));
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2886
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2887 // Connect to localhost
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2888 bool fUseSSL = GetBoolArg("-rpcssl");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2889 asio::io_service io_service;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2890 ssl::context context(io_service, ssl::context::sslv23);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2891 context.set_options(ssl::context::no_sslv2);
3082
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2892 asio::ssl::stream<asio::ip::tcp::socket> sslStream(io_service, context);
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2893 SSLIOStreamDevice<asio::ip::tcp> d(sslStream, fUseSSL);
e5c75ca4f18c Generalise RPC connection handling code to allow more listening sockets
Giel van Schijndel <me@mortis.eu>
parents: 3081
diff changeset
2894 iostreams::stream< SSLIOStreamDevice<asio::ip::tcp> > stream(d);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2895 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
2896 throw runtime_error("couldn't connect to server");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2897
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2898 // HTTP basic authentication
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2899 string strUserPass64 = EncodeBase64(mapArgs["-rpcuser"] + ":" + mapArgs["-rpcpassword"]);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2900 map<string, string> mapRequestHeaders;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2901 mapRequestHeaders["Authorization"] = string("Basic ") + strUserPass64;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2902
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2903 // Send request
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2904 string strRequest = JSONRPCRequest(strMethod, params, 1);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2905 string strPost = HTTPPost(strRequest, mapRequestHeaders);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2906 stream << strPost << std::flush;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2907
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2908 // Receive reply
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2909 map<string, string> mapHeaders;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2910 string strReply;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2911 int nStatus = ReadHTTP(stream, mapHeaders, strReply);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2912 if (nStatus == 401)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2913 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
2914 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
2915 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
2916 else if (strReply.empty())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2917 throw runtime_error("no response from server");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2918
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2919 // Parse reply
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2920 Value valReply;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2921 if (!read_string(strReply, valReply))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2922 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
2923 const Object& reply = valReply.get_obj();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2924 if (reply.empty())
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2925 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
2926
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2927 return reply;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2928 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2929
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2930
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2931
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2932
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2933 template<typename T>
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2934 void ConvertTo(Value& value)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2935 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2936 if (value.type() == str_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2937 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2938 // reinterpret string as unquoted json value
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2939 Value value2;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2940 if (!read_string(value.get_str(), value2))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2941 throw runtime_error("type mismatch");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2942 value = value2.get_value<T>();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2943 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2944 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2945 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2946 value = value.get_value<T>();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2947 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2948 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2949
2374
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2950 // 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
2951 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
2952 {
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2953 Array params;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2954 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
2955 params.push_back(param);
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2956
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2957 int n = params.size();
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2958
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2959 //
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2960 // 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
2961 //
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2962 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
2963 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
2964 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
2965 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
2966 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
2967 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
2968 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
2969 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
2970 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
2971 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
2972 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
2973 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
2974 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
2975 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
2976 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
2977 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
2978 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
2979 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
2980 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
2981 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
2982 if (strMethod == "listsinceblock" && n > 1) ConvertTo<boost::int64_t>(params[1]);
2708
857c26732733 Use ConvertTo to simplify sendmany/addmultisigaddress argument handling
Gavin Andresen <gavinandresen@gmail.com>
parents: 2707
diff changeset
2983 if (strMethod == "sendmany" && n > 1) ConvertTo<Object>(params[1]);
857c26732733 Use ConvertTo to simplify sendmany/addmultisigaddress argument handling
Gavin Andresen <gavinandresen@gmail.com>
parents: 2707
diff changeset
2984 if (strMethod == "sendmany" && n > 2) ConvertTo<boost::int64_t>(params[2]);
857c26732733 Use ConvertTo to simplify sendmany/addmultisigaddress argument handling
Gavin Andresen <gavinandresen@gmail.com>
parents: 2707
diff changeset
2985 if (strMethod == "addmultisigaddress" && n > 0) ConvertTo<boost::int64_t>(params[0]);
857c26732733 Use ConvertTo to simplify sendmany/addmultisigaddress argument handling
Gavin Andresen <gavinandresen@gmail.com>
parents: 2707
diff changeset
2986 if (strMethod == "addmultisigaddress" && n > 1) ConvertTo<Array>(params[1]);
857c26732733 Use ConvertTo to simplify sendmany/addmultisigaddress argument handling
Gavin Andresen <gavinandresen@gmail.com>
parents: 2707
diff changeset
2987
2374
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2988 return params;
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2989 }
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
2990
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2991 int CommandLineRPC(int argc, char *argv[])
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2992 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2993 string strPrint;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2994 int nRet = 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2995 try
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2996 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2997 // Skip switches
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2998 while (argc > 1 && IsSwitchChar(argv[1][0]))
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
2999 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3000 argc--;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3001 argv++;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3002 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3003
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3004 // Method
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3005 if (argc < 2)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3006 throw runtime_error("too few parameters");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3007 string strMethod = argv[1];
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3008
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3009 // Parameters default to strings
2374
413c38b8c6b7 Add UI RPC console / debug window
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2327
diff changeset
3010 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
3011 Array params = RPCConvertValues(strMethod, strParams);
1181
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3012
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3013 // Execute
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3014 Object reply = CallRPC(strMethod, params);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3015
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3016 // Parse reply
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3017 const Value& result = find_value(reply, "result");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3018 const Value& error = find_value(reply, "error");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3019
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3020 if (error.type() != null_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3021 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3022 // Error
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3023 strPrint = "error: " + write_string(error, false);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3024 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
3025 nRet = abs(code);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3026 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3027 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3028 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3029 // Result
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3030 if (result.type() == null_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3031 strPrint = "";
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3032 else if (result.type() == str_type)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3033 strPrint = result.get_str();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3034 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3035 strPrint = write_string(result, true);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3036 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3037 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3038 catch (std::exception& e)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3039 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3040 strPrint = string("error: ") + e.what();
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3041 nRet = 87;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3042 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3043 catch (...)
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3044 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3045 PrintException(NULL, "CommandLineRPC()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3046 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3047
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3048 if (strPrint != "")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3049 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3050 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
3051 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3052 return nRet;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3053 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3054
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3055
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3056
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3057
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3058 #ifdef TEST
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3059 int main(int argc, char *argv[])
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3060 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3061 #ifdef _MSC_VER
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3062 // Turn off microsoft heap dump noise
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3063 _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3064 _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
3065 #endif
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3066 setbuf(stdin, NULL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3067 setbuf(stdout, NULL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3068 setbuf(stderr, NULL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3069
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3070 try
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3071 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3072 if (argc >= 2 && string(argv[1]) == "-server")
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3073 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3074 printf("server ready\n");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3075 ThreadRPCServer(NULL);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3076 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3077 else
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3078 {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3079 return CommandLineRPC(argc, argv);
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3080 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3081 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3082 catch (std::exception& e) {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3083 PrintException(&e, "main()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3084 } catch (...) {
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3085 PrintException(NULL, "main()");
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3086 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3087 return 0;
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3088 }
855f1d50bed7 temp patch for qtui
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
diff changeset
3089 #endif
2294
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
3090
bc7f29fbeed5 Expose CRPCTable via bitcoinrpc.h for testing
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2293
diff changeset
3091 const CRPCTable tableRPC;