Commit Graph

7319 Commits

Author SHA1 Message Date
ThomasV 51b6fa0e46 Merge pull request #2367 from spamdaemon/patch-1
Fixed a syntax error with python 3.6
2017-04-22 06:59:29 +02:00
spamdaemon a17624931d Fixed a syntax error with python 3.6
This fixes this error:
raceback (most recent call last):
  File "/usr/bin/electrum", line 98, in <module>
    from electrum import bitcoin, network
  File "/usr/lib/python3.6/site-packages/electrum/__init__.py", line 2, in <module>
    from util import format_satoshis, print_msg, print_error, set_verbosity
  File "/usr/lib/python3.6/site-packages/electrum/util.py", line 537
    except socket.error, err:

Also, other exceptions in this file use the except X as Y syntax.
2017-04-21 13:48:29 -04:00
ThomasV 6afc11208d spv: keep track of header requests made by each interface 2017-04-20 10:59:30 +02:00
ThomasV 853b6169ed hardware wallet support for locktime 2017-04-19 15:02:25 +02:00
ThomasV 183af4ae3a remove sigtype in update_signature 2017-04-19 15:00:10 +02:00
ThomasV 6fc6d1ec7d timelock tx to current height. see #2349 2017-04-19 11:55:31 +02:00
ThomasV 8cc8f8a5e1 disable max button if an amount has been typed 2017-04-19 11:43:36 +02:00
ThomasV ae730cc8e5 fix #2360 2017-04-18 15:11:58 +02:00
ThomasV f8fd1c14db fix parse_sig 2017-04-18 12:31:42 +02:00
ThomasV f7096010f0 add segwit to get_preimage_script 2017-04-18 11:12:46 +02:00
ThomasV 79bda98ba2 cleanup unused code 2017-04-18 10:48:09 +02:00
ThomasV 9140c1fc89 fix #2352 2017-04-18 10:43:24 +02:00
ThomasV 7c93d787ed follow-up a610e21279 2017-04-13 11:58:42 +02:00
ThomasV 8c32d29272 Merge pull request #2361 from btchip/ledger-segwit
Segwit and RBF support for Ledger HW
2017-04-13 11:43:09 +02:00
BTChip 6fdbeddf08 RBF support 2017-04-12 19:35:00 +02:00
BTChip a610e21279 Segwit support 2017-04-12 19:15:43 +02:00
ThomasV 65bef5e228 parse pubkey in segwit_script 2017-04-12 16:33:35 +02:00
ThomasV 615a5b3f8e fix #2356: scriptSig parsing exception 2017-04-12 16:12:06 +02:00
ThomasV a8be1aeae8 fix #2351 2017-04-05 15:55:15 +02:00
ThomasV 0bc777a10c follow-up previous commit 2017-04-05 09:52:52 +02:00
ThomasV 50587c7a24 fix #2353: show error when sweeping dust 2017-04-05 09:17:42 +02:00
ThomasV b8e2c67b54 Merge branch 'master' of git://github.com/spesmilo/electrum 2017-04-04 13:52:36 +02:00
ThomasV 57baed4728 check parameter type of create_new_address 2017-04-04 13:52:16 +02:00
ThomasV da5fd7a424 Merge pull request #2348 from rbaumert/patch-1
removed meaningless words, made sentences more concise
2017-04-02 09:26:04 +02:00
rbaumert 710a2f9418 removed meaningless words, made sentences more concise 2017-04-01 19:55:09 -07:00
ThomasV db13cf965c fix #2347 and return indentation 2017-04-02 04:36:05 +02:00
ThomasV 31fc9b78af keep connection open with a manually selected server, even if they fail passing the checkpoint 2017-03-31 12:04:29 +02:00
ThomasV 23e51e7c9e follow up fix #2341 2017-03-31 06:40:47 +02:00
ThomasV e555b982f9 fix #2341 2017-03-30 19:08:16 +02:00
ThomasV 08fd7d95ab kivy: use NumericProperty for blocks and nodes 2017-03-30 10:13:58 +02:00
ThomasV 98dcc7c094 kivy checkpoint dialog 2017-03-30 07:05:19 +02:00
ThomasV 1b14a18b1a sanitize pass_checkpoint 2017-03-30 05:55:02 +02:00
ThomasV d371e1c807 network: request checkpoint when opening a new connection 2017-03-29 17:21:18 +02:00
ThomasV f46b403a8d fix #2338 2017-03-29 10:29:02 +02:00
ThomasV 0105702d0f fix #2341 2017-03-29 10:22:19 +02:00
ThomasV b23f788b4a fix #2342 2017-03-29 10:07:42 +02:00
ThomasV e233ca33b4 fix method name 2017-03-28 19:16:03 +02:00
ThomasV e7b136cc6b kivy: minor GUI tweaks 2017-03-28 09:44:11 +02:00
ThomasV 14a3d49f81 presplash screen 2017-03-28 09:43:49 +02:00
ThomasV 38d6c18b60 kivy: allow manual server entry 2017-03-28 08:53:18 +02:00
ThomasV 51f8816ec7 kivy: improve blockchain dialog 2017-03-27 21:31:37 +02:00
ThomasV 59b0b51f24 add proxy settings to kivy GUI 2017-03-27 18:59:48 +02:00
ThomasV 2fcdd458b3 add checkpoint dialog to the kivy gui 2017-03-27 12:48:10 +02:00
ThomasV e6560b8d7f fix moe used for truncate 2017-03-27 00:46:44 +02:00
ThomasV 59bc220856 fix auto-connect: do not use a random interface 2017-03-26 20:22:30 +02:00
ThomasV 8c6866fb91 Merge pull request #2334 from shsmith/master
fix #2325
2017-03-26 19:27:21 +02:00
shsmith dea6b5ffaa fix #2325 2017-03-26 09:55:25 -07:00
ThomasV f54aa45731 Merge branch 'master' of git://github.com/spesmilo/electrum 2017-03-25 11:09:30 +01:00
ThomasV 9c70540a2f add BIP9 and segwit_support methods 2017-03-25 11:09:24 +01:00
ThomasV edf7435ff1 Merge pull request #2319 from da2x/patch-1
Move Electrum to the Finance category
2017-03-24 10:23:10 +01:00