Merge pull request #14 from bahadirbb/master

Added importAddress function

Author: minium

src/bitcoinapi/bitcoinapi.cpp

@@ -31,11 +31,11 @@ using std::string;
 using std::vector;
 
 
-BitcoinAPI::BitcoinAPI(const string& user, const string& password, const string& host, int port)
+BitcoinAPI::BitcoinAPI(const string& user, const string& password, const string& host, int port, int httpTimeout)
 : httpClient(new HttpClient("http://" + user + ":" + password + "@" + host + ":" + IntegerToString(port))),
   client(new Client(*httpClient, JSONRPC_CLIENT_V1))
 {
-    httpClient->SetTimeout(50000);
+    httpClient->SetTimeout(httpTimeout);
 }
 
 BitcoinAPI::~BitcoinAPI()
@@ -291,6 +291,15 @@ void BitcoinAPI::importprivkey(const string& bitcoinprivkey, const string& label
 	sendcommand(command, params);
 }
 
+void BitcoinAPI::importAddress(const string& address, const string& account, bool rescan) {
+	string command = "importaddress";
+	Value params, result;
+	params.append(address);
+    params.append(account);
+    params.append(rescan);
+	sendcommand(command, params);
+}
+
 string BitcoinAPI::addmultisigaddress(int nrequired, const vector<string>& keys) {
 	string command = "addmultisigaddress";
 	Value params, result;
@@ -428,6 +437,18 @@ double BitcoinAPI::getbalance(const string& account, int minconf) {
 	return result.asDouble();
 }
 
+double BitcoinAPI::getbalance(const string& account, int minconf, bool includeWatchOnly) {
+	string command = "getbalance";
+	Value params, result;
+	params.append(account);
+	params.append(minconf);
+	params.append(includeWatchOnly);
+	result = sendcommand(command, params);
+
+	return result.asDouble();
+}
+
+
 double BitcoinAPI::getunconfirmedbalance() {
 	string command = "getunconfirmedbalance";
 	Value params, result;

src/bitcoinapi/bitcoinapi.h

@@ -25,7 +25,7 @@ class BitcoinAPI
 
 public:
     /* === Constructor and Destructor === */
-    BitcoinAPI(const std::string& user, const std::string& password, const std::string& host, int port);
+    BitcoinAPI(const std::string& user, const std::string& password, const std::string& host, int port, int httpTimeout);
     ~BitcoinAPI();
 
     /* === Auxiliary functions === */
@@ -53,6 +53,7 @@ class BitcoinAPI
     std::string dumpprivkey(const std::string& bitcoinaddress);
     void importprivkey(const std::string& bitcoinprivkey);
     void importprivkey(const std::string& bitcoinprivkey, const std::string& label, bool rescan = true);
+    void importAddress(const std::string& address, const std::string& account, bool rescan);
 
     std::string addmultisigaddress(int nrequired, const std::vector<std::string>& keys);
     std::string addmultisigaddress(int nrequired, const std::vector<std::string>& keys, const std::string& account);
@@ -74,6 +75,7 @@ class BitcoinAPI
     /* === Accounting === */
     double getbalance();
     double getbalance(const std::string& account, int minconf = 1);
+    double getbalance(const std::string& account, int minconf = 1, bool includeWatchOnly = false);
     double getunconfirmedbalance();
 
     double getreceivedbyaccount(const std::string& account, int minconf = 1);