greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

electrs: remove redundant daemonrpc option

Browse Source
This commit is contained in:
Erik Arvstedt 2020-09-27 12:43:15 +02:00
parent a19d3b07c2
commit 611cfe5a28
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/electrs.nix
View File

@ -41,13 +41,6 @@ in {
default = 50001; default = 50001;
description = "RPC port."; description = "RPC port.";
}; };
daemonrpc = mkOption {
type = types.str;
default = "127.0.0.1:8332";
description = ''
Bitcoin daemon JSONRPC 'addr:port' to connect
'';
};
extraArgs = mkOption { extraArgs = mkOption {
type = types.separatedString " "; type = types.separatedString " ";
default = ""; default = "";
@ -95,7 +88,7 @@ in {
--db-dir='${cfg.dataDir}' \ --db-dir='${cfg.dataDir}' \
--daemon-dir='${bitcoind.dataDir}' \ --daemon-dir='${bitcoind.dataDir}' \
--electrum-rpc-addr=${toString cfg.address}:${toString cfg.port} \ --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} ${cfg.extraArgs}
''; '';
User = cfg.user; User = cfg.user;

5
modules/netns-isolation.nix
View File

@ -298,10 +298,7 @@ in {
cliExec = mkCliExec "liquidd"; cliExec = mkCliExec "liquidd";
}; };
services.electrs = { services.electrs.address = netns.electrs.address;
address = netns.electrs.address;
daemonrpc = "${netns.bitcoind.address}:${toString config.services.bitcoind.rpc.port}";
};
services.spark-wallet = { services.spark-wallet = {
host = netns.spark-wallet.address; host = netns.spark-wallet.address;