mmgen/mmgen-wallet
1
Fork 0
Code Releases 28 Wiki Activity

Bugfix in RPC listaccounts method

Browse source
This commit is contained in:
The MMGen Project 2014-08-10 02:45:17 +04:00
commit 964451f701
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mmgen/rpc/connection.py
View file

@ -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)

2
mmgen/tool.py
View file

@ -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:

2
mmgen/tx.py
View file

@ -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: