tfix hash in make_offered_htlc - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 6ba846bff02a6ff8d796d6ca4d67337c4451b83d
DIR parent 2c717194b2f14f596fa5db84186ba1b2f68906c2
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 17 Apr 2018 06:59:21 +0200
fix hash in make_offered_htlc
Diffstat:
M electrum/crypto.py | 8 +++++---
M lib/lnbase.py | 26 ++++++++------------------
2 files changed, 13 insertions(+), 21 deletions(-)
---
DIR diff --git a/electrum/crypto.py b/electrum/crypto.py
t@@ -198,16 +198,18 @@ def sha256d(x: Union[bytes, str]) -> bytes:
def hash_160(x: bytes) -> bytes:
+ return ripemd(sha256(public_key))
+
+def ripemd(x):
try:
md = hashlib.new('ripemd160')
- md.update(sha256(x))
+ md.update(x)
return md.digest()
except BaseException:
from . import ripemd
- md = ripemd.new(sha256(x))
+ md = ripemd.new(x)
return md.digest()
-
def hmac_oneshot(key: bytes, msg: bytes, digest) -> bytes:
if hasattr(hmac, 'digest'):
# requires python 3.7+; faster
DIR diff --git a/lib/lnbase.py b/lib/lnbase.py
t@@ -266,24 +266,14 @@ def make_offered_htlc(revocation_pubkey, remote_htlcpubkey, local_htlcpubkey, pa
assert type(remote_htlcpubkey) is bytes
assert type(local_htlcpubkey) is bytes
assert type(payment_preimage) is bytes
- h = hashlib.new("ripemd160")
- h.update(payment_preimage)
- payment_hash = h.digest()#ripemd.new(payment_preimage).digest()
- assert type(payment_hash) is bytes
- return bytes([opcodes.OP_DUP, opcodes.OP_HASH160]) + bfh(push_script(bh2u(bitcoin.hash_160(revocation_pubkey)))) + bytes([opcodes.OP_EQUAL
- , opcodes.OP_IF
- , opcodes.OP_CHECKSIG
- , opcodes.OP_ELSE]) +\
- bfh(push_script(bh2u(remote_htlcpubkey))) + bytes([opcodes.OP_SWAP, opcodes.OP_SIZE]) + bitcoin.add_number_to_script(32) + bytes([opcodes.OP_EQUAL,
- opcodes.OP_NOTIF,
- # to local node via htlc-timeout transaction (timelocked)
- opcodes.OP_DROP]) + bitcoin.add_number_to_script(2) + bytes([opcodes.OP_SWAP]) + bfh(push_script(bh2u(local_htlcpubkey))) + bitcoin.add_number_to_script(2) + bytes([opcodes.OP_CHECKMULTISIG,
- opcodes.OP_ELSE,
- # to remote node with preimage
- opcodes.OP_HASH160]) + bfh(push_script(bh2u(payment_hash))) + bytes([opcodes.OP_EQUALVERIFY,
- opcodes.OP_CHECKSIG,
- opcodes.OP_ENDIF,
- opcodes.OP_ENDIF])
+ payment_hash = bitcoin.sha256(payment_preimage)
+ return bytes([opcodes.OP_DUP, opcodes.OP_HASH160]) + bfh(push_script(bh2u(bitcoin.hash_160(revocation_pubkey))))\
+ + bytes([opcodes.OP_EQUAL, opcodes.OP_IF, opcodes.OP_CHECKSIG, opcodes.OP_ELSE]) \
+ + bfh(push_script(bh2u(remote_htlcpubkey)))\
+ + bytes([opcodes.OP_SWAP, opcodes.OP_SIZE]) + bitcoin.add_number_to_script(32) + bytes([opcodes.OP_EQUAL, opcodes.OP_NOTIF, opcodes.OP_DROP])\
+ + bitcoin.add_number_to_script(2) + bytes([opcodes.OP_SWAP]) + bfh(push_script(bh2u(local_htlcpubkey))) + bitcoin.add_number_to_script(2)\
+ + bytes([opcodes.OP_CHECKMULTISIG, opcodes.OP_ELSE, opcodes.OP_HASH160])\
+ + bfh(push_script(bh2u(bitcoin.ripemd(payment_hash)))) + bytes([opcodes.OP_EQUALVERIFY, opcodes.OP_CHECKSIG, opcodes.OP_ENDIF, opcodes.OP_ENDIF])
def make_commitment(ctn, local_funding_pubkey, remote_funding_pubkey, remotepubkey,
payment_pubkey, remote_payment_pubkey, revocation_pubkey, delayed_pubkey,