Commit Graph

3008 Commits

Author SHA1 Message Date
ThomasV 71d52d6349 Merge pull request #1936 from ser/websocket_announce
Introducing websocket_announce configuration
2016-09-27 11:19:32 +02:00
ThomasV 63a5e8f99b fix wizard line_dialog 2016-09-26 15:39:30 +02:00
ThomasV b2e9362163 improve message 2016-09-26 12:07:55 +02:00
ThomasV 4bc756751b improve wizard messages; skip choice screen if there is only one choice 2016-09-26 12:02:54 +02:00
ThomasV 4d4171fe53 hardware multisig: partial bip45 derivation 2016-09-23 19:00:42 +02:00
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 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
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 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 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 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 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 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 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 8e181e0dec keystore: another method needs to be moved 2016-08-28 22:30:55 +02:00
ThomasV 1d1da0e1dc move sign_transaction 2016-08-28 22:14:37 +02:00
ThomasV d471d4b905 fixes for old keystore 2016-08-28 22:10:46 +02:00
ThomasV 5be93bdb73 Merge pull request #1909 from btchip/ledger-nanos
Ledger pack : Nano S support, rewrite/cleanup, P2SH
2016-08-28 17:56:57 +02:00
BTChip a88036bc51 When no serial number is available, use the path as a temporary one 2016-08-28 16:33:34 +02:00
ThomasV 357ea62303 minor fix: convert_wallet_type 2016-08-28 15:37:37 +02:00
ThomasV 87e3db91dd tweak messages in wizard 2016-08-28 11:29:16 +02:00
ThomasV f98d1f43b4 do not propose passphrase option in 2fa wallets 2016-08-28 10:33:01 +02:00
ThomasV ab53ee27f1 fix bug with change addresses 2016-08-27 22:24:41 +02:00
ThomasV 49a5994b29 use another lock for hid operations 2016-08-27 15:46:01 +02:00
ThomasV 47f1a7b632 move update_status in handler 2016-08-27 14:56:31 +02:00
ThomasV 257c0915b5 fix deadlocks 2016-08-27 13:33:26 +02:00
ThomasV b07d3466c0 new icons to show hardware wallet pairing in status bar 2016-08-27 11:30:53 +02:00
ThomasV 62b47ca3b3 fix: hw_type 2016-08-27 11:25:53 +02:00
ThomasV 33c7787941 plugins: do not assume that handler belongs to keystore 2016-08-27 09:46:02 +02:00
ThomasV 8b729d0f83 store passphrase in keystore 2016-08-26 16:21:36 +02:00
ThomasV f7efedf8a0 query_info: raise if user cancelled 2016-08-26 12:26:43 +02:00
ThomasV 4189d9343d minor fix: return client 2016-08-26 12:00:33 +02:00
ThomasV 86e23d9989 save wallet label in keystore, to facilitate pairing 2016-08-26 11:45:12 +02:00
ThomasV af2bf1955a trigger upgrade on android 2016-08-26 07:09:38 +02:00
ThomasV 4837d7a148 show complete device description in wizard 2016-08-25 15:31:21 +02:00
ThomasV 3bc6fdaadb fix typo 2016-08-25 12:42:00 +02:00
ThomasV 3ac357171a wizard: add password only once all keystores are known 2016-08-25 12:18:51 +02:00
ThomasV b907a668ec wizard: add derivation passphrase and bip39 support 2016-08-25 09:48:11 +02:00
ThomasV 808703bacb m 2016-08-25 06:43:27 +02:00
ThomasV 6b0e65fc0a fixes for hardware wallets 2016-08-24 19:37:29 +02:00
ThomasV 665d1bc153 plugin: separate get_xpub and setup_device 2016-08-24 10:47:27 +02:00
ThomasV 092bb43660 rename wizard.choose_device because plugin has method with same name 2016-08-24 09:13:21 +02:00
ThomasV 1e6caf8f03 wizard: ask accound id after device setup 2016-08-24 08:52:21 +02:00
ThomasV 8edca91390 wizard: trezor init 2016-08-24 05:58:41 +02:00
ThomasV 4781df9d21 wizard: scan hardware devices directly 2016-08-23 13:40:11 +02:00
ThomasV 0520eda628 device manager: remove seemingly unused parameter 2016-08-23 10:36:20 +02:00
ThomasV 3b830cbcfa wizard: fix trezor device initialization 2016-08-23 09:21:24 +02:00
ThomasV 80675121ce allow several hardware cosigners in the same wallet 2016-08-22 12:50:24 +02:00
ThomasV d16fb3ee48 fix storage update_format 2016-08-22 11:59:24 +02:00
ThomasV c63a0f2198 fix #1907 2016-08-21 21:09:00 +02:00
ThomasV 3a1bf84d2c convert multisig wallets 2016-08-21 14:27:30 +02:00
ThomasV 8736cf8cd4 fix wallet upgrade 2016-08-21 12:47:38 +02:00
ThomasV afe39330dc update wallet format again, for keystore 2016-08-21 11:58:15 +02:00
ThomasV 428bc539b3 hardware: store derivation instead of account_id 2016-08-20 21:08:30 +02:00
ThomasV 664077397e device manager: index devices by xpub 2016-08-20 20:54:15 +02:00
ThomasV 8423f8394f dynfees: set default 2016-08-20 09:16:03 +02:00
ThomasV 24a9ff3fef simplify wallet types 2016-08-19 17:35:58 +02:00
ThomasV 058e49e839 wizard: fix typo 2016-08-19 14:45:52 +02:00
ThomasV 352c48f339 wizard: use the word 'keystore' 2016-08-19 11:47:07 +02:00
ThomasV 090a284619 storage: convert_wallet_type 2016-08-19 09:57:29 +02:00
ThomasV bfd7709ccd move xpubkey logic to keystore and fix it 2016-08-17 15:25:16 +02:00
ThomasV f6e393d7b6 fix: import addresses and private keys 2016-08-17 10:39:30 +02:00
ThomasV 5733a5d125 importprivkey: do not import the same key twice 2016-08-17 09:49:58 +02:00
ThomasV 2e9cfb9800 small fixes for addrequest 2016-08-16 12:41:15 +02:00
ThomasV a088940496 add Wallet.can_import 2016-08-16 12:11:39 +02:00
ThomasV d9021788fa request account_id in wizard, for hardware wallets. cleanup bip44 code 2016-08-15 11:48:33 +02:00
ThomasV 71de14240d daemon: default rpchost to 127.0.0.1 2016-08-15 08:27:09 +02:00
ThomasV f61d8b4c24 daemon: handle rpc server init errors 2016-08-15 08:14:19 +02:00
ThomasV b87c5d12fa - fix sign/verify messages
- fix hardware wallet tx_outputs
2016-08-14 13:03:52 +02:00
ThomasV 47fef13e5b fix keepkey wallet_type storage 2016-08-13 11:02:43 +02:00
ThomasV f9d5a5d326 fix import 2016-08-12 15:53:21 +02:00
ThomasV 82769fc1fb fix classmethod normalize_passphrase 2016-08-12 15:21:47 +02:00
ThomasV b0afdf4614 fix command line: create, restore, importprivkey 2016-08-12 11:56:27 +02:00
ThomasV 1159f85e05 Major refactoring
- separation between Wallet and key management (Keystore)
 - simplification of wallet classes
 - remove support for multiple accounts in the same wallet
 - add support for OP_RETURN to Trezor plugin
 - split multi-accounts wallets for backward compatibility
2016-08-12 11:02:28 +02:00
Thomas König c49202ceaa
fix test_simple_config and test_transaction 2016-08-04 17:21:25 +02:00
ThomasV b0f6b8578e fix issue #1865 2016-08-02 10:52:59 +02:00
ThomasV 5f86af15b8 fix type 2016-08-01 17:36:25 +02:00
ThomasV ee032e9158 base_wizard: minor fixes 2016-08-01 17:34:58 +02:00
ThomasV 16db27ffc0 wizard: remove run_wallet 2016-07-31 10:59:42 +02:00
ThomasV 2bb08aa280 fixes for install wizard 2016-07-30 15:04:15 +02:00
ThomasV f8c1bd1d3b wizard: multisig creation, let user go back to show their xpub 2016-07-30 08:19:29 +02:00
ThomasV 5a2ec73367 add RBF option to command line 2016-07-29 12:54:47 +02:00
ThomasV 8e219348e6 fix tx.is_final 2016-07-29 12:53:49 +02:00
ThomasV 566ed664d5 comment out hardware cosigning; not ready for release 2016-07-28 14:19:57 +02:00
ThomasV 67780bb8b9 changes for new toolchain 2016-07-28 13:06:58 +02:00
akshayaurora 07c5f02639 changes for new toolchain 2016-07-27 17:57:12 +02:00
ThomasV f061fe047d add lock to storage.write 2016-07-07 06:54:57 +02:00
ThomasV 824f86475e add get_master_public_key to all wallets 2016-07-01 17:46:11 +02:00
ThomasV 59825c913c follow up c6a46df158 2016-07-01 17:32:13 +02:00
ThomasV c6a46df158 fix issue #1853 2016-07-01 16:19:26 +02:00
ThomasV 342d6633a6 wizard: add capability to restore multisig 2016-07-01 11:44:26 +02:00
ThomasV 8ae1dc4d09 do not register unsupported wallet types, because they are proposed in the install wizard 2016-06-25 19:32:43 +02:00
ThomasV c313c3c340 remove forgotten imports and print statements 2016-06-24 23:14:41 +02:00
ThomasV e7d25faf02 Finish wizard unification 2016-06-24 23:02:54 +02:00
ThomasV 97dc130e26 fix: i18n in base_wizard 2016-06-20 13:30:54 +02:00
ThomasV 9182392b55 kivy: separate base wizard class from gui 2016-06-18 16:32:20 +02:00
ThomasV b6393cbdf2 display 'low fee' in tx dialog 2016-06-15 13:31:24 +02:00
ThomasV 7a1af24eda getprivatekeys: try load_json if we did not get an address 2016-06-11 16:55:19 +02:00
ThomasV 5661aabaa4 revert to daemon for interface code 2016-06-11 16:11:36 +02:00
ThomasV e7d1f59987 getmpk command: return only one key 2016-06-11 16:10:45 +02:00
ThomasV f5cfa28710 don't display generated addresses to stdout 2016-06-11 13:54:05 +02:00
ThomasV 9896718f09 get_tx_info: fix types 2016-06-09 18:10:13 +02:00
ThomasV 8886e5098a fix get_tx_info 2016-06-08 14:15:17 +02:00
ThomasV 5af7139598 kivy: handle 'verified' event 2016-06-08 12:55:42 +02:00
ThomasV 7f7aa97e2e tx dialog: fix confirmation time estimate 2016-06-08 11:22:58 +02:00
ThomasV b94a7920af factorize code used for tx dialogs 2016-06-08 11:06:51 +02:00
ThomasV f2d2d61894 add expected confirmation time to tx dialog 2016-06-07 17:12:31 +02:00
ThomasV a07a3f748e Qt GUI: let users type tx output in script language 2016-06-07 09:57:24 +02:00
ThomasV bbe7b277d2 call jnius.detach on thread stop 2016-06-04 12:59:01 +02:00
ThomasV 5f3b6af2e0 interface: do not use daemon threads 2016-06-04 12:58:49 +02:00
ThomasV 9da2076328 fix: relayfee is per kb 2016-06-04 09:33:26 +02:00
ThomasV 0843aaafb5 gat_wallet_delta: reverse sign of returned fee 2016-06-02 11:30:39 +02:00
ThomasV 79fbb5edce get_tx_delta: do not return fee if tx is not mine 2016-06-02 11:15:43 +02:00
ThomasV 403fbdd39e rename is_send -> is_mine 2016-06-02 10:40:16 +02:00
ThomasV 016d733c0f low_fee threshold 2016-06-01 05:41:08 +02:00
ThomasV 8e0d1f1e44 fix low_fee value 2016-06-01 05:39:29 +02:00
ThomasV db7467ef4e release notes for 2.7 2016-05-31 20:53:15 +02:00
ThomasV 2cf4795250 dynamic fees: define fee levels using expected confirmation times 2016-05-31 20:26:09 +02:00
ThomasV 599906eef6 show warning icon if unconfirmed tx has low fee. fixes 1798 2016-05-30 18:26:58 +02:00
ThomasV 076ecb2680 move get_status to synchronizer 2016-05-30 16:11:49 +02:00
ThomasV 8680eae86f detect dangling links 2016-05-30 10:53:52 +02:00
ThomasV 0e61408dfa add option to configure electrum_path 2016-05-30 08:58:10 +02:00
ThomasV 7a8635589b fix #1755 2016-05-30 07:57:46 +02:00
ThomasV 59d3910882 fix utxo_can_sign 2016-05-29 20:36:52 +02:00
ThomasV 1a46a795a5 detect non-final transactions, and transactions with unconfirmed inputs 2016-05-29 19:53:04 +02:00
ThomasV 2259b741f6 use address as key in contacts 2016-05-28 16:56:18 +02:00
ThomasV 0273936b07 Discretize fee levels (follow-up 3314b3a). Fixes #1753 2016-05-26 09:23:42 +02:00
ThomasV f01f931e83 add extra checkbox for RBF 2016-05-23 17:34:33 +02:00