[v0.20.x-branch] Revert backport #10331: re-org aware channel close logic#10523
[v0.20.x-branch] Revert backport #10331: re-org aware channel close logic#10523Roasbeef merged 1 commit intov0.20.x-branchfrom
Conversation
Summary of ChangesHello @Roasbeef, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request performs a full revert of a previous backport that introduced a re-organization aware channel close mechanism and adjusted several key timing parameters. The change aims to simplify the codebase by removing the complex state machine for re-org protection during channel closures and the associated confirmation scaling logic. Consequently, the system's behavior regarding channel close confirmations, HTLC expiration, and channel policy defaults is restored to its prior state. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](proxy.php?url=https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request successfully reverts the changes introduced in #10331, which aimed to implement re-org aware channel close logic. The changes correctly remove the ChannelCloseConfs configuration, the spendConfirmationState state machine, and related functions and tests. It also reverts the MinCLTVDelta and DefaultIncomingBroadcastDelta values to their previous states. The removal of the confscale package and its associated logic is thorough. The updated comments and simplified closeObserver logic reflect the removal of the re-org protection mechanism. Overall, the revert is clean and consistent across all modified files.
2 participants
This reverts the backport of #10331 (merged via #10510).
PR #10331 introduced re-org aware channel close handling that waits for N confirmations before acting on channel closures. It also increased
DefaultIncomingBroadcastDeltafrom 10 to 16 andMinCLTVDeltafrom 18 to 24 blocks.This revert removes the chain watcher state machine changes, confirmation scaling logic, and associated tests while preserving subsequent commits (#10511, #10518).