AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #1267 from kyuupichan/spendable_coins

Browse Source 
get_spendable_coins and frozen addrs
This commit is contained in:
ThomasV
2015-05-31 07:53:43 +02:00
parent 00ded10810 320f9a3790
commit bd6bfcea0e
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/commands.py
View File

@@ -265,7 +265,7 @@ class Commands:
return self.network.synchronous_get([ ('blockchain.address.get_history',[addr]) ])[0]
def listunspent(self):
l = copy.deepcopy(self.wallet.get_spendable_coins())
l = copy.deepcopy(self.wallet.get_spendable_coins(exclude_frozen = False))
for i in l: i["value"] = str(Decimal(i["value"])/100000000)
return l
@@ -278,7 +278,7 @@ class Commands:
return {'address':r[0] }
def createrawtransaction(self, inputs, outputs):
coins = self.wallet.get_spendable_coins(None)
coins = self.wallet.get_spendable_coins(exclude_frozen = False)
tx_inputs = []
for i in inputs:
prevout_hash = i['txid']

9
lib/wallet.py
View File

@@ -562,10 +562,12 @@ class Abstract_Wallet(object):
return c, u, x
def get_spendable_coins(self, domain=None):
def get_spendable_coins(self, domain = None, exclude_frozen = True):
coins = []
if domain is None:
domain = self.addresses(True)
if exclude_frozen:
domain = set(domain) - self.frozen_addresses
for addr in domain:
c = self.get_addr_utxo(addr)
for txo, v in c.items():
@@ -846,11 +848,6 @@ class Abstract_Wallet(object):
# get coins
if not coins:
if domain is None:
domain = self.addresses(True)
for i in self.frozen_addresses:
if i in domain:
domain.remove(i)
coins = self.get_spendable_coins(domain)
amount = sum(map(lambda x:x[2], outputs))