AaronFiore/electrum
1
0
Fork 0
Code Activity

serialize value for segwit-p2sh inputs too

Browse Source
This commit is contained in:
ThomasV
2017-09-17 16:54:40 +02:00
parent 0abb38cf51
commit 5416a4ea8a
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/wallet.py
View File

@@ -1680,8 +1680,11 @@ class Multisig_Wallet(Deterministic_Wallet):
elif self.txin_type == 'p2wsh':
witness_script = self.pubkeys_to_redeem_script(pubkey)
return bitcoin.script_to_p2wsh(witness_script)
elif self.txin_type == 'p2wsh-p2sh':
redeem_script = self.pubkeys_to_redeem_script(pubkey)
return bitcoin.hash160_to_p2sh(hash_160(bfh(redeem_script)))
else:
raise NotImplementedError()
raise NotImplementedError(self.txin_type)
#def redeem_script(self, c, i):
# pubkeys = self.get_pubkeys(c, i)