From 72700d7472429d2a7651bc5a3b72ca065df61ee4 Mon Sep 17 00:00:00 2001 From: grubles Date: Wed, 5 Jun 2024 08:24:44 -0400 Subject: [PATCH 1/3] config: fix cln listconfig output so it properly matches how liquidswaps is set in the config file --- clightning/clightning.go | 2 +- clightning/options.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clightning/clightning.go b/clightning/clightning.go index 0995441c..ee750af8 100644 --- a/clightning/clightning.go +++ b/clightning/clightning.go @@ -356,7 +356,7 @@ func (cl *ClightningClient) SetPeerswapConfig(config *Config) { LiquidRpcHost: config.Liquid.RpcHost, LiquidRpcPort: config.Liquid.RpcPort, LiquidRpcWallet: config.Liquid.RpcWallet, - LiquidDisabled: *config.Liquid.LiquidSwaps, + LiquidEnabled: *config.Liquid.LiquidSwaps, PeerswapDir: config.PeerswapDir, } } diff --git a/clightning/options.go b/clightning/options.go index e91b295a..07bdc950 100644 --- a/clightning/options.go +++ b/clightning/options.go @@ -10,7 +10,7 @@ const ( liquidRpcUserOption = "peerswap-elementsd-rpcuser" liquidRpcPasswordOption = "peerswap-elementsd-rpcpassword" liquidRpcPasswordFilepathOption = "peerswap-elementsd-rpcpasswordfile" - liquidDisabledOption = "peerswap-elementsd-disabled" + liquidEnabledOption = "peerswap-elementsd-enabled" liquidRpcWalletOption = "peerswap-elementsd-rpcwallet" bitcoinRpcHostOption = "peerswap-bitcoin-rpchost" @@ -28,7 +28,7 @@ var legacyOptions = []string{ liquidRpcUserOption, liquidRpcPasswordOption, liquidRpcPasswordFilepathOption, - liquidDisabledOption, + liquidEnabledOption, liquidRpcWalletOption, bitcoinRpcHostOption, bitcoinRpcPortOption, @@ -53,7 +53,7 @@ type PeerswapClightningConfig struct { LiquidRpcHost string `json:"liquid.rpchost"` LiquidRpcPort uint `json:"liquid.rpcport"` LiquidRpcWallet string `json:"liquid.rpcwallet"` - LiquidDisabled bool `json:"liquid.disabled"` + LiquidEnabled bool `json:"liquid.enabled"` PeerswapDir string `json:"peerswap-dir"` } @@ -112,7 +112,7 @@ func (cl *ClightningClient) RegisterOptions() error { return err } - err = cl.Plugin.RegisterNewBoolOption(liquidDisabledOption, "enable/disable liquid", false) + err = cl.Plugin.RegisterNewBoolOption(liquidEnabledOption, "enable/disable liquid", false) if err != nil { return err } From d52c8057dd81230b902de1ed98bc9f5f259ecc8d Mon Sep 17 00:00:00 2001 From: grubles Date: Thu, 6 Jun 2024 08:19:31 -0400 Subject: [PATCH 2/3] quick fixups Co-authored-by: bruwbird --- clightning/clightning.go | 2 +- clightning/options.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clightning/clightning.go b/clightning/clightning.go index ee750af8..5f691277 100644 --- a/clightning/clightning.go +++ b/clightning/clightning.go @@ -356,7 +356,7 @@ func (cl *ClightningClient) SetPeerswapConfig(config *Config) { LiquidRpcHost: config.Liquid.RpcHost, LiquidRpcPort: config.Liquid.RpcPort, LiquidRpcWallet: config.Liquid.RpcWallet, - LiquidEnabled: *config.Liquid.LiquidSwaps, + LiquidSwaps: *config.Liquid.LiquidSwaps, PeerswapDir: config.PeerswapDir, } } diff --git a/clightning/options.go b/clightning/options.go index 07bdc950..4b741e1f 100644 --- a/clightning/options.go +++ b/clightning/options.go @@ -10,7 +10,7 @@ const ( liquidRpcUserOption = "peerswap-elementsd-rpcuser" liquidRpcPasswordOption = "peerswap-elementsd-rpcpassword" liquidRpcPasswordFilepathOption = "peerswap-elementsd-rpcpasswordfile" - liquidEnabledOption = "peerswap-elementsd-enabled" + liquidSwapsOption = "peerswap-elementsd-swaps" liquidRpcWalletOption = "peerswap-elementsd-rpcwallet" bitcoinRpcHostOption = "peerswap-bitcoin-rpchost" @@ -53,7 +53,7 @@ type PeerswapClightningConfig struct { LiquidRpcHost string `json:"liquid.rpchost"` LiquidRpcPort uint `json:"liquid.rpcport"` LiquidRpcWallet string `json:"liquid.rpcwallet"` - LiquidEnabled bool `json:"liquid.enabled"` + LiquidSwaps bool `json:"liquid.swaps"` PeerswapDir string `json:"peerswap-dir"` } From fbe6cfb679a3e3ba274f9ae786dd69a5915e9f08 Mon Sep 17 00:00:00 2001 From: grubles Date: Fri, 7 Jun 2024 16:46:38 -0400 Subject: [PATCH 3/3] rename the legacy option too --- clightning/options.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clightning/options.go b/clightning/options.go index 4b741e1f..e5984d56 100644 --- a/clightning/options.go +++ b/clightning/options.go @@ -28,7 +28,7 @@ var legacyOptions = []string{ liquidRpcUserOption, liquidRpcPasswordOption, liquidRpcPasswordFilepathOption, - liquidEnabledOption, + liquidSwapsOption, liquidRpcWalletOption, bitcoinRpcHostOption, bitcoinRpcPortOption, @@ -112,7 +112,7 @@ func (cl *ClightningClient) RegisterOptions() error { return err } - err = cl.Plugin.RegisterNewBoolOption(liquidEnabledOption, "enable/disable liquid", false) + err = cl.Plugin.RegisterNewBoolOption(liquidSwapsOption, "enable/disable liquid", false) if err != nil { return err }