From b3b34d9de243273d3b7f05b336f1d059ae68fc48 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Fri, 6 Dec 2019 15:10:25 -0800 Subject: [PATCH 1/2] Revert "peer: clamp a link's max HTLC forwarding policy to current max HTLC pay size" This reverts commit c943d850193a476be1bc37ed922d1954cf040948. --- peer.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/peer.go b/peer.go index 4b3a259df..9996fd52d 100644 --- a/peer.go +++ b/peer.go @@ -537,9 +537,6 @@ func (p *peer) loadActiveChannels(chans []*channeldb.OpenChannel) ( FeeRate: selfPolicy.FeeProportionalMillionths, TimeLockDelta: uint32(selfPolicy.TimeLockDelta), } - if forwardingPolicy.MaxHTLC > MaxPaymentMSat { - forwardingPolicy.MaxHTLC = MaxPaymentMSat - } } else { peerLog.Warnf("Unable to find our forwarding policy "+ "for channel %v, using default values", @@ -1871,9 +1868,6 @@ out: FeeRate: defaultPolicy.FeeRate, TimeLockDelta: defaultPolicy.TimeLockDelta, } - if forwardingPolicy.MaxHTLC > MaxPaymentMSat { - forwardingPolicy.MaxHTLC = MaxPaymentMSat - } // Create the link and add it to the switch. err = p.addLink( From abb44e18e29bc23fe16f718c36455b92d06bb3f5 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Fri, 6 Dec 2019 15:10:39 -0800 Subject: [PATCH 2/2] Revert "funding: ensure the chan policy max htlc size is below max pay size" This reverts commit 9b3385e87de8b2da51a9c979cd4e8ef770078ae2. --- fundingmanager.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/fundingmanager.go b/fundingmanager.go index f2fdb6c6d..ac89aeaa9 100644 --- a/fundingmanager.go +++ b/fundingmanager.go @@ -2391,9 +2391,6 @@ func (f *fundingManager) annAfterSixConfs(completeChan *channeldb.OpenChannel, if fwdMaxHTLC > capacityMSat { fwdMaxHTLC = capacityMSat } - if fwdMaxHTLC > MaxPaymentMSat { - fwdMaxHTLC = MaxPaymentMSat - } // Create and broadcast the proofs required to make this channel // public and usable for other nodes for routing.