Begin dry-up ChannelMonitor key access #555
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
Watchtower will be supported through external signer interface where a watchtower implementation may differ from a local one by the scope of key access and pre-signed datas.
Collaborator
|
I was kinda OK with it as a dirty hack in #540, but especially if its gonna be its own PR, please dont copy Storage into OnchainTxHandler - everything in it is available in ChannelKeys, co using Storage is just a full copy of it. |
TheBlueMatt
reviewed
Mar 21, 2020
added 3 commits
March 21, 2020 17:03
Rename ChannelMonitor::Storage to OnchainDetection, holder of channel state (base_key+per_commitment_point) to detect onchain transactions accordingly. Going further between splitting detection and transaction generation, we endow OnchainTxHandler with keys access. That way, in latter commits, we may remove secret keys entirely from ChannelMonitor.
Key access is provided through ChanSigner.
check_spend_local_transaction is tasked with detection of onchain local commitment transaction and generate HTLC transaction. Signing an already onchain tx isn't necessary.
TheBlueMatt
approved these changes
Mar 21, 2020
Collaborator
TheBlueMatt
left a comment
TheBlueMatt
left a comment
There was a problem hiding this comment.
Much better than it was so gonna merge. Will follow up with a PR to fix the two comments but it can wait.
|
|
||
| let onchain_detection = OnchainDetection { | ||
| keys: keys.clone(), | ||
| funding_info: Some(funding_info.clone()), |
Collaborator
There was a problem hiding this comment.
nit: unnecessary funding_info clone.
| revocation_base_key: PublicKey, | ||
| htlc_base_key: PublicKey, | ||
| } | ||
| struct OnchainDetection<ChanSigner: ChannelKeys> { |
Collaborator
There was a problem hiding this comment.
I dont think "OnchainDetection" is any better of a name. This should just be flattened and all the fields become a field directly in ChannelMonitor.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Pull some commits out of #540 to ease review process.
This start to separate key access and tx generation material from pure detection even if redeem_script lay between each category.