Skip to content

Conversation

@arshbot
Copy link
Contributor

@arshbot arshbot commented Apr 20, 2022

This is duplicate of #473 which was erroneously merged and reverted by #481.

@arshbot arshbot requested review from bhandras and guggero April 20, 2022 15:49
@arshbot arshbot self-assigned this Apr 20, 2022
Copy link
Member

@bhandras bhandras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reopening!

LGTM 🚀

)
copy(senderKey[:], senderPubKey.SerializeCompressed())
copy(receiverKey[:], receiverPubKey.SerializeCompressed())
copy(senderKey[:], senderPubKey.SerializeCompressed())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: you can reverse the order of these two lines to make the diff smaller

@bhandras bhandras self-requested a review April 20, 2022 20:47
@bhandras
Copy link
Member

Found some missing bits:

  • need to update func (h HtlcOutputType) String() string
  • need to update func (h *Htlc) AddSuccessToEstimator(estimator *input.TxWeightEstimator)
  • need to update func (h *Htlc) AddTimeoutToEstimator(estimator *input.TxWeightEstimator)

Code is mostly ready though: 63c8242

Copy link
Member

@bhandras bhandras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found a few things while trying to rebase #477 to this PR that I think are worth adding so undoing my approve for now. Should be easy to add them.

@arshbot arshbot force-pushed the HtlcV3-taproot-base branch from e6ff412 to a038141 Compare April 21, 2022 01:37
@arshbot arshbot requested a review from bhandras April 21, 2022 01:37
@arshbot
Copy link
Contributor Author

arshbot commented Apr 21, 2022

Addressed those gaps, and added some more documentation @bhandras

@arshbot arshbot force-pushed the HtlcV3-taproot-base branch 3 times, most recently from 5b048e3 to a1cff82 Compare April 21, 2022 14:56
@arshbot arshbot requested review from bhandras and guggero April 21, 2022 14:58
@arshbot arshbot force-pushed the HtlcV3-taproot-base branch 2 times, most recently from 3458925 to af2d539 Compare April 21, 2022 17:52
@arshbot arshbot requested a review from bhandras April 21, 2022 17:58
copy(receiverKey[:], receiverPubKey.SerializeCompressed())
copy(senderKey[:], senderPubKey.SerializeCompressed())

randomSharedKey, err := hex.DecodeString(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not required now, but It'd be cool to have a unit test for keyspend as well.

@arshbot arshbot force-pushed the HtlcV3-taproot-base branch 2 times, most recently from 5c6d3ed to a3d2710 Compare April 21, 2022 21:24
@arshbot arshbot requested a review from bhandras April 21, 2022 21:24
Copy link
Member

@bhandras bhandras left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

In this commit we add the version 3 htlc, which is implemented with
taproot script spending the two payment paths: the claim path case, and
the timeout case.
@arshbot arshbot force-pushed the HtlcV3-taproot-base branch from a3d2710 to dec6dd7 Compare April 22, 2022 15:36
@arshbot arshbot merged commit 6deed23 into lightninglabs:master Apr 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants