Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clightning: compatibility issue with v24.11 #321

Merged
merged 1 commit into from
Oct 8, 2024
Merged

clightning: compatibility issue with v24.11 #321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions clightning/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,28 @@ func SetPeerswapPaths(plugin *glightning.Plugin) Processor {
}
}

type AllowDeprecatedAPIs struct {
ValueBool bool `json:"value_bool"`
Source string `json:"source"`
}
type Configs struct {
AllowDeprecatedAPIs *AllowDeprecatedAPIs `json:"allow-deprecated-apis,omitempty"`
}
type ClnConfig struct {
AllowDeprecatedApis bool `json:"allow-deprecated-apis,omitempty"`
Configs *Configs `json:"configs,omitempty"`
}

func (c *ClnConfig) AllowDeprecatedAPIs() bool {
if c.AllowDeprecatedApis {
return c.AllowDeprecatedApis
}
if c.Configs != nil && c.Configs.AllowDeprecatedAPIs != nil {
return c.Configs.AllowDeprecatedAPIs.ValueBool
}
return false
}

// CheckForDeprecatedApiConfig tries to detect if allow-deprecated-apis is false
// in the CLN config. If it is set false, we print a warning and exit because
// deprecated CLN API fields might break PeerSwap.
Expand All @@ -112,17 +134,15 @@ func CheckForDeprecatedApiConfig(client *ClightningClient) Processor {
if err != nil {
return nil, err
}
var ClnConfig struct {
AllowDeprecatedApis bool `json:"allow-deprecated-apis,omitempty"`
}
err = json.Unmarshal(data, &ClnConfig)
co := &ClnConfig{}
err = json.Unmarshal(data, co)
if err != nil {
return nil, err
}
if !ClnConfig.AllowDeprecatedApis {
if !co.AllowDeprecatedAPIs() {
log.Infof("WARNING: allow-deprecated-apis=false detected in CLN config. Exiting. More info: https://github.com/ElementsProject/peerswap/issues/232")
time.Sleep(1 * time.Second)
os.Exit(1)
client.Plugin.Stop()
}
return c, nil
}
Expand Down
Loading