arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-17 01:52:02 +00:00
Code Issues Releases Wiki Activity

trezorlib: remove Hash to btc_hash, prepare for moving it away from things

Browse Source
This commit is contained in:
matejcik 2018-04-20 17:23:43 +02:00
parent 325312d11c
commit b7c7190573
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/signtest.py
View File

@ -110,7 +110,7 @@ class MyTxApiBitcoin(object):
o.script_pubkey = b'\x76\xa9\x14' + pubkey + b'\x88\xac' o.script_pubkey = b'\x76\xa9\x14' + pubkey + b'\x88\xac'
txser = self.serialize_tx(t) txser = self.serialize_tx(t)
txhash = tools.Hash(txser)[::-1] txhash = tools.btc_hash(txser)[::-1]
self.inputs.append( self.inputs.append(
proto_types.TxInputType( proto_types.TxInputType(
address_n=self.client.expand_path("44'/0'/0'/0/%d" % idx), address_n=self.client.expand_path("44'/0'/0'/0/%d" % idx),

4
trezorlib/client.py
View File

@ -1029,7 +1029,7 @@ class ProtocolMixin(object):
if xprv[0:4] not in ('xprv', 'tprv'): if xprv[0:4] not in ('xprv', 'tprv'):
raise ValueError("Unknown type of xprv") raise ValueError("Unknown type of xprv")
if len(xprv) < 100 and len(xprv) > 112: if not 100 < len(xprv) < 112: # yes this is correct in Python
raise ValueError("Invalid length of xprv") raise ValueError("Invalid length of xprv")
node = proto.HDNodeType() node = proto.HDNodeType()
@ -1038,7 +1038,7 @@ class ProtocolMixin(object):
if data[90:92] != b'00': if data[90:92] != b'00':
raise ValueError("Contain invalid private key") raise ValueError("Contain invalid private key")
checksum = binascii.hexlify(hashlib.sha256(hashlib.sha256(binascii.unhexlify(data[:156])).digest()).digest()[:4]) checksum = binascii.hexlify(tools.btc_hash(binascii.unhexlify(data[:156]))[:4])
if checksum != data[156:]: if checksum != data[156:]:
raise ValueError("Checksum doesn't match") raise ValueError("Checksum doesn't match")

4
trezorlib/tests/support/ckd_public.py
View File

@ -126,14 +126,14 @@ def serialize(node, version=0x0488B21E):
s += b'\x00' + node.private_key s += b'\x00' + node.private_key
else: else:
s += node.public_key s += node.public_key
s += tools.Hash(s)[:4] s += tools.btc_hash(s)[:4]
return tools.b58encode(s) return tools.b58encode(s)
def deserialize(xpub): def deserialize(xpub):
data = tools.b58decode(xpub, None) data = tools.b58decode(xpub, None)
if tools.Hash(data[:-4])[:4] != data[-4:]: if tools.btc_hash(data[:-4])[:4] != data[-4:]:
raise ValueError("Checksum failed") raise ValueError("Checksum failed")
node = messages.HDNodeType() node = messages.HDNodeType()

7
trezorlib/tools.py
View File

@ -35,7 +35,10 @@ def H_(x: int) -> int:
return x | HARDENED_FLAG return x | HARDENED_FLAG
def Hash(data): def btc_hash(data):
"""
Double-SHA256 hash as used in BTC
"""
return hashlib.sha256(hashlib.sha256(data).digest()).digest() return hashlib.sha256(hashlib.sha256(data).digest()).digest()
@ -47,7 +50,7 @@ def hash_160(public_key):
def hash_160_to_bc_address(h160, address_type): def hash_160_to_bc_address(h160, address_type):
vh160 = struct.pack('<B', address_type) + h160 vh160 = struct.pack('<B', address_type) + h160
h = Hash(vh160) h = btc_hash(vh160)
addr = vh160 + h[0:4] addr = vh160 + h[0:4]
return b58encode(addr) return b58encode(addr)