From 611cfe5a28b63a074aca6e8df0190001e519a14f Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sun, 27 Sep 2020 12:43:15 +0200
Subject: [PATCH] electrs: remove redundant daemonrpc option

---
 modules/electrs.nix         | 9 +--------
 modules/netns-isolation.nix | 5 +----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/modules/electrs.nix b/modules/electrs.nix
index b5a103e..f594783 100644
--- a/modules/electrs.nix
+++ b/modules/electrs.nix
@@ -41,13 +41,6 @@ in {
       default = 50001;
       description = "RPC port.";
     };
-    daemonrpc = mkOption {
-      type = types.str;
-      default = "127.0.0.1:8332";
-      description = ''
-        Bitcoin daemon JSONRPC 'addr:port' to connect
-      '';
-    };
     extraArgs = mkOption {
       type = types.separatedString " ";
       default = "";
@@ -95,7 +88,7 @@ in {
           --db-dir='${cfg.dataDir}' \
           --daemon-dir='${bitcoind.dataDir}' \
           --electrum-rpc-addr=${toString cfg.address}:${toString cfg.port} \
-          --daemon-rpc-addr=${toString cfg.daemonrpc} \
+          --daemon-rpc-addr=${builtins.elemAt bitcoind.rpcbind 0}:${toString bitcoind.rpc.port} \
           ${cfg.extraArgs}
         '';
         User = cfg.user;
diff --git a/modules/netns-isolation.nix b/modules/netns-isolation.nix
index d456fa4..cfeb253 100644
--- a/modules/netns-isolation.nix
+++ b/modules/netns-isolation.nix
@@ -298,10 +298,7 @@ in {
       cliExec = mkCliExec "liquidd";
     };
 
-    services.electrs = {
-      address = netns.electrs.address;
-      daemonrpc = "${netns.bitcoind.address}:${toString config.services.bitcoind.rpc.port}";
-    };
+    services.electrs.address = netns.electrs.address;
 
     services.spark-wallet = {
       host = netns.spark-wallet.address;