highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-29 10:09:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5335 from guggero/abandonchannel-no-dev

Browse Source 
RPC/CLI: Allow abandonchannel to be used in regular build
This commit is contained in:
Olaoluwa Osuntokun
2021-06-23 16:05:34 -07:00
committed by GitHub
parent 29d0b6491e 3b712bf722
commit 1287328678
5 changed files with 753 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rpcserver.go
View File

@ -2371,8 +2371,13 @@ func (r *rpcServer) AbandonChannel(_ context.Context,
// If this isn't the dev build, then we won't allow the RPC to be
// executed, as it's an advanced feature and won't be activated in
// regular production/release builds except for the explicit case of
// externally funded channels that are still pending.
if !in.PendingFundingShimOnly && !build.IsDevBuild() {
// externally funded channels that are still pending. Due to repeated
// requests, we also allow this requirement to be overwritten by a new
// flag that attests to the user knowing what they're doing and the risk
// associated with the command/RPC.
if !in.IKnowWhatIAmDoing && !in.PendingFundingShimOnly &&
!build.IsDevBuild() {
return nil, fmt.Errorf("AbandonChannel RPC call only " +
"available in dev builds")
}
@ -2413,7 +2418,9 @@ func (r *rpcServer) AbandonChannel(_ context.Context,
// PSBT) on the channel so we don't need to use the thaw height.
isShimFunded := dbChan.ThawHeight > 0
isPendingShimFunded := isShimFunded && dbChan.IsPending
if in.PendingFundingShimOnly && !isPendingShimFunded {
if !in.IKnowWhatIAmDoing && in.PendingFundingShimOnly &&
!isPendingShimFunded {
return nil, fmt.Errorf("channel %v is not externally "+
"funded or not pending", chanPoint)
}