Split sign_justice_transaction in two halves
#923
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #923 +/- ##
==========================================
+ Coverage 90.50% 91.15% +0.65%
==========================================
Files 59 59
Lines 29769 32442 +2673
==========================================
+ Hits 26942 29574 +2632
- Misses 2827 2868 +41
Continue to review full report at Codecov.
|
devrandom
reviewed
May 15, 2021
devrandom
reviewed
May 15, 2021
lightning/src/chain/keysinterface.rs
Outdated
| @@ -279,8 +279,24 @@ pub trait BaseSign { | |||
| #[cfg(any(test,feature = "unsafe_revoked_tx_signing"))] | |||
| fn unsafe_sign_holder_commitment_and_htlcs(&self, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<secp256k1::All>) -> Result<(Signature, Vec<Signature>), ()>; | |||
|
|
|||
| /// Create a signature for the given input in a transaction spending an HTLC or commitment | |||
| /// transaction output when our counterparty broadcasts an old state. | |||
| /// Create a signature for the given input in a transaction spending a HTLC transction output | |||
There was a problem hiding this comment.
Also "an HTLC" not "a HTLC". English sucks.
|
ACK |
TheBlueMatt
approved these changes
May 16, 2021
lightning/src/chain/keysinterface.rs
Outdated
| @@ -279,8 +279,24 @@ pub trait BaseSign { | |||
| #[cfg(any(test,feature = "unsafe_revoked_tx_signing"))] | |||
| fn unsafe_sign_holder_commitment_and_htlcs(&self, commitment_tx: &HolderCommitmentTransaction, secp_ctx: &Secp256k1<secp256k1::All>) -> Result<(Signature, Vec<Signature>), ()>; | |||
|
|
|||
| /// Create a signature for the given input in a transaction spending an HTLC or commitment | |||
| /// transaction output when our counterparty broadcasts an old state. | |||
| /// Create a signature for the given input in a transaction spending a HTLC transction output | |||
There was a problem hiding this comment.
Also "an HTLC" not "a HTLC". English sucks.
ariard
force-pushed
the
2021-05-split-sign-justice
branch
from
dee518a to
8b97f1d
Compare
|
Thanks for review, I think I've addressed all the grammar stuff and took code style suggestion in 8b97f1d |
devrandom
approved these changes
May 17, 2021
lightning/src/chain/keysinterface.rs
Outdated
| Err(_) => return Err(()) | ||
| let revocation_pubkey = chan_utils::derive_public_revocation_key(&secp_ctx, &per_commitment_point, &self.pubkeys().revocation_basepoint).map_err(|_| ())?; | ||
| let witness_script = { | ||
| let counterparty_delayedpubkey = match chan_utils::derive_public_key(&secp_ctx, &per_commitment_point, &self.counterparty_pubkeys().delayed_payment_basepoint) { |
There was a problem hiding this comment.
nit: here and a couple more places for .map_err, but it can also be done in a future PR
There was a problem hiding this comment.
Yes but did it for some more switches
TheBlueMatt
reviewed
May 17, 2021
ariard
force-pushed
the
2021-05-split-sign-justice
branch
from
8b97f1d to
30a41dd
Compare
added 2 commits
May 17, 2021 22:31
To avoid caller data struct storing HTLC-related information when a revokeable output is claimed on top of a commitment/second-stage HTLC transactions, we split `keysinterface::sign_justice_transaction` in two new halves `keysinterfaces::sign_justice_revoked_output` and `keysinterfaces::sign_justice_revoked_htlc`. Further, this split offers more flexibility to signer policy as a commitment revokeable output might be of a value far more significant than HTLC ones.
ariard
force-pushed
the
2021-05-split-sign-justice
branch
from
30a41dd to
6319690
Compare
TheBlueMatt
approved these changes
May 18, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To avoid caller data struct storing HTLC-related information when
a revokeable output is claimed on top of a commitment/second-stage
HTLC transactions, we split
keysinterface::sign_justice_transactionin two new halves
keysinterfaces::sign_justice_revoked_outputandkeysinterfaces::sign_justice_revoked_htlc.Further, this split offers more flexibility to signer policy as a
commitment revokeable output might be of a value far more significant
than HTLC ones.
Note to reviewers: Should we take opportunity to split further
sign_justice_revoked_outputto enable even better signer policy flexibility (e.g pre-signed transactions for the balance output, key handover for HTLC output w.r.t to watchtower interactions).Required for #642