From 5ec237e4a44f10d5a97ab132176a587ac3137aee Mon Sep 17 00:00:00 2001 From: Yaacov Akiba Slama Date: Tue, 11 Aug 2020 19:26:48 +0300 Subject: [PATCH] Fix channelPoint to string --- intercept.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/intercept.go b/intercept.go index bf92c7b..60d34a0 100644 --- a/intercept.go +++ b/intercept.go @@ -10,6 +10,8 @@ import ( "time" "github.com/btcsuite/btcd/btcec" + "github.com/btcsuite/btcd/chaincfg/chainhash" + "github.com/btcsuite/btcd/wire" "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc/routerrpc" "github.com/lightningnetwork/lnd/lnwire" @@ -101,6 +103,7 @@ func intercept() { IncomingCircuitKey: request.IncomingCircuitKey, Action: routerrpc.ResolveHoldForwardAction_FAIL, }) + continue } } @@ -141,7 +144,17 @@ func intercept() { var onionBlob bytes.Buffer err = sphinxPacket.Encode(&onionBlob) log.Printf("sphinxPacket.Encode(): %v", err) - channelPoint := fmt.Sprintf("%x:%v", fundingTxID, fundingTxOutnum) + var h chainhash.Hash + err = h.SetBytes(fundingTxID) + if err != nil { + log.Printf("h.SetBytes(%x) error: %v", fundingTxID, err) + interceptorClient.Send(&routerrpc.ForwardHtlcInterceptResponse{ + IncomingCircuitKey: request.IncomingCircuitKey, + Action: routerrpc.ResolveHoldForwardAction_FAIL, + }) + continue + } + channelPoint := wire.NewOutPoint(&h, fundingTxOutnum).String() go resumeOrCancel( clientCtx, interceptorClient, request.IncomingCircuitKey, destination, channelPoint, uint64(amt), onionBlob.Bytes(),