highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-06 13:09:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

funding: fix peer key serialization in log message

Browse Source
This commit is contained in:
Oliver Gugger 2023-02-07 22:15:09 +01:00
parent 5d18fccd42
commit e4f3a35c0c
No known key found for this signature in database
GPG Key ID: 8E4256593F177720
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
funding/manager.go
View File

@ -1766,11 +1766,15 @@ func (f *Manager) handleFundingAccept(peer lnpeer.Peer,
pendingChanID := msg.PendingChannelID pendingChanID := msg.PendingChannelID
peerKey := peer.IdentityKey() peerKey := peer.IdentityKey()
var peerKeyBytes []byte
if peerKey != nil {
peerKeyBytes = peerKey.SerializeCompressed()
}
resCtx, err := f.getReservationCtx(peerKey, pendingChanID) resCtx, err := f.getReservationCtx(peerKey, pendingChanID)
if err != nil { if err != nil {
log.Warnf("Can't find reservation (peerKey:%v, chan_id:%v)", log.Warnf("Can't find reservation (peerKey:%x, chan_id:%v)",
peerKey, pendingChanID) peerKeyBytes, pendingChanID)
return return
} }
@ -1950,7 +1954,8 @@ func (f *Manager) handleFundingAccept(peer lnpeer.Peer,
addr, amt, packet, err := psbtErr.Intent.FundingParams() addr, amt, packet, err := psbtErr.Intent.FundingParams()
if err != nil { if err != nil {
log.Errorf("Unable to process PSBT funding params "+ log.Errorf("Unable to process PSBT funding params "+
"for contribution from %v: %v", peerKey, err) "for contribution from %x: %v", peerKeyBytes,
err)
f.failFundingFlow(peer, msg.PendingChannelID, err) f.failFundingFlow(peer, msg.PendingChannelID, err)
return return
} }
@ -1958,7 +1963,7 @@ func (f *Manager) handleFundingAccept(peer lnpeer.Peer,
err = packet.Serialize(&buf) err = packet.Serialize(&buf)
if err != nil { if err != nil {
log.Errorf("Unable to serialize PSBT for "+ log.Errorf("Unable to serialize PSBT for "+
"contribution from %v: %v", peerKey, err) "contribution from %x: %v", peerKeyBytes, err)
f.failFundingFlow(peer, msg.PendingChannelID, err) f.failFundingFlow(peer, msg.PendingChannelID, err)
return return
} }
@ -1974,8 +1979,8 @@ func (f *Manager) handleFundingAccept(peer lnpeer.Peer,
} }
psbtIntent = psbtErr.Intent psbtIntent = psbtErr.Intent
} else if err != nil { } else if err != nil {
log.Errorf("Unable to process contribution from %v: %v", log.Errorf("Unable to process contribution from %x: %v",
peerKey, err) peerKeyBytes, err)
f.failFundingFlow(peer, msg.PendingChannelID, err) f.failFundingFlow(peer, msg.PendingChannelID, err)
return return
} }