Commit graph

7406 commits

Author SHA1 Message Date
ThomasV
8d3a96ebf4 better message 2016-09-23 16:09:49 +02:00
Serge Victor
07280730d4 Intoducing websocket_announce configuration
Currently electrum daemon runs websocket server on a configured host and
port and sends the same information to merchant payments. There is
likely that those two may be different, when websocket traffic is being
reverse proxied and sent over via different hosts.

This patch introduces two fully optional parameters,
websocket_server_announce and websocket_port_announce, which when
set, are sent to the merchant payments instead of websocket_server and
websocket_port values.
2016-09-22 18:57:23 +00:00
ThomasV
569a3b4fab make sure seed last word is uniformly distributed. count prefix length as entropy 2016-09-22 14:37:08 +02:00
ThomasV
7982cadd22 follow-up pevious commit 2016-09-22 13:38:59 +02:00
ThomasV
0d671e67c5 sign_transaction: do not stop if a keystore raises an exception 2016-09-22 10:57:28 +02:00
ThomasV
56c490faf0 ledger: better message 2016-09-22 10:54:32 +02:00
ThomasV
5f038a4157 ledger plugin: parse xpubkey instead of using txin['derivation']; always use client.finalizeInputFull 2016-09-22 10:25:03 +02:00
ThomasV
03c66bb5f9 follow up 08543584c5 2016-09-21 16:44:21 +02:00
ThomasV
08543584c5 fix cold storage signing for imported wallets 2016-09-21 16:23:24 +02:00
ThomasV
a132525a2b Merge pull request #1935 from ser/add-ws-host-port
Adding possibility of websockets configuration
2016-09-21 14:48:05 +02:00
Serge Victor
90fe6292ca $.getJSON is asynchronous, obviosly. 2016-09-21 12:45:50 +00:00
Serge Victor
f2820944f1 Adding possibility of websockets configuration
Up to now, websockets configuration was possible for the daemon only,
   this patch passes that information to the client via json file
   produced with the payment request.
2016-09-21 10:54:09 +00:00
ThomasV
da544794b7 improved message 2016-09-21 12:40:18 +02:00
ThomasV
a45095ef36 fix #1934 2016-09-21 11:28:59 +02:00
ThomasV
a3b4409e6e fix #1920 2016-09-06 10:09:08 +02:00
Eagle[TM]
7933448ec7 network: Update default server list 2016-09-04 14:36:11 +02:00
ThomasV
36c90502ae more trustedcoin fixes 2016-09-02 10:58:54 +02:00
ThomasV
2baf8e2079 fix trustedcoin hook 2016-09-02 10:42:41 +02:00
ThomasV
494d7faa22 fix: get_action 2016-09-02 10:38:56 +02:00
ThomasV
7a47d2341e fix bug in trustedcoin constructor 2016-09-02 10:28:52 +02:00
ThomasV
1e4cdab096 normalize passphrase 2016-09-02 10:20:04 +02:00
ThomasV
cba9a2dc2c trustedcoin: add_seed 2016-09-02 10:18:53 +02:00
ThomasV
b1b15f510c Fix can_sign and cold storage 2016-09-01 19:45:01 +02:00
ThomasV
abeb781879 fix #1916 2016-09-01 09:23:05 +02:00
ThomasV
e38abb95d7 minor fix tx status 2016-08-31 18:45:58 +02:00
ThomasV
c820423b00 fix storage update for btchip 2016-08-31 18:11:37 +02:00
ThomasV
323188b963 devmgr: if only one device is plugged, use it 2016-08-31 15:15:55 +02:00
ThomasV
16ed48d52d Format upgrade: increment seed_version to make sure that old versions of Electrum refuse to open new wallet files. 2016-08-31 15:04:57 +02:00
ThomasV
a815d5b3c3 update release notes for 2.7 2016-08-31 12:36:56 +02:00
ThomasV
ae779694df create common class for qt hardware plugins 2016-08-31 11:50:19 +02:00
ThomasV
02db08504c fix yes_no_question dialog in qthandler 2016-08-31 11:32:14 +02:00
ThomasV
0eb3b0613e update trezor and keepkey icons 2016-08-31 11:15:22 +02:00
ThomasV
dd39931833 Revert "follow bip45 derivation with hardware multisig"
This reverts commit c24d38cd97.
2016-08-31 09:35:27 +02:00
ThomasV
c24d38cd97 follow bip45 derivation with hardware multisig 2016-08-31 09:12:36 +02:00
ThomasV
e7dd800875 tweak messages 2016-08-31 08:50:31 +02:00
ThomasV
2a9c9cf654 remove deprecated method 2016-08-31 08:31:19 +02:00
ThomasV
9146986a1f Merge pull request #1913 from btchip/ledger-nanos
Updated Ledger icons
2016-08-31 07:18:43 +02:00
BTChip
baebe3d52d Updated Ledger icons 2016-08-30 15:48:22 +02:00
ThomasV
ab67a0313a fix upgrade_wallet 2016-08-30 12:19:58 +02:00
ThomasV
83dbe7fbf3 more fixes for kivy 2016-08-30 11:19:30 +02:00
ThomasV
08733c09c4 more fixes for trustedcoin 2016-08-30 10:47:16 +02:00
ThomasV
b33e6a8b68 wizard small fixes 2016-08-30 10:36:51 +02:00
ThomasV
ebab390b1a wizard: it is better to use a separate screen for passphrase 2016-08-30 09:51:53 +02:00
ThomasV
19e62ba643 fixes for storage conversion 2016-08-29 15:44:30 +02:00
ThomasV
99a3250b3f wizard: show passphrase in the same window as the seed 2016-08-29 15:33:16 +02:00
ThomasV
5e90b3a42d wizard: abort if device fails to create xpub 2016-08-29 08:47:48 +02:00
ThomasV
66f8fe7648 fix: assert in convert_wallet_type 2016-08-29 08:38:09 +02:00
ThomasV
fb548018b4 fix signing in imported keystores 2016-08-29 07:39:27 +02:00
ThomasV
b5d129b09a Merge pull request #1910 from btchip/ledger-nanos
Fix setup for Nano S firmware version < 1.2
2016-08-28 22:33:51 +02:00
ThomasV
8e181e0dec keystore: another method needs to be moved 2016-08-28 22:30:55 +02:00