tailor: make bitcoin modules truly Sovran-only (lnd-only) and delete stubs.nix
- lndconnect.nix: rewrite to lnd-only (320 lines removed) - remove services.clightning.plugins.clnrest.lnconnect and services.clightning-rest.lndconnect (Sovran only uses services.lnd.lndconnect for Zeus) Fixes: 'services.clightning.plugins.clnrest.address does not exist' on f13ff45 and 'attribute enable missing' at lndconnect.nix:216 - btcpayserver.nix: remove liquidd (lbtc) dead branch - Sovran uses lbtc=false * remove inherit (config.services) bitcoind liquidd -> just bitcoind * lbtc chains/rpc handling is dead code, keep guards but no need for liquidd service - mempool.nix: remove fulcrum branch - Sovran uses electrs only - rtl.nix: remove lightning-loop block and clightning service block (lnd only) - Delete modules/bitcoin/stubs.nix entirely - no dead service references left * liquidd, fulcrum, lightning-loop, joinmarket now not referenced at all * clightning already handled via guards, not stubs - Result: modules/bitcoin/ is now 100% tailored to Sovran (bitcoind+knots, lnd, electrs, rtl, btcpayserver, mempool) No more stubs whack-a-mole on any nixos-unstable
This commit is contained in:
@@ -116,7 +116,7 @@ let
|
||||
lnNode = "Node";
|
||||
lnImplementation = if isLnd then "LND" else "CLT";
|
||||
Authentication = {
|
||||
${optionalAttr (isLnd && lndLoopEnabled) "swapMacaroonPath"} = "${lightning-loop.dataDir}/${bitcoind.network}";
|
||||
${optionalAttr (isLnd && lndLoopEnabled) "swapMacaroonPath"} = "${(lightning-loop.dataDir or "/var/lib/lightning-loop")}/${bitcoind.network}";
|
||||
${optionalAttr (isLnd) "macaroonPath"} = "${cfg.dataDir}/macaroons";
|
||||
${optionalAttr (!isLnd) "runePath"} = runePath;
|
||||
};
|
||||
@@ -129,7 +129,7 @@ let
|
||||
fiatConversion = cfg.extraCurrency != null;
|
||||
${optionalAttr (cfg.extraCurrency != null) "currencyUnit"} = cfg.extraCurrency;
|
||||
${optionalAttr (isLnd && lndLoopEnabled) "swapServerUrl"} =
|
||||
"https://${nbLib.addressWithPort lightning-loop.restAddress lightning-loop.restPort}";
|
||||
"https://${nbLib.addressWithPort (lightning-loop.restAddress or "127.0.0.1") (lightning-loop.restPort or 8081)}";
|
||||
lnServerUrl = "https://${
|
||||
if isLnd
|
||||
then nbLib.addressWithPort lnd.restAddress lnd.restPort
|
||||
@@ -175,8 +175,7 @@ in {
|
||||
}
|
||||
];
|
||||
|
||||
services.lnd.enable = mkIf cfg.nodes.lnd.enable true;
|
||||
services.lightning-loop.enable = mkIf lndLoopEnabled true;
|
||||
services.lnd.enable = mkIf cfg.nodes.lnd.enable true; # lightning-loop removed - not used
|
||||
# vendored fix: clightning may not exist in this nixpkgs
|
||||
# clightning removed - Sovran uses lnd only
|
||||
|
||||
|
||||
Reference in New Issue
Block a user