From 39ab1775675ee79aa141e47d0f93579cc232e374 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Mon, 21 Aug 2017 23:33:19 -0700 Subject: [PATCH] funding: populate ChainHash in announcement messages, update signing This commit updates the tail end of the funding workflow to properly include the ChainHash field when crafting ChannelAnnouncements and the initial ChannelUpdate messages. Additionally, we now properly generate the proper signatures to match the changes to BOLT0007. --- fundingmanager.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fundingmanager.go b/fundingmanager.go index d2f537763..821d210ed 100644 --- a/fundingmanager.go +++ b/fundingmanager.go @@ -1577,11 +1577,15 @@ func (f *fundingManager) newChanAnnouncement(localPubKey, remotePubKey *btcec.Pu shortChanID lnwire.ShortChannelID, chanID lnwire.ChannelID) (*chanAnnouncement, error) { + chainHash := *f.cfg.Wallet.Cfg.NetParams.GenesisHash + // The unconditional section of the announcement is the ShortChannelID // itself which compactly encodes the location of the funding output // within the blockchain. chanAnn := &lnwire.ChannelAnnouncement{ ShortChannelID: shortChanID, + Features: lnwire.NewFeatureVector([]lnwire.Feature{}), + ChainHash: chainHash, } // The chanFlags field indicates which directed edge of the channel is @@ -1657,7 +1661,7 @@ func (f *fundingManager) newChanAnnouncement(localPubKey, remotePubKey *btcec.Pu return nil, errors.Errorf("unable to generate node "+ "signature for channel announcement: %v", err) } - bitcoinSig, err := f.cfg.SignMessage(localFundingKey, selfBytes) + bitcoinSig, err := f.cfg.SignMessage(localFundingKey, chanAnnMsg) if err != nil { return nil, errors.Errorf("unable to generate bitcoin "+ "signature for node public key: %v", err) @@ -1838,7 +1842,7 @@ func (f *fundingManager) handleInitFundingMsg(msg *initFundingMsg) { DustLimit: ourContribution.DustLimit, MaxValueInFlight: ourContribution.MaxPendingAmount, ChannelReserve: ourContribution.ChanReserve, - HtlcMinimum: uint32(ourContribution.MinHTLC), + HtlcMinimum: ourContribution.MinHTLC, FeePerKiloWeight: uint32(feePerKw), CsvDelay: uint16(remoteCsvDelay), MaxAcceptedHTLCs: ourContribution.MaxAcceptedHtlcs,