From 753429547da17a305952034ef5bc5f546ae26419 Mon Sep 17 00:00:00 2001 From: Joost Jager Date: Fri, 3 May 2019 10:52:23 +0200 Subject: [PATCH] swap: fix htlc address generation This commit fixes the generation of the htlc address. This bug didn't affect the swap execution, because the htlc address is only used for display to the user/caller. --- swap/htlc.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/swap/htlc.go b/swap/htlc.go index 02a6510..539a187 100644 --- a/swap/htlc.go +++ b/swap/htlc.go @@ -67,15 +67,13 @@ func NewHtlc(cltvExpiry int32, senderKey, receiverKey [33]byte, return nil, err } - p2wshPkScriptHash := sha256.Sum256(p2wshPkScript) - var pkScript, sigScript []byte var address btcutil.Address switch outputType { case HtlcNP2WSH: // Generate p2sh script for p2wsh (nested). - + p2wshPkScriptHash := sha256.Sum256(p2wshPkScript) hash160 := input.Ripemd160H(p2wshPkScriptHash[:]) builder := txscript.NewScriptBuilder() @@ -111,7 +109,7 @@ func NewHtlc(cltvExpiry int32, senderKey, receiverKey [33]byte, pkScript = p2wshPkScript address, err = btcutil.NewAddressWitnessScriptHash( - p2wshPkScriptHash[:], + p2wshPkScript[2:], chainParams, ) if err != nil {