AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #4227

Browse Source
This commit is contained in:
SomberNight
2018-04-05 12:22:01 +02:00
parent ad6dd73a03
commit d2a1179087
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/commands.py
View File

@@ -34,7 +34,7 @@ from functools import wraps
from decimal import Decimal from decimal import Decimal
from .import util from .import util
from .util import bfh, bh2u, format_satoshis, json_decode, print_error from .util import bfh, bh2u, format_satoshis, json_decode, print_error, json_encode
from .import bitcoin from .import bitcoin
from .bitcoin import is_address, hash_160, COIN, TYPE_ADDRESS from .bitcoin import is_address, hash_160, COIN, TYPE_ADDRESS
from .i18n import _ from .i18n import _
@@ -451,7 +451,7 @@ class Commands:
from .exchange_rate import FxThread from .exchange_rate import FxThread
fx = FxThread(self.config, None) fx = FxThread(self.config, None)
kwargs['fx'] = fx kwargs['fx'] = fx
return self.wallet.get_full_history(**kwargs) return json_encode(self.wallet.get_full_history(**kwargs))
@command('w') @command('w')
def setlabel(self, key, label): def setlabel(self, key, label):