replace 'ElectrumKeyID' with more general 'KeyID' field in transactions
This commit is contained in:
parent
2de6db84e4
commit
10bfcb918b
|
@ -825,7 +825,7 @@ class Transaction:
|
||||||
for i in self.inputs:
|
for i in self.inputs:
|
||||||
e = { 'txid':i['tx_hash'], 'vout':i['index'],
|
e = { 'txid':i['tx_hash'], 'vout':i['index'],
|
||||||
'scriptPubKey':i.get('raw_output_script'),
|
'scriptPubKey':i.get('raw_output_script'),
|
||||||
'electrumKeyID':i.get('electrumKeyID'),
|
'KeyID':i.get('KeyID'),
|
||||||
'redeemScript':i.get('redeemScript'),
|
'redeemScript':i.get('redeemScript'),
|
||||||
'signatures':i.get('signatures'),
|
'signatures':i.get('signatures'),
|
||||||
'pubkeys':i.get('pubkeys'),
|
'pubkeys':i.get('pubkeys'),
|
||||||
|
|
|
@ -256,7 +256,7 @@ class Wallet:
|
||||||
if item.get('txid') == txin['tx_hash'] and item.get('vout') == txin['index']:
|
if item.get('txid') == txin['tx_hash'] and item.get('vout') == txin['index']:
|
||||||
txin['raw_output_script'] = item['scriptPubKey']
|
txin['raw_output_script'] = item['scriptPubKey']
|
||||||
txin['redeemScript'] = item.get('redeemScript')
|
txin['redeemScript'] = item.get('redeemScript')
|
||||||
txin['electrumKeyID'] = item.get('electrumKeyID')
|
txin['KeyID'] = item.get('KeyID')
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
for item in unspent_coins:
|
for item in unspent_coins:
|
||||||
|
@ -268,8 +268,9 @@ class Wallet:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
# find the address:
|
# find the address:
|
||||||
if txin.get('electrumKeyID'):
|
if txin.get('KeyID'):
|
||||||
account, sequence = txin.get('electrumKeyID')
|
account, name, sequence = txin.get('KeyID')
|
||||||
|
if name != 'Electrum': continue
|
||||||
sec = self.sequences[account].get_private_key(sequence, seed)
|
sec = self.sequences[account].get_private_key(sequence, seed)
|
||||||
addr = self.sequences[account].get_address(sequence)
|
addr = self.sequences[account].get_address(sequence)
|
||||||
txin['address'] = addr
|
txin['address'] = addr
|
||||||
|
@ -771,7 +772,7 @@ class Wallet:
|
||||||
pk_addresses.append(address)
|
pk_addresses.append(address)
|
||||||
continue
|
continue
|
||||||
account, sequence = self.get_address_index(address)
|
account, sequence = self.get_address_index(address)
|
||||||
txin['electrumKeyID'] = (account, sequence) # used by the server to find the key
|
txin['KeyID'] = (account, 'Electrum', sequence) # used by the server to find the key
|
||||||
pk_addr, redeemScript = self.sequences[account].get_input_info(sequence)
|
pk_addr, redeemScript = self.sequences[account].get_input_info(sequence)
|
||||||
if redeemScript: txin['redeemScript'] = redeemScript
|
if redeemScript: txin['redeemScript'] = redeemScript
|
||||||
pk_addresses.append(pk_addr)
|
pk_addresses.append(pk_addr)
|
||||||
|
|
Loading…
Reference in New Issue