AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #6685 from SomberNight/202010_bitcoin_script

Browse Source 
bitcoin/transaction: construct_script, and clean-ups
This commit is contained in:
ghost43
2020-10-24 23:06:55 +00:00
committed by GitHub
parent 200f547a07 03bdb4f1b7
commit 8e9d6a4c91
12 changed files with 270 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/plugins/keepkey/keepkey.py
View File

@@ -53,7 +53,7 @@ class KeepKey_KeyStore(Hardware_KeyStore):
prev_tx = {}
for txin in tx.inputs():
tx_hash = txin.prevout.txid.hex()
if txin.utxo is None and not Transaction.is_segwit_input(txin):
if txin.utxo is None and not txin.is_segwit():
raise UserFacingException(_('Missing previous tx for legacy input.'))
prev_tx[tx_hash] = txin.utxo

2
electrum/plugins/ledger/ledger.py
View File

@@ -386,7 +386,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
redeemScript = Transaction.get_preimage_script(txin)
txin_prev_tx = txin.utxo
if txin_prev_tx is None and not Transaction.is_segwit_input(txin):
if txin_prev_tx is None and not txin.is_segwit():
raise UserFacingException(_('Missing previous tx for legacy input.'))
txin_prev_tx_raw = txin_prev_tx.serialize() if txin_prev_tx else None
inputs.append([txin_prev_tx_raw,

2
electrum/plugins/safe_t/safe_t.py
View File

@@ -51,7 +51,7 @@ class SafeTKeyStore(Hardware_KeyStore):
prev_tx = {}
for txin in tx.inputs():
tx_hash = txin.prevout.txid.hex()
if txin.utxo is None and not Transaction.is_segwit_input(txin):
if txin.utxo is None and not txin.is_segwit():
raise UserFacingException(_('Missing previous tx for legacy input.'))
prev_tx[tx_hash] = txin.utxo