Commit Graph

7711 Commits

Author SHA1 Message Date
SomberNight 6e0c2cffd8 replace deprecated assertEquals 2017-09-21 06:07:52 +02:00
ThomasV 77eb62b4cb fix #2895 2017-09-19 15:24:17 +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 d1e897bf8f Merge pull request #2886 from romanz/master
paytoedit: fix insertCompletion() string handling
2017-09-17 21:51:18 +02:00
Roman Zeyde a156ee94bf paytoedit: fix insertCompletion() string handling 2017-09-17 22:03:14 +03: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 ecf6ae65ee Merge branch 'master' of github.com:spesmilo/electrum 2017-09-17 16:58:07 +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 62d351a0c6 Merge pull request #2883 from jhoenicke/segwitfix
Fix parsing of witnesses
2017-09-17 16:50:55 +02:00
ThomasV cc1b8f4dce fix peers type 2017-09-17 16:46:24 +02:00
ThomasV fd1a676d45 remove command line segwit option 2017-09-17 16:34:22 +02:00
ThomasV fa1f3e13bb clarify release status 2017-09-17 14:34:24 +02:00
Jochen Hoenicke 4dd38df311 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 12:48:42 +02:00
ThomasV 3f8b5bfd98 Merge pull request #2882 from bigreddmachine/master
Edit install wizard msg to reflect linguistic trends
2017-09-17 07:19:22 +02:00
ThomasV ae37b1100d Merge pull request #2881 from lzsaver/wex
Removed BTCe and added WEX to exchange_rate.py
2017-09-17 07:17:40 +02:00
Mike C 8f1ccc188c Edit install wizard msg to reflect linguistic trends
In the install wizard message, the prompt uses the word "fulfil". While this is an acceptable spelling of the word, Google ngrams indicates that it is twice as common to spell the word with two l's at the end, aka "fulfill", in modern writing. This PR proposes to use the more common spelling.

https://books.google.com/ngrams/graph?content=fulfill%2C+fulfil&year_start=1800&year_end=2000&corpus=15&smoothing=3&share=&direct_url=t1%3B%2Cfulfill%3B%2Cc0%3B.t1%3B%2Cfulfil%3B%2Cc0
2017-09-16 17:41:03 -06: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
ThomasV 18182998b3 Merge pull request #2877 from SomberNight/bech32_scriptpubkeys
fix bech32 scriptPubKeys (OP_n), and tests
2017-09-16 06:07:16 +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
ThomasV 7e66a5e128 Merge pull request #2871 from SomberNight/coinbase_scriptSig
fix: set scriptSig when spending from coinbase
2017-09-15 11:54:01 +02:00
ThomasV 9fc8d94d96 try..except block around load_wallet 2017-09-15 11:51:11 +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
ThomasV 51718501fd add server list to setup.py 2017-09-14 10:25:04 +02:00
ThomasV 8da36e3bd1 Merge pull request #2868 from SomberNight/testnet_hotfix
fix testnet
2017-09-14 05:18:58 +02:00
SomberNight efd07f727a fix testnet 2017-09-14 02:06:08 +02:00
ThomasV 68218fff01 codename for 3.0: Uncanny Valley 2017-09-13 20:27:31 +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 f1ab3b6097 update release notes 2017-09-13 13:21:35 +02:00
ThomasV a21a36fa6e update release notes 2017-09-13 13:06:57 +02:00
ThomasV 0e3bd84b3a release notes: more info on python3 2017-09-13 13:02:17 +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
ThomasV a6eb9753eb fix cmdline create with segwit option 2017-09-13 11:33:28 +02:00
ThomasV f1666f208b remove height parameter from blockchain.transaction.get 2017-09-13 11:33:28 +02:00
ThomasV 84962ea6f1 remove deprecated command: getutxoaddress 2017-09-13 11:33:28 +02:00
ThomasV 93e577e0cb Revert "segwit: add purpose to derivation"
This reverts commit f706fa07078fd01f24ded2dada7ad66eae8ff485.
2017-09-13 11:33:28 +02:00