tMerge pull request #3794 from SomberNight/parse_non_multisig_segwit_sh - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 517d2c25b6368c878f5a52e9932d9a665d75bc1a
DIR parent 1bf54a0bc51351fa3a914270440960a6e05e7fc1
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 30 Jan 2018 00:05:59 +0100
Merge pull request #3794 from SomberNight/parse_non_multisig_segwit_sh
unable to parse p2wsh-p2sh and p2wsh txins that are not standard multisig
Diffstat:
M lib/tests/test_transaction.py | 4 ++++
M lib/transaction.py | 65 ++++++++++++++++++++++++++-----
2 files changed, 60 insertions(+), 9 deletions(-)
---
DIR diff --git a/lib/tests/test_transaction.py b/lib/tests/test_transaction.py
t@@ -231,6 +231,10 @@ class TestTransaction(unittest.TestCase):
tx = transaction.Transaction('010000000001010d350cefa29138de18a2d63a93cffda63721b07a6ecfa80a902f9514104b55ca0000000000fdffffff012a4a824a00000000160014b869999d342a5d42d6dc7af1efc28456da40297a024730440220475bb55814a52ea1036919e4408218c693b8bf93637b9f54c821b5baa3b846e102207276ed7a79493142c11fb01808a4142bbdd525ae7bdccdf8ecb7b8e3c856b4d90121024cdeaca7a53a7e23a1edbe9260794eaa83063534b5f111ee3c67d8b0cb88f0eec8010000')
self.assertEqual('51087ece75c697cc872d2e643d646b0f3e1f2666fa1820b7bff4343d50dd680e', tx.txid())
+ def test_txid_input_p2wsh_p2sh_not_multisig(self):
parazyd.org:70 /git/electrum/commit/517d2c25b6368c878f5a52e9932d9a665d75bc1a.gph:28: line too long