Skip to content

Commit

Permalink
Upgraded Electrum to 2.9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
devos50 committed Mar 15, 2018
1 parent 29f56a6 commit 1610407
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Tribler/community/market/wallet/btc_wallet.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def start_daemon(self):
if not fd:
return

self.daemon = self.get_daemon().Daemon(config, fd)
self.daemon = self.get_daemon().Daemon(config, fd, is_gui=False)
self.daemon.start()

def open_wallet(self):
Expand Down Expand Up @@ -247,7 +247,7 @@ def get_transactions(self):
'fee_amount': 0.0,
'currency': 'BTC',
'timestamp': str(transaction['timestamp']),
'description': ''
'description': 'Confirmations: %d' % transaction['confirmations']
})

return succeed(transactions)
Expand Down
2 changes: 1 addition & 1 deletion electrum
Submodule electrum updated 74 files
+4 −0 .gitignore
+2 −0 .travis.yml
+5 −5 README.rst
+47 −1 RELEASE-NOTES
+1 −1 contrib/build-wine/build-electrum-git.sh
+5 −0 contrib/build-wine/electrum.nsi
+8 −47 contrib/build-wine/prepare-hw.sh
+7 −0 contrib/build-wine/prepare-wine.sh
+4 −0 contrib/make_locale
+4 −6 electrum
+3 −3 electrum.desktop
+ electrum.icns
+2 −2 gui/kivy/Makefile
+33 −1 gui/kivy/main.kv
+98 −22 gui/kivy/main_window.py
+3 −3 gui/kivy/tools/buildozer.spec
+1 −1 gui/kivy/uix/dialogs/amount_dialog.py
+2 −0 gui/kivy/uix/dialogs/choice_dialog.py
+1 −1 gui/kivy/uix/dialogs/installwizard.py
+51 −71 gui/kivy/uix/dialogs/settings.py
+1 −1 gui/kivy/uix/screens.py
+47 −49 gui/kivy/uix/ui_screens/network.kv
+76 −0 gui/kivy/uix/ui_screens/proxy.kv
+63 −0 gui/kivy/uix/ui_screens/server.kv
+21 −1 gui/qt/__init__.py
+22 −1 gui/qt/address_dialog.py
+1 −2 gui/qt/address_list.py
+1 −0 gui/qt/contact_list.py
+10 −0 gui/qt/history_list.py
+64 −59 gui/qt/installwizard.py
+112 −99 gui/qt/main_window.py
+307 −137 gui/qt/network_dialog.py
+1 −1 gui/qt/util.py
+10 −3 gui/qt/utxo_list.py
+1 −1 gui/text.py
+7 −0 icons.qrc
+ icons/electrum.ico
+ icons/electrum_presplash.png
+ icons/tab_addresses.png
+ icons/tab_coins.png
+ icons/tab_console.png
+ icons/tab_contacts.png
+ icons/tab_history.png
+ icons/tab_receive.png
+ icons/tab_send.png
+13 −19 lib/base_wizard.py
+26 −7 lib/bitcoin.py
+225 −132 lib/blockchain.py
+68 −40 lib/commands.py
+17 −2 lib/contacts.py
+515 −485 lib/currencies.json
+49 −32 lib/daemon.py
+104 −56 lib/exchange_rate.py
+97 −0 lib/jsonrpc.py
+1 −1 lib/keystore.py
+293 −110 lib/network.py
+8 −6 lib/plugins.py
+5 −2 lib/qrscanner.py
+7 −2 lib/simple_config.py
+8 −3 lib/storage.py
+6 −2 lib/tests/test_transaction.py
+34 −31 lib/transaction.py
+66 −14 lib/util.py
+9 −8 lib/verifier.py
+1 −1 lib/version.py
+43 −16 lib/wallet.py
+98 −27 plugins/digitalbitbox/digitalbitbox.py
+1 −1 plugins/ledger/cmdline.py
+66 −40 plugins/ledger/ledger.py
+1 −1 plugins/trezor/clientbase.py
+12 −22 plugins/trezor/plugin.py
+5 −10 plugins/trustedcoin/qt.py
+21 −3 plugins/trustedcoin/trustedcoin.py
+23 −0 snap/snapcraft.yaml

0 comments on commit 1610407

Please sign in to comment.