Commit Graph

6231 Commits

Author SHA1 Message Date
ThomasV 1c83c3e060 do not declare pointless static methods 2016-02-01 09:12:53 +01:00
ThomasV 56c7d4139e fix: Daemon.get_server 2016-02-01 09:02:57 +01:00
Neil Booth 274d91fd6e watching_only: warn after showing main window 2016-02-01 07:45:16 +09:00
Neil Booth ab488b566b warn_if_watching_only: don't call twice 2016-02-01 07:42:53 +09:00
Neil Booth e61fffab55 Trezor/KeepKey: force watching only improvements
Only warn about watching only once given a chance to pair.
Failure to pair makes watching-only and warns.
In error message to user, distinguish between failure to connect
and failure to pair.
2016-01-31 19:36:21 +09:00
Neil Booth abaf1bc6dc daemon: remove two unneeded member vars 2016-01-31 18:03:50 +09:00
Neil Booth a90c935758 Remove unreachable code 2016-01-31 14:53:25 +09:00
Neil 2980b580a7 Merge pull request #1663 from nomnombtc/installer_fix_missing1
Installer fix missing hw_wallet plugin
2016-01-31 14:50:37 +09:00
Neil Booth 788ab520ea Remove dead code from prior 2016-01-31 14:48:57 +09:00
Neil Booth e6020975a5 daemon: prevent races by opening with O_EXCL
Rework the way the daemon and server are created.  If we might
want to create a daemon, try to grab the lockfile with O_EXCL.
If we got it, create a server and daemon, otherwise try and
connect to the server.  If connecting to the server fails (including
after sleeping a little in case the server was recently created),
remove the lockfile and start over.

Other fix: shut down network gracefully on daemon exit.

Fixes #1638
2016-01-31 14:46:03 +09:00
Neil Booth 69da96feb4 The daemon stops the wallet threads now 2016-01-31 14:38:16 +09:00
Neil Booth f91f03b3d4 daemon: fix long-standing bug in status request
Gracefully handle a status request when self.network is None
2016-01-31 11:50:44 +09:00
Neil Booth ec24087b5a Move some logic from electrum to daemon
Ultimate goal is to try and stop the daemon race at startup.
Need to isolate logic of checking for server and creating one.
2016-01-31 11:43:11 +09:00
Neil Booth f6f7113978 daemon: create network inside constructor 2016-01-31 10:58:27 +09:00
nomnombtc 9fc6c55382 change tab to whitespaces 2016-01-31 02:49:02 +01:00
nomnombtc 17b6e835c9 add hw_wallet plugin to setup.py 2016-01-31 02:47:16 +01:00
ThomasV 7c7722439b Merge pull request #1631 from pdroalves/master
Added new exchangers to Exchange rates plugin
2016-01-30 16:27:06 +01:00
ThomasV 44ee221c78 kivy: halign 2016-01-30 16:05:36 +01:00
ThomasV 2a908d3e8b hw_wallet: do not mix qt and non-qt imports 2016-01-30 13:48:52 +01:00
ThomasV 0f184db534 kivy: improve amount dialog 2016-01-30 13:24:54 +01:00
ThomasV 28b0ff85f2 fx plugin fix 2016-01-30 12:57:23 +01:00
ThomasV c0ef60aa50 Partially restore e20369bf94, but keep init_qt hook 2016-01-30 12:08:14 +01:00
ThomasV ed401761f1 sorry, confused
This reverts commit 5e6a55edd5.
2016-01-30 11:24:53 +01:00
ThomasV 5e6a55edd5 Revert "Revert "Daemon network cleanup""
This reverts commit 2c7b10a776.
2016-01-30 11:13:11 +01:00
Neil Booth 012f500976 hw_wallet: Create HW_PluginBase and use it 2016-01-30 18:33:54 +09:00
Neil Booth 2717c80a91 ledger: remove unused imports 2016-01-30 18:00:51 +09:00
Neil Booth 9330750e82 Minor fix for prior
Restores to a BIP44_Wallet.  The other var is also in base class.
2016-01-30 17:44:19 +09:00
Neil 4a7cc1c65f Merge pull request #1662 from LedgerHQ/ledger_plugin_redesign
Ledger plugin redesign
2016-01-30 17:43:39 +09:00
BTChip 1c8e39b635 Override word_dialog for PIN entry 2016-01-30 08:11:41 +01:00
BTChip d4b84d6da1 Use unified HW classes 2016-01-30 07:46:19 +01:00
Neil Booth 9930d5fd6f Update obsolete comment. 2016-01-30 13:00:25 +09:00
Neil Booth 134ae3d044 hw_wallet: separate out common QtHandler code 2016-01-30 12:46:54 +09:00
Neil Booth e461c1c818 Create hw_wallet directory for common code
Quite a lot of code under trezor/ can be shared with the
Ledger code.  This is the first step for wallets.
2016-01-30 12:20:05 +09:00
Neil Booth 6b68968d04 self not client. 2016-01-30 12:11:16 +09:00
Neil 78d59d6aa5 Merge pull request #1660 from prusnak/master
fix spelling of TREZOR and SatoshiLabs
2016-01-30 10:16:47 +09:00
ThomasV 03d313572e kivy: fix formatting of fiat values in history 2016-01-29 20:25:42 +01:00
ThomasV a5fd6d2e6c kivy: select currency first, then source. show only sources with history data 2016-01-29 19:58:40 +01:00
ThomasV e3b37512ed exchange_rates plugin: move methods to qt version 2016-01-29 17:56:13 +01:00
ThomasV 2c7b10a776 Revert "Daemon network cleanup"
This reverts commit 0a1b3eac9c.
2016-01-29 17:37:56 +01:00
Pavol Rusnak 6ce12ca1dc
fix spelling of TREZOR and SatoshiLabs 2016-01-29 14:58:51 +01:00
Neil Booth 58d5215e2e No need to pass daemon and network together
The daemon has the network
2016-01-29 22:25:59 +09:00
Neil Booth 0a1b3eac9c Daemon network cleanup
All Daemon creation was preceded by Network creation, based on
config, and passing it to Daemon.
As config is passed to Daemon, it might as well create its own
network and the code is in one place.
2016-01-29 22:14:50 +09:00
ThomasV 3b44504644 exchange rates: call on_quotes in set_currency 2016-01-29 12:50:38 +01:00
ThomasV 54695964d3 Merge branch 'master' of git://github.com/spesmilo/electrum 2016-01-29 12:46:35 +01:00
ThomasV 1409f13947 kivy: show_info clipboard 2016-01-29 12:46:28 +01:00
Neil Booth 412e2a8d2c Create is_pairable() function and use it.
Fixes #1653.
2016-01-29 19:26:05 +09:00
ThomasV b599172657 fix font paths 2016-01-29 11:17:22 +01:00
ThomasV e337e8585b fix font path 2016-01-29 11:12:58 +01:00
ThomasV 072adca85b Merge pull request #1657 from akshayaurora/copy_paste
kivy: remove unneeded imports and fix copy, paste
2016-01-29 11:09:53 +01:00
ThomasV d5479b8dfc Merge pull request #1658 from akshayaurora/move_fonts
kivy: move data/fonts into gui/kivy/data/fonts
2016-01-29 11:08:50 +01:00