diff --git a/modules/liquid.nix b/modules/liquid.nix index 8f3c2d9..15f296b 100644 --- a/modules/liquid.nix +++ b/modules/liquid.nix @@ -27,6 +27,7 @@ let (attrValues cfg.rpc.users) } ${lib.concatMapStrings (rpcbind: "rpcbind=${rpcbind}\n") cfg.rpcbind} + rpcconnect=${builtins.elemAt cfg.rpcbind 0} ${lib.concatMapStrings (rpcallowip: "rpcallowip=${rpcallowip}\n") cfg.rpcallowip} ${optionalString (cfg.rpcuser != null) "rpcuser=${cfg.rpcuser}"} ${optionalString (cfg.rpcpassword != null) "rpcpassword=${cfg.rpcpassword}"} @@ -205,17 +206,16 @@ in { cli = mkOption { readOnly = true; default = pkgs.writeScriptBin "elements-cli" '' - ${cfg.cliExec} ${pkgs.nix-bitcoin.elementsd}/bin/elements-cli -datadir='${cfg.dataDir}' "$@" + ${pkgs.nix-bitcoin.elementsd}/bin/elements-cli -datadir='${cfg.dataDir}' "$@" ''; description = "Binary to connect with the liquidd instance."; }; swapCli = mkOption { default = pkgs.writeScriptBin "liquidswap-cli" '' - ${cfg.cliExec} ${pkgs.nix-bitcoin.liquid-swap}/bin/liquidswap-cli -c '${cfg.dataDir}/elements.conf' "$@" + ${pkgs.nix-bitcoin.liquid-swap}/bin/liquidswap-cli -c '${cfg.dataDir}/elements.conf' "$@" ''; description = "Binary for managing liquid swaps."; }; - inherit (nix-bitcoin-services) cliExec; enforceTor = nix-bitcoin-services.enforceTor; }; }; diff --git a/modules/netns-isolation.nix b/modules/netns-isolation.nix index 6c6be44..aa32e2c 100644 --- a/modules/netns-isolation.nix +++ b/modules/netns-isolation.nix @@ -270,14 +270,11 @@ in { services.liquidd = { bind = netns.liquidd.address; - rpcbind = [ - "${netns.liquidd.address}" - "127.0.0.1" - ]; + rpcbind = [ netns.liquidd.address ]; rpcallowip = [ - "127.0.0.1" - ] ++ map (n: "${netns.${n}.address}") netns.liquidd.availableNetns; - cliExec = mkCliExec "liquidd"; + bridgeIp # For operator user + netns.liquidd.address + ] ++ map (n: netns.${n}.address) netns.liquidd.availableNetns; }; services.electrs.address = netns.electrs.address; diff --git a/pkgs/netns-exec/src/main.c b/pkgs/netns-exec/src/main.c index 0f31e44..916de95 100644 --- a/pkgs/netns-exec/src/main.c +++ b/pkgs/netns-exec/src/main.c @@ -11,7 +11,6 @@ static char *allowed_netns[] = { "nb-lightning-loop", - "nb-liquidd", "nb-joinmarket" };