Commit Graph

3417 Commits

Author SHA1 Message Date
ThomasV c73819a3d4 fix tests 2017-09-29 17:49:29 +02:00
ThomasV fed76bfffc Merge branch 'master' of github.com:spesmilo/electrum 2017-09-29 15:36:01 +02:00
ThomasV e8b564c0e7 Extend Wallet Import Format with txin type. Extend class Imported_Wallet. 2017-09-29 15:32:55 +02:00
ThomasV da0f51df37 Merge pull request #2943 from SomberNight/msg_signing_tests
tests: message signing
2017-09-27 07:51:34 +02:00
ThomasV 4864c802dd fix message signing #2939 2017-09-27 07:47:41 +02:00
SomberNight 7542bc9e35 tests: message signing 2017-09-27 03:57:49 +02:00
ThomasV 952049f74b fix #2915 2017-09-24 13:35:53 +02:00
ThomasV 2239cb9624 fix #2921 2017-09-24 10:18:08 +02:00
ThomasV 99bc43d8db Merge pull request #2911 from SomberNight/pyqt5
migration to PyQt5
2017-09-24 09:42:32 +02:00
ThomasV c43b48f4f5 Merge pull request #2917 from SomberNight/get_server
log: identify exception source in log for daemon/get_server
2017-09-24 09:40:33 +02:00
ThomasV 70983bb177 Merge pull request #2919 from SomberNight/currency_btce
finish BTCe to WEX renaming
2017-09-24 09:32:35 +02:00
SomberNight 48eab8f286 python3: exchange_rate.py 2017-09-24 02:53:17 +02:00
SomberNight 60dcf6ebfb finish BTCe to WEX renaming 2017-09-23 19:47:54 +02:00
SomberNight 296837d4a9 log: identify exception source in log for daemon/get_server 2017-09-23 18:44:06 +02:00
ThomasV 1522a00012 qrscanner: return str 2017-09-23 09:40:20 +02:00
ThomasV 9bdac1aae0 detect txintype in keystore. fix #2912 2017-09-23 09:39:12 +02:00
ThomasV 1bd60d4c3a fix #2880 2017-09-23 05:57:50 +02:00
SomberNight 4ac162f18b migration to PyQt5. initial commit. 2017-09-23 05:54:38 +02:00
ThomasV 3c7843eea5 revert 6e9b2a4459 2017-09-23 05:40:10 +02:00
ThomasV ab2d0f389c fix 2904 2017-09-23 05:26:03 +02:00
ThomasV 348ef7d72c Merge pull request #2902 from SomberNight/network_timeout
send server.version before subscriptions
2017-09-22 10:19:40 +02:00
ThomasV c186dc18d4 fix tests 2017-09-22 09:55:30 +02:00
SomberNight 2fbc70d860 Moving to virtual tx size instead of total tx size. 2017-09-22 09:49:05 +02:00
SomberNight 6e0c2cffd8 replace deprecated assertEquals 2017-09-21 06:07:52 +02:00
SomberNight 0e89745c2b send server.version before subscriptions 2017-09-20 15:21:41 +02:00
ThomasV c12c1685d7 serialize value of incomplete inputs in the witness field. fix p2wsh-in-p2sh deserialization 2017-09-18 09:41:19 +02:00
ThomasV fcea2a065d add support for p2wsh-in-p2sh 2017-09-18 08:52:06 +02:00
ThomasV 10b35e3545 follow-up 0abb38cf51 2017-09-17 17:09:22 +02:00
ThomasV 6b1d9ca315 add segwit option for make_seed command 2017-09-17 17:08:46 +02:00
ThomasV 5416a4ea8a serialize value for segwit-p2sh inputs too 2017-09-17 16:56:52 +02:00
Jochen Hoenicke 0abb38cf51 Fix parsing of witnesses
The lengths in the witness structure are `var_int` not pushes.

From BIP-141:
The `witness` is a serialization of all witness data of the transaction.
Each txin is associated with a witness field. A witness field starts
with a `var_int` to indicate the number of stack items for the txin. It is
followed by stack items, with each item starts with a `var_int` to
indicate the length. Witness data is NOT script.

This bug was triggered by tx
d379210d85c1346dafbfd60e3cbc5c5573e50b1f9576d39f177afb2b378f1b98
2017-09-17 16:56:25 +02:00
ThomasV fd1a676d45 remove command line segwit option 2017-09-17 16:34:22 +02:00
Alexx Saver 7b3a398d46 Removed BTCe and added WEX to exchange_rate.py
Notice: WEX uses RUR instead of RUB, but we return it as RUB to conform to ISO 4217.
2017-09-17 01:55:07 +04:00
ThomasV 23f36ea080 follow up previous commit 2017-09-16 11:00:20 +02:00
ThomasV 6e9b2a4459 do not send coins to witness scripts with non-zero version 2017-09-16 10:46:37 +02:00
SomberNight a339270c07 readability change: OP_n calculation from boolean arithmetic to ternary 2017-09-16 03:43:08 +02:00
SomberNight 653c7acb48 fix bech32 scriptPubKeys (OP_n), and tests 2017-09-16 02:19:26 +02:00
ThomasV a8a993d490 fix key type for bip49 2017-09-15 12:20:06 +02:00
ThomasV d7dc804b32 fix iteration bug 2017-09-15 12:07:57 +02:00
ThomasV 302dd3912d Merge pull request #2872 from SomberNight/p2pk_output_1
fix: p2pk output serialisation
2017-09-15 11:54:53 +02:00
SomberNight 33157d3718 fix: p2pk output serialisation 2017-09-15 05:50:12 +02:00
SomberNight 35e4eb6cc3 fix: set scriptSig when spending from coinbase 2017-09-15 05:36:13 +02:00
ThomasV f0fe84d959 check xkey type when we add the keystore, so that we cover all cases 2017-09-14 14:38:19 +02:00
ThomasV 123c5e3165 wizard: check seed_type before creating multisig 2017-09-14 14:00:29 +02:00
ThomasV 43e3f4d3d1 add segwit choice to wizard 2017-09-14 12:20:11 +02:00
SomberNight efd07f727a fix testnet 2017-09-14 02:06:08 +02:00
ThomasV c5f552f26a rm dead code 2017-09-13 15:12:50 +02:00
ThomasV 8b0db38f87 follow-up 3d4c64f9e 2017-09-13 14:54:52 +02:00
ThomasV 50ce062c39 update release notes and set version number to 3.0 2017-09-13 12:48:37 +02:00
ThomasV 7dbd612d5d Read default server list from file. Update list with 1.1 servers. Remove nolnet option. 2017-09-13 11:33:28 +02:00