tMerge pull request #797 from Matoking/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 9fea7dfbde308a089ee5e39f36ffe689bba51ea5
DIR parent 23c826863ea2f76247a26809d3e8cb9e3ca520fb
HTML Author: ThomasV <thomasv1@gmx.de>
Date: Mon, 25 Aug 2014 14:07:28 +0200
Merge pull request #797 from Matoking/master
Add confirmation count to API command 'history'
Diffstat:
M lib/commands.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -320,7 +320,7 @@ class Commands:
label, is_default_label = self.wallet.get_label(tx_hash)
- out.append({'txid':tx_hash, 'date':"%16s"%time_str, 'label':label, 'value':format_satoshis(value)})
+ out.append({'txid':tx_hash, 'date':"%16s"%time_str, 'label':label, 'value':format_satoshis(value), 'confirmations':conf})
return out
def setlabel(self, key, label):