From 964451f701b7e12c5263a26c216be4a828804795 Mon Sep 17 00:00:00 2001 From: philemon Date: Sun, 10 Aug 2014 02:45:17 +0400 Subject: [PATCH] Bugfix in RPC listaccounts method --- mmgen/rpc/connection.py | 6 +++--- mmgen/tool.py | 2 +- mmgen/tx.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mmgen/rpc/connection.py b/mmgen/rpc/connection.py index ee63776b..7c859853 100755 --- a/mmgen/rpc/connection.py +++ b/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) diff --git a/mmgen/tool.py b/mmgen/tool.py index 7785b5da..87dcf789 100755 --- a/mmgen/tool.py +++ b/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: diff --git a/mmgen/tx.py b/mmgen/tx.py index 17754cff..9006015b 100755 --- a/mmgen/tx.py +++ b/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: