funding: populate the HtlcPoint during the funding workflow

This commit is contained in:
Olaoluwa Osuntokun
2017-11-14 20:33:14 -08:00
parent 8b0de51003
commit 4700c1be04

View File

@@ -836,6 +836,7 @@ func (f *fundingManager) handleFundingOpen(fmsg *fundingOpenMsg) {
RevocationBasePoint: copyPubKey(msg.RevocationPoint), RevocationBasePoint: copyPubKey(msg.RevocationPoint),
PaymentBasePoint: copyPubKey(msg.PaymentPoint), PaymentBasePoint: copyPubKey(msg.PaymentPoint),
DelayBasePoint: copyPubKey(msg.DelayedPaymentPoint), DelayBasePoint: copyPubKey(msg.DelayedPaymentPoint),
HtlcBasePoint: copyPubKey(msg.HtlcPoint),
}, },
} }
err = reservation.ProcessSingleContribution(remoteContribution) err = reservation.ProcessSingleContribution(remoteContribution)
@@ -868,6 +869,7 @@ func (f *fundingManager) handleFundingOpen(fmsg *fundingOpenMsg) {
RevocationPoint: ourContribution.RevocationBasePoint, RevocationPoint: ourContribution.RevocationBasePoint,
PaymentPoint: ourContribution.PaymentBasePoint, PaymentPoint: ourContribution.PaymentBasePoint,
DelayedPaymentPoint: ourContribution.DelayBasePoint, DelayedPaymentPoint: ourContribution.DelayBasePoint,
HtlcPoint: ourContribution.HtlcBasePoint,
FirstCommitmentPoint: ourContribution.FirstCommitmentPoint, FirstCommitmentPoint: ourContribution.FirstCommitmentPoint,
} }
err = f.cfg.SendToPeer(fmsg.peerAddress.IdentityKey, &fundingAccept) err = f.cfg.SendToPeer(fmsg.peerAddress.IdentityKey, &fundingAccept)
@@ -948,6 +950,7 @@ func (f *fundingManager) handleFundingAccept(fmsg *fundingAcceptMsg) {
RevocationBasePoint: copyPubKey(msg.RevocationPoint), RevocationBasePoint: copyPubKey(msg.RevocationPoint),
PaymentBasePoint: copyPubKey(msg.PaymentPoint), PaymentBasePoint: copyPubKey(msg.PaymentPoint),
DelayBasePoint: copyPubKey(msg.DelayedPaymentPoint), DelayBasePoint: copyPubKey(msg.DelayedPaymentPoint),
HtlcBasePoint: copyPubKey(msg.HtlcPoint),
}, },
} }
remoteContribution.CsvDelay = f.cfg.RequiredRemoteDelay(resCtx.chanAmt) remoteContribution.CsvDelay = f.cfg.RequiredRemoteDelay(resCtx.chanAmt)
@@ -2086,6 +2089,7 @@ func (f *fundingManager) handleInitFundingMsg(msg *initFundingMsg) {
FundingKey: ourContribution.MultiSigKey, FundingKey: ourContribution.MultiSigKey,
RevocationPoint: ourContribution.RevocationBasePoint, RevocationPoint: ourContribution.RevocationBasePoint,
PaymentPoint: ourContribution.PaymentBasePoint, PaymentPoint: ourContribution.PaymentBasePoint,
HtlcPoint: ourContribution.HtlcBasePoint,
DelayedPaymentPoint: ourContribution.DelayBasePoint, DelayedPaymentPoint: ourContribution.DelayBasePoint,
FirstCommitmentPoint: ourContribution.FirstCommitmentPoint, FirstCommitmentPoint: ourContribution.FirstCommitmentPoint,
ChannelFlags: lnwire.FFAnnounceChannel, ChannelFlags: lnwire.FFAnnounceChannel,