Merge #139: Add include_watchonly to getbalance

773ba9a Add include_watchonly to getbalance (Gregory Sanders)

Author: petertodd

bitcoin/rpc.py

@@ -350,16 +350,19 @@ def getaccountaddress(self, account=None):
         r = self._call('getaccountaddress', account)
         return CBitcoinAddress(r)
 
-    def getbalance(self, account='*', minconf=1):
+    def getbalance(self, account='*', minconf=1, include_watchonly=False):
         """Get the balance
 
         account - The selected account. Defaults to "*" for entire wallet. It
         may be the default account using "".
 
         minconf - Only include transactions confirmed at least this many times.
         (default=1)
+
+        include_watchonly - Also include balance in watch-only addresses (see 'importaddress')
+        (default=False)
         """
-        r = self._call('getbalance', account, minconf)
+        r = self._call('getbalance', account, minconf, include_watchonly)
         return int(r*COIN)
 
     def getbestblockhash(self):