Bugfix in RPC listaccounts method

mmgen/rpc/connection.py

@@ -456,7 +456,7 @@ ERROR: 'importaddress' method not found.  Is your bitcoind enabled for watch-onl
 		except JSONRPCException as e:
 			raise _wrap_exception(e.error)
 
-	def listaccounts(self, minconf=1, as_dict=False):
+	def listaccounts(self, minconf=1, includeWatchonly=False, as_dict=False):
 		"""
 		Returns a list of account names.
 
@@ -467,9 +467,9 @@ ERROR: 'importaddress' method not found.  Is your bitcoind enabled for watch-onl
 		"""
 		try:
 			if as_dict:
-				return dict(self.proxy.listaccounts(minconf,True))
+				return dict(self.proxy.listaccounts(minconf,includeWatchonly))
 			else:
-				return self.proxy.listaccounts(minconf).keys()
+				return self.proxy.listaccounts(minconf,includeWatchonly).keys()
 		except JSONRPCException as e:
 			raise _wrap_exception(e.error)
 

mmgen/tool.py

@@ -331,7 +331,7 @@ def listaddresses(minconf=1,showempty=False):
 	if showempty:
 		# Show accts with not enough confirmations as empty!
 		# A feature, not a bug!
-		accts = c.listaccounts(minconf=0,as_dict=True)
+		accts = c.listaccounts(minconf=0,includeWatchonly=True,as_dict=True)
 		for k in accts.keys():
 			ma,comment = split2(k)
 			if is_mmgen_addr(ma) and accts[k] == 0:

mmgen/tx.py

@@ -475,7 +475,7 @@ def mmaddr2btcaddr_bitcoind(c,mmaddr,acct_data):
 
 	# Don't want to create a new object, so use append()
 	if not acct_data:
-		for i in c.listaccounts(minconf=0):
+		for i in c.listaccounts(minconf=0,includeWatchonly=True):
 			acct_data.append(i)
 
 	for acct in acct_data: