Commit Graph

8061 Commits

Author SHA1 Message Date
ThomasV f03cb75713 ledger: fix missing import 2017-10-29 16:40:08 +01:00
ThomasV 9a0082248b move autoconnect checkbox to server tab 2017-10-29 15:31:19 +01:00
ThomasV 7b1c5c27a3
Merge pull request #3146 from SomberNight/xtype_ledger_segwit
fix xtype for ledger native segwit
2017-10-29 14:41:34 +01:00
SomberNight c6f085a711 fix xtype for ledger native segwit 2017-10-29 10:31:23 +01:00
ThomasV 8467663448
Merge pull request #3141 from SomberNight/locktime_local_height
txn: set locktime to local height for RBF, CPFP, sweep
2017-10-28 22:41:48 +02:00
ThomasV 3696d38f33
Merge pull request #3140 from SomberNight/sweep_p2pk_unknown
fix: sweep p2pk - small display bug (unknown -> pubkey)
2017-10-28 15:06:48 +02:00
SomberNight 211fa9a062 txn: set locktime to local height for RBF, CPFP, sweep 2017-10-28 10:02:37 +02:00
SomberNight 5109075e4f fix: sweep p2pk - small display bug (unknown -> pubkey) 2017-10-28 08:59:44 +02:00
ThomasV 6f3c822867
Merge pull request #3125 from SomberNight/sweep_p2pk
try to sweep p2pk outputs from old type WIF privkeys
2017-10-27 21:01:56 +02:00
ThomasV 7dcd01356a
Merge pull request #3137 from SomberNight/test_wallet_vertical_bip39_multisig
tests: have bip39 multisig wallet unit test mirror hw wallet behaviour
2017-10-27 21:00:24 +02:00
SomberNight aad83a71c8 tests: have bip39 multisig wallet unit test mirror hw wallet behaviour 2017-10-27 19:57:43 +02:00
ThomasV aee27e7007 increase width of tx window, because segwit addresses are longer 2017-10-27 16:32:08 +02:00
ThomasV f7b14cb27f Merge branch 'master' of github.com:spesmilo/electrum 2017-10-27 16:28:55 +02:00
ThomasV e607a499c1 check seed_version is not too high 2017-10-27 16:26:01 +02:00
ThomasV 98d5829805 Merge pull request #3136 from SomberNight/v15_conversion
seed_version: separate methods for v14 and v15 conversion (storage)
2017-10-27 16:16:32 +02:00
SomberNight a40ab01210 seed_version: separate methods for v14 and v15 conversion (storage) 2017-10-27 16:06:36 +02:00
ThomasV e9f7429fcd kivy: fix type in RBF dialog 2017-10-27 15:31:13 +02:00
ThomasV 348f66b8a5 fix requires_upgrade 2017-10-27 15:00:46 +02:00
ThomasV a1f91ee49e Revert "Revert "bump seed_version""
This reverts commit ce5ab39ba2.
2017-10-27 15:00:09 +02:00
ThomasV ce5ab39ba2 Revert "bump seed_version"
This reverts commit 64b7a89abc.
2017-10-27 12:38:50 +02:00
ThomasV 64b7a89abc bump seed_version 2017-10-27 12:06:26 +02:00
SomberNight 5e5191d25c base_wizard: only check xpub type if have xpub 2017-10-27 12:04:26 +02:00
ThomasV a89fe91815 update release notes 2017-10-27 12:04:26 +02:00
SomberNight 4a383af872 fix tests 2017-10-27 12:04:26 +02:00
ThomasV 11bbe31ae3 wizard: check xpub types before adding keystore 2017-10-27 12:04:26 +02:00
ThomasV a10e6b6436 fix xtype of ypub keys in plugins and bip39 seeds 2017-10-27 12:04:26 +02:00
ThomasV 0af700bda0 fix typo 2017-10-27 12:04:26 +02:00
ThomasV a220932711 serialize txin-type in xpub/xprv 2017-10-27 12:04:26 +02:00
ThomasV 62fe3a411b Merge pull request #3133 from SomberNight/payment_req1
fix: payment request related stuff
2017-10-27 11:20:39 +02:00
ThomasV 93d7aebae4 Merge pull request #3135 from SomberNight/payment_req2
Payment request: "pay now" allow multiple attempts
2017-10-27 11:20:04 +02:00
SomberNight 7c3a0905ce fix #3134 2017-10-27 03:06:41 +02:00
SomberNight 0d0f8c5842 fix: payment request related stuff (qt crash, exporting, refresh bug) 2017-10-27 02:32:49 +02:00
ThomasV e7d4bf2945 fix typo 2017-10-26 22:16:14 +02:00
ThomasV 52a482a9b5 display segwit warning in privkey window 2017-10-26 18:40:31 +02:00
ThomasV 337675d134 add safety notice 2017-10-26 18:21:24 +02:00
ThomasV a00203d374 Merge pull request #3128 from SomberNight/netw_dial_refresh_proxy_settings
(QT network dialog) don't keep resetting proxy settings
2017-10-26 16:16:50 +02:00
SomberNight bf024db7aa follow-up prev comit 2017-10-26 16:14:09 +02:00
SomberNight 404584bfe6 fix: (QT network dialog) don't keep resetting proxy settings 2017-10-26 15:21:44 +02:00
ThomasV f6cc37d1d2 Merge branch 'master' of github.com:spesmilo/electrum 2017-10-26 11:23:41 +02:00
ThomasV ffc0cc3c1f Merge pull request #3123 from SomberNight/fix_parse_witness_coinbase
fix: transaction.parse_witness() for coinbase
2017-10-26 11:23:28 +02:00
ThomasV a5e2b18af2 Merge pull request #3122 from SomberNight/test_transaction_txid
tests: transaction.txid()
2017-10-26 11:22:59 +02:00
SomberNight 1c31177d03 try to sweep p2pk outputs from old type WIF privkeys 2017-10-26 01:17:46 +02:00
SomberNight 32e88495ae fix: transaction.parse_witness() for coinbase 2017-10-26 00:40:08 +02:00
SomberNight fb47dbb75a tests: transaction.txid() 2017-10-26 00:35:18 +02:00
ThomasV 89240571d4 py3: socket.error is deprecated 2017-10-25 18:22:54 +02:00
ThomasV 1cbc794229 interface: catch py3 exceptions 2017-10-25 17:43:30 +02:00
ThomasV 06f18f9078 chmod +x make_osx 2017-10-25 09:13:00 +02:00
ThomasV a91de6a236 Merge pull request #3114 from SomberNight/typo_wallet_import_priv_key
typo in wallet.import_private_key()
2017-10-25 07:29:20 +02:00
SomberNight 1f102913e9 typo in wallet.import_private_key() 2017-10-25 06:54:51 +02:00
ThomasV f7200cb616 use pyinstaller for OSX builds 2017-10-24 22:52:53 +02:00