AaronFiore/electrum
1
0
Fork 0
Code Activity

add txin_type in add_input_info, remove inefficient search

Browse Source
This commit is contained in:
ThomasV
2017-10-07 12:15:18 +02:00
parent d28f603483
commit 9aa3f2d9e2
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/transaction.py
View File

@@ -474,6 +474,7 @@ def deserialize(raw):
for i in range(n_vin): for i in range(n_vin):
txin = d['inputs'][i] txin = d['inputs'][i]
parse_witness(vds, txin) parse_witness(vds, txin)
# segwit-native script
if not txin.get('scriptSig'): if not txin.get('scriptSig'):
if txin['num_sig'] == 1: if txin['num_sig'] == 1:
txin['type'] = 'p2wpkh' txin['type'] = 'p2wpkh'

12
lib/wallet.py
View File

@@ -1072,15 +1072,9 @@ class Abstract_Wallet(PrintError):
return Transaction.from_io(inputs, outputs) return Transaction.from_io(inputs, outputs)
def add_input_info(self, txin): def add_input_info(self, txin):
txin['type'] = self.txin_type
# Add address for utxo that are in wallet
if txin.get('scriptSig') == '':
coins = self.get_utxos()
for item in coins:
if txin.get('prevout_hash') == item.get('prevout_hash') and txin.get('prevout_n') == item.get('prevout_n'):
txin['address'] = item.get('address')
address = txin['address'] address = txin['address']
if self.is_mine(address): if self.is_mine(address):
txin['type'] = self.get_txin_type(address)
self.add_input_sig_info(txin, address) self.add_input_sig_info(txin, address)
def can_sign(self, tx): def can_sign(self, tx):
@@ -1464,15 +1458,13 @@ class Imported_Wallet(Abstract_Wallet):
return self.addresses[address].get('type', 'address') return self.addresses[address].get('type', 'address')
def add_input_sig_info(self, txin, address): def add_input_sig_info(self, txin, address):
txin['type'] = self.get_txin_type(address)
if self.is_watching_only(): if self.is_watching_only():
addrtype, hash160 = b58_address_to_hash160(address) addrtype, hash160 = b58_address_to_hash160(address)
x_pubkey = 'fd' + bh2u(bytes([addrtype]) + hash160) x_pubkey = 'fd' + bh2u(bytes([addrtype]) + hash160)
txin['x_pubkeys'] = [x_pubkey] txin['x_pubkeys'] = [x_pubkey]
txin['signatures'] = [None] txin['signatures'] = [None]
return return
if txin['type'] in ['p2pkh', 'p2wkh', 'p2wkh-p2sh']:
if txin_type in ['p2pkh', 'p2wkh', 'p2wkh-p2sh']:
pubkey = self.addresses[address]['pubkey'] pubkey = self.addresses[address]['pubkey']
txin['num_sig'] = 1 txin['num_sig'] = 1
txin['x_pubkeys'] = [pubkey] txin['x_pubkeys'] = [pubkey]