AaronFiore/electrum
1
0
Fork 0
Code Activity

trezor plugin: add paytowitness (not supported yet)

Browse Source
This commit is contained in:
ThomasV
2017-10-11 12:23:10 +02:00
parent 6656154b78
commit 0df24d9321
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/trezor/plugin.py
View File

@@ -6,7 +6,7 @@ from binascii import hexlify, unhexlify
from functools import partial from functools import partial
from electrum.util import bfh, bh2u from electrum.util import bfh, bh2u
from electrum.bitcoin import (b58_address_to_hash160, xpub_from_pubkey, from electrum.bitcoin import (is_segwit_address, b58_address_to_hash160, xpub_from_pubkey,
public_key_to_p2pkh, EncodeBase58Check, public_key_to_p2pkh, EncodeBase58Check,
TYPE_ADDRESS, TYPE_SCRIPT, TYPE_ADDRESS, TYPE_SCRIPT,
TESTNET, ADDRTYPE_P2PKH, ADDRTYPE_P2SH) TESTNET, ADDRTYPE_P2PKH, ADDRTYPE_P2SH)
@@ -365,13 +365,16 @@ class TrezorCompatiblePlugin(HW_PluginBase):
txoutputtype.script_type = self.types.PAYTOOPRETURN txoutputtype.script_type = self.types.PAYTOOPRETURN
txoutputtype.op_return_data = address[2:] txoutputtype.op_return_data = address[2:]
elif _type == TYPE_ADDRESS: elif _type == TYPE_ADDRESS:
addrtype, hash_160 = b58_address_to_hash160(address) if is_segwit_address(address):
if addrtype == ADDRTYPE_P2PKH: txoutputtype.script_type = self.types.PAYTOWITNESS
txoutputtype.script_type = self.types.PAYTOADDRESS
elif addrtype == ADDRTYPE_P2SH:
txoutputtype.script_type = self.types.PAYTOSCRIPTHASH
else: else:
raise BaseException('addrtype') addrtype, hash_160 = b58_address_to_hash160(address)
if addrtype == ADDRTYPE_P2PKH:
txoutputtype.script_type = self.types.PAYTOADDRESS
elif addrtype == ADDRTYPE_P2SH:
txoutputtype.script_type = self.types.PAYTOSCRIPTHASH
else:
raise BaseException('addrtype')
txoutputtype.address = address txoutputtype.address = address
outputs.append(txoutputtype) outputs.append(txoutputtype)