d9c87b6a8f
joinmarket: fix wallet creation
...
- Fix jm-wallet-seed being globally readable.
- Handle seed extraction failures.
If seed extraction fails, remove the newly created wallet.
This guarantees that wallets always have an accompanying seed.
2021-02-07 22:41:31 +01:00
7458350108
treewide: remove deprecated types.loaOf
2021-02-07 22:41:31 +01:00
9cf038939c
treewide: use mkEnableOption
2021-02-07 22:41:31 +01:00
7a97304f13
treewide: remove unit descriptions
...
Systemd's `Description` option is a misnomer (as confessed by `man systemd.unit`):
Its value is used by user-facing tools in place of the unit file name, so this option
could have been more aptly named `label` or `name`.
`Description` should only be set if the unit file name is not sufficient for naming a unit.
This is not the case for our services, except for `systemd.services.nb-netns-bridge`
whose description has been kept.
As an example how this affects users, weird journal lines like
```
nb-test systemd[1]: Starting Run clightningd...
```
are now replaced by
```
nb-test systemd[1]: Starting clightning.service...
```
2021-02-07 22:41:31 +01:00
a942177ecf
treewide: remove user descriptions
...
User descriptions are stored in the `comment` field in /etc/passwd.
In our case, these are completely redundant and don't add any useful information.
2021-02-07 22:41:30 +01:00
4f6ff408ef
treewide: remove unneeded string literals
2021-02-07 22:41:29 +01:00
e6a6c721c1
treewide: streamline 'extraConfig' descriptions
2021-02-07 22:40:11 +01:00
e774c045de
treewide: fix formatting
2021-02-07 22:40:10 +01:00
0b5b29a2a3
netns-isolation: simplify permission definition for netns-exec
...
The new definition is equivalent to the old one.
2021-02-07 22:39:06 +01:00
af2040f4c4
netns-isolation: use 'true' for systemd option
2021-02-07 22:39:05 +01:00
c246bbb36e
bitcoind, clightning, lnd: improve descriptions
...
bitcoind: The previous description of 'prune' didn't match the int-only
values supported by our option.
2021-02-07 22:39:05 +01:00
7533f12ef1
bitcoind, clightning, run-tests: minor refactoring
...
bitcoind: use builtins.toFile
clightning: use boolToString
run-tests: remove leftover var
2021-02-07 22:39:05 +01:00
f0850d3f23
btcpayserver: reorder config settings
...
Move 'bind' and 'port' next to each other and to the top.
2021-02-07 22:39:05 +01:00
d1c0ea9f85
btcpayserver: add missing systemd postgresql dependency
...
btcpayserver fails if it starts before postgresql.
2021-02-07 22:39:05 +01:00
ebd478fd0d
lnd: add option 'restOnionService'
2021-02-05 09:17:14 +01:00
a344ae95c9
move mkHiddenService to lib
2021-02-04 12:39:54 +00:00
a26ed03d77
rename nix-bitcoin-services.nix -> lib.nix
2021-02-04 12:39:48 +00:00
86d7db9940
bitcoind: add uptime to the public api whitelist
...
It is needed by lnd to check bitcoind health status since lnd-0.12.0.
2021-02-02 22:32:20 +01:00
b114d0c3b1
bitcoind: use systemd startup notification
2021-01-31 22:26:49 +01:00
332d0e70c8
bitcoind: support onion address announcing
2021-01-31 22:26:49 +01:00
9662c19ab1
onionServices: use actual user name of services
...
Previously, onionAddresses definitions in onionServices were of the form
onionAddresses.access.<service> = [<service>];
This caused failures for configurations where a service user name was
overridden or for bitcoind whose default user is 'bitcoin' instead of 'bitcoind'.
Now set the equivalent of:
onionAddresses.access.<actualServiceUser> = [<service>];
Implement this via a new option `onionAddresses.services` to make things more
readable and to work around an infinite recursion error in onionServices.
2021-01-31 22:26:49 +01:00
5c09845e6f
bitcoind: tag incoming connections as onion on enforceTor
2021-01-31 22:26:49 +01:00
035438d427
Merge #290 : JoinMarket Orderbook Watcher
...
8c125ec48c915df059f4254246cf398c125ec48c
2021-01-17 20:00:13 +00:00
8c125ec48c
joinmarket-obwatcher: add pkg & module
2021-01-17 17:40:12 +00:00
9480ada135
nodeinfo fix lnd
2021-01-17 17:13:09 +01:00
c6c14889eb
Merge #293 : Module refactorings, onionServices
...
e2922eb4ce352fc4e8fe757a66b9bd0e00c39d475f7a7962f704d8560f86323a431abaf6b883a9ac2a240d6f4a18c7842e1a45c40c4eb9bed00fe9373980cd5a41bd2a46cb7387fb9f246b05b5402bb1fffe9882485f34b094d3b266f232516d13b26d0a93562f76dd43c247e3fe5c6977b00655073eee7009e0042aa839f16c0b4ab5d76ba1b38fa32b7f91e78a609687b41a720c28dd4a0238f95b7e0d09b2e2922eb4cee2922eb4ce
2021-01-14 20:42:23 +00:00
e2922eb4ce
move rpc thread count setting to lightning modules
2021-01-14 13:25:12 +01:00
352fc4e8fe
liquid: remove insecure and redundant option 'rpcpassword'
2021-01-14 13:25:11 +01:00
757a66b9bd
liquid: move rpcuser definition to module
2021-01-14 13:25:11 +01:00
0e00c39d47
secure-node: improve layout
2021-01-14 13:25:11 +01:00
5f7a7962f7
backups: remove redundant option 'program'
...
Not needed until we support other backup backends.
2021-01-14 13:25:11 +01:00
04d8560f86
secure-node: remove qrencode, tor from systemPackages
...
Keep jq which is useful for analyzing service cli output.
2021-01-14 13:25:10 +01:00
323a431aba
improve nodeinfo
...
- enable usage outside of secure-node.nix
- use json as the output format
- show ports
- also show local addresses, which is particularly useful when
netns-isolation is enabled
- only show enabled services
2021-01-14 13:25:10 +01:00
f6b883a9ac
remove webindex
...
This module is outdated and incomplete. We can readd an improved version in
the future.
Move nanopos nginx proxy tests to the nanopos test.
2021-01-14 13:25:10 +01:00
2a240d6f4a
enable-tor: disable default onion services for clightning, lnd, btcpayserver
...
In case of btcpayserver the default onion service is a security risk
because any visitor can register an admin account on a freshly setup node.
2021-01-14 13:25:09 +01:00
18c7842e1a
modules: show warnings for obsolete options
2021-01-14 13:25:09 +01:00
45c40c4eb9
versioning: simplify assertion evaluation
2021-01-14 13:25:09 +01:00
bed00fe937
lnd: use onionServices for address announcing
2021-01-14 13:25:09 +01:00
3980cd5a41
clightning: use onionServices for address announcing
2021-01-14 13:25:08 +01:00
bd2a46cb73
spark-wallet: use onionServices
...
Also remove the unneeded definition of ReadWritePaths because the
service doesn't need write access to onion files.
2021-01-14 13:25:08 +01:00
87fb9f246b
add 'enable-tor' preset
...
Move 'enforceTor' and onion-service definitions from secure-node.nix.
Use the onionServices module to define onion services.
Onion services now automatically work for services that bind to an INADDR_ANY (`0.0.0.0`) address.
2021-01-14 13:25:08 +01:00
05b5402bb1
add nix-bitcoin.onionServices
2021-01-14 13:25:07 +01:00
fffe988248
onionAddresses: add readonly option 'dataDir'
...
Used by 'onionServices' in a later commit for services that announce
their onion address.
2021-01-14 13:25:07 +01:00
5f34b094d3
onionAddresses: improve script
...
- use -e to check for existence of /var/lib/tor/state, use shorter
polling interval
- clear existing dataDir contents to avoid accumulating obsolete data
- use concatMapStrings instead of foldl'
2021-01-14 13:25:07 +01:00
b266f23251
onionAddresses: use service 'script' option
...
This also makes the script stop on errors.
2021-01-14 13:25:07 +01:00
6d13b26d0a
onionAddresses: add more precise type for option 'access'
2021-01-14 13:25:06 +01:00
93562f76dd
onionAddresses: remove redundant option 'enable'
...
The service can be disabled via `onion-addresses.access = mkForce {};`
Also remove redundant description.
2021-01-14 13:25:06 +01:00
43c247e3fe
onionAddresses: use StateDirectory instead of tmpfiles
...
Simplifies the dataDir setup.
2021-01-14 13:25:06 +01:00
5c6977b006
rename onion-chef -> nix-bitcoin.onionAddresses
...
This clarifies its function.
2021-01-14 13:25:05 +01:00
09e0042aa8
spark-wallet: add consistent address options
2021-01-14 13:25:05 +01:00
39f16c0b4a
liquidd: add consistent address options
2021-01-14 13:25:05 +01:00
b5d76ba1b3
electrs: add consistent address options
2021-01-14 13:25:04 +01:00
8fa32b7f91
btcpayserver: add consistent address options
2021-01-14 13:25:04 +01:00
e78a609687
clightning: add consistent address options
...
Also remove option 'autolisten'. This option has no effect because
option 'bind-addr' is always set.
2021-01-14 13:25:04 +01:00
b41a720c28
lnd: add consistent address options
...
Also fix btcpayserver by connecting to the lnd restAddress instead of the p2p address.
2021-01-14 13:25:03 +01:00
dd4a0238f9
bitcoind: group rpc options under parent option 'rpc'
2021-01-14 13:25:03 +01:00
5b7e0d09b2
bitcoind: add consistent address options
2021-01-14 13:25:03 +01:00
41a6be6552
Merge #297 : joinmarket: add enforceTor to firewall scripts on netns-level
...
71ee16d76771ee16d767
2021-01-10 23:11:08 +00:00
e3a45fcc0c
joinmarket: add rpcWalletFile option
...
The joinmarket docs recommend using a separate wallet to avoid mixing up jm and
default wallet.
2021-01-10 21:52:27 +00:00
71ee16d767
joinmarket: add enforceTor to firewall scripts on netns-level
2021-01-04 16:09:20 +00:00
79f4723cda
lightning-charge: remove package and module
2021-01-01 19:16:46 +00:00
58de79d401
nanopos: remove package and module
2021-01-01 17:37:30 +00:00
da674d1ccf
Merge #292 : joinmarket: always synchronize secrets.jm-wallet-password
...
ed636dd070ed636dd070
2020-12-30 19:18:56 +00:00
ed636dd070
joinmarket: always synchronize secrets.jm-wallet-password
...
secrets.jm-wallet-password is always needed by joinmarket, not just when
joinmarket.yieldgenerator.enable
2020-12-30 16:49:50 +00:00
edc657d138
btcpayserver: add rootpath option
2020-12-30 16:47:50 +00:00
f89498d4fc
clboss: add module
2020-12-22 09:40:00 +00:00
7b32a78de2
Merge #284 : Fix containers
...
2bfb4efbd83403795c86ff94985b8bc8e73c959e44b06aea5aa359cdfb66a5a2fc72742bfb4efbd82bfb4efbd8
2020-12-21 12:24:14 +00:00
c8e73c959e
fix 'hardened' profile for NixOS 20.09
...
The 'scudo' memory allocator set by the 'hardened' profile breaks some
services on 20.09.
The fix for NixOS unstable (https://github.com/NixOS/nixpkgs/pull/104052 )
is ineffective on 20.09.
As a workaround, add a custom 'hardened' preset that uses the default allocator.
2020-12-18 19:56:56 +01:00
fdfafb2f40
joinmarket: 0.7.4 -> 0.8.0-bcfa7eb
...
Update to 0.8.0 with hotfix for genwallet script
Includes module versioning error with migration instructions
2020-12-17 11:12:58 +00:00
5feb9e3eae
lnd: fix rpc/rest port configuration
2020-12-07 14:38:36 +01:00
1d44b99340
add curated clightning plugins
2020-11-18 20:21:34 -06:00
f1681f5b45
add option nix-bitcoin.pkgs, remove overlay
...
This works around a nixpkgs bug where overlays are ignored in containers.
2020-11-09 22:10:07 +01:00
b1a5f5e7b9
don't add service-only pkgs to systemPackages
...
These packages are not useful in shell environemnts.
2020-11-09 22:10:07 +01:00
e39ad358a4
lnd: remove unused bitcoind from PATH
2020-11-09 22:10:07 +01:00
59e128a994
joinmarket: add payjoin configuration
2020-11-06 08:51:25 +00:00
f29f04c0c4
secure-node: LND no longer requires ControlPort
...
Onion service is now generated through mkHiddenService function.
2020-11-06 08:51:23 +00:00
0972af55f1
netns: fix setup service restarts
2020-11-03 21:55:13 +01:00
63a464431b
netns: fail when netns already exists
...
Under normal circumstances, service-specific netns should never exist
before the netns setup service starts.
An existing netns is a genuine error that should not be silently ignored.
2020-11-03 21:55:13 +01:00
b4b607dfa5
netns: simplify firewall setup
2020-10-29 22:36:20 +01:00
25639cec42
netns: fix error msg when starting netns
...
Previously, the failing initial `netns delete` resulted in a
"Cannot remove namespace file ..." error visible in the journal
and status output.
2020-10-29 21:21:30 +01:00
67068afd6b
netns: fix error when stopping netns
...
A short time after `netns delete` finishes, the peer link in the main
netns is automatically removed.
When `link del` is run before that, it fails with
`Cannot find device "nb-veth-br-*"` and the netns service enters a failed state.
2020-10-29 21:21:30 +01:00
8da01fe8a6
lightning-loop: allow RPC access from main netns
...
Note that this also exposes the REST server, which is secured by
macaroon auth like the RPC server.
2020-10-29 21:21:29 +01:00
d76b080b74
lightning-loop: add RPC and REST server options
2020-10-29 21:21:29 +01:00
e66636ef0e
liquidd: use type str for rpcbind
2020-10-29 21:21:29 +01:00
de23fdd377
lnd: use type str for rpclisten, restlisten
2020-10-29 21:21:28 +01:00
8b053326cc
bitcoind: use type str for rpcbind
...
Extra RPC bind addresses can still be added via extraConfig.
2020-10-29 21:21:28 +01:00
6903e8afcc
netns-liquidd: allow RPC access from main netns
2020-10-29 21:21:28 +01:00
82f4901880
netns-lnd: allow RPC access from main netns
2020-10-29 21:21:27 +01:00
58d24e735d
netns-bitcoind: allow RPC access from main netns
2020-10-29 21:21:27 +01:00
e0675cb256
move enforceTor logic to service modules
...
This enables tor support for services without using secure-node.nix
2020-10-29 21:21:27 +01:00
0cc8caa737
lnd: only set tor.active on enforceTor
...
This also enables the test scenario 'netnsRegtest' introduced in a
later commit by fixing the following bug:
For unknown reasons, when tor.active=true and tor is not running, lnd
fails with a tor connection error on netns-isolation, but runs fine
without netns-isolation.
2020-10-29 21:21:26 +01:00
5e0e16529c
netns: fix default addressblock value type
...
Also remove redundant definition in secure-node.nix
2020-10-20 18:21:37 +02:00
6933b0ef47
Merge #251 : Services: Auto-enable dependencies
...
67e49fe41567e49fe415
2020-10-20 11:17:10 +00:00
67e49fe415
services: auto-enable dependencies
2020-10-19 14:55:59 +02:00
486f385fdd
lightning-loop: 0.9.0 -> 0.10.0
...
Includes macaroon authentication
2020-10-19 08:59:14 +00:00
06cba7b519
Merge #249 : Add regtest support
...
9951f10e741f96ca67c5eb42fc8e0606b2ec5b02975b30c90e031df4231f848c4c6eda96b08f5d60bd2145dc77001f8fe8d36f4715ac2a46efd141a175ec85bea21935c252ecb1a8629223937aee006247d611b5ef127b186c3c0f32f3c99ec24ac5d363abd32cde30ddadaed3da9e928e20979951f10e74
2020-10-17 13:04:27 +00:00
d3ece59919
add module 'versioning'
2020-10-16 23:23:00 +02:00
06b2ec5b02
joinmarket: add regtest support
2020-10-16 18:01:52 +02:00
975b30c90e
joinmarket: don't hardcode bitcoind rpc port
2020-10-16 18:01:52 +02:00
031df4231f
joinmarket: move comment out of config file
2020-10-16 18:01:52 +02:00
848c4c6eda
joinmarket: add variable 'bitcoind'
2020-10-16 18:01:52 +02:00
96b08f5d60
btcpayserver: add regtest support
2020-10-16 18:01:52 +02:00
bd2145dc77
btcpayserver: add 'port' option
2020-10-16 18:01:51 +02:00
001f8fe8d3
btcpayserver: use option bitcoind.rpc.port
2020-10-16 18:01:51 +02:00
6f4715ac2a
electrs: add regtest support
2020-10-16 18:01:51 +02:00
46efd141a1
lightning-loop: add regtest support
2020-10-16 18:01:51 +02:00
75ec85bea2
lnd: add regtest support
2020-10-16 18:01:51 +02:00
1935c252ec
lnd: remove redundant option 'bitcoind-host'
...
Also set bitcoind rpc port.
2020-10-16 18:01:51 +02:00
b1a8629223
lnd: add variable 'bitcoind'
2020-10-16 18:01:51 +02:00
937aee0062
spark-wallet: add regtest support
2020-10-16 18:01:50 +02:00
47d611b5ef
spark-wallet: use tor rate provider only when enforceTor
2020-10-16 18:01:50 +02:00
127b186c3c
spark-wallet: simplify start script
...
Also:
- quote paths
- use long form args
2020-10-16 18:01:50 +02:00
0f32f3c99e
clightning: add regtest support
2020-10-16 18:01:50 +02:00
c24ac5d363
clightning: remove redundant option 'bitcoin-rpcconnect'
2020-10-16 18:01:50 +02:00
abd32cde30
clightning: enable config file read access for group
...
Enables lightning-cli group access when nonstandard config options are set.
2020-10-16 18:01:50 +02:00
ddadaed3da
clightning: always use bind-addr in config
...
bind-addr can't be null.
2020-10-16 18:01:50 +02:00
9e928e2097
bitcoind: add regtest support
...
Remove unsupported option 'testnet'.
2020-10-16 18:01:49 +02:00
7d1797cec7
clightning: add option 'extraConfig'
2020-10-16 16:46:56 +02:00
e0117d56d1
spark-wallet: fix always-on onion-chef setting
...
Previously, the service failed when onion-service was disabled.
2020-10-16 16:46:55 +02:00
480d0d3959
liquid: fix bitcoin rpc settings
...
- Remove redundant option mainchainrpchost.
This option is already provided by bitcoind.
- Set a working default for rpcport and rpcuser.
Enables use without secure-node.
2020-10-16 16:46:55 +02:00
9aa19c3fdd
extract operator module
2020-10-16 16:46:55 +02:00
2dd1a741f7
modules: group imports
2020-10-16 16:46:55 +02:00
36358066e4
spark-wallet: don't disable tor when onion-service is disabled
...
This fixes modules-only usage.
We can leave enabling tor and tor.client to secure-node.nix, on which
spark-wallet has a strict dependency.
2020-10-16 15:53:33 +02:00
24069aa2c6
electrs: add option 'monitoringPort'
2020-09-30 11:26:41 +02:00
611cfe5a28
electrs: remove redundant daemonrpc option
2020-09-30 11:26:41 +02:00
a19d3b07c2
electrs: add variable 'bitcoind'
2020-09-30 11:26:41 +02:00
a6dde36b87
electrs: use consistent args formatting
...
One line per arg.
2020-09-30 11:26:40 +02:00
c051544d46
Merge #234 : loop: v0.8.1 -> v0.9.0
...
a89a3e934f24b506ff8ae7c5f956ea4a503f57bda89a3e934f24b506ff8aa89a3e934fa89a3e934f
2020-09-29 17:53:09 +00:00
73f4275d2a
backups: add btcpayserver database
2020-09-24 17:12:08 +00:00
e7c5f956ea
lightning-loop: update module
...
* commandlineArgs -> configFile
* introduce tls certs
* loop dataDir
* fix formatting and descriptions
Warning: Manual migration of existing loop data directory necessary
2020-09-24 16:40:11 +00:00
4cf31f8612
Merge #164 : Add JoinMarket Clientserver
...
dd882753e6d0701f518cd6d3e8ff62cce27da2ec173891fa5b263525d724f00d1d24c5dd882753e6
2020-09-22 17:16:08 +00:00
36c9c39d80
Deprecate lightning-charge and nanopos
...
Because we have btcpayserver now, nanopos is not really needed any more. Nanopos
was meant to be just a PoC. Lightning charge can be removed because nanopos is
the only module that depends on it.
2020-09-22 14:05:51 +00:00
d0701f518c
joinmarket: automatically generate wallet
2020-09-22 13:50:49 +00:00
cce27da2ec
backups: add joinmarket datadir to includelist
2020-09-22 13:50:43 +00:00
173891fa5b
joinmarket: add module
2020-09-22 13:50:37 +00:00
263525d724
nix-bitcoin-services: add nb-services.privileged helper
2020-09-22 13:43:15 +00:00
3cfb9d074b
btcpayserver: sqlite -> postgresql
2020-09-17 10:17:33 +00:00
f93c3c8405
backups: add nbxplorer and btcpayserver datadir to includelist
2020-09-15 12:09:33 +00:00
605b37c16e
nodeinfo: add btcpayserver onion
2020-09-15 12:09:31 +00:00
15b574faa7
nbxplorer/btcpayserver: add module
2020-09-15 12:09:12 +00:00
46d681a17e
lnd: generate custom macaroons
...
Create new `macaroon` option that allows any module to place its own
custom macaroon in the lnd RuntimeDirectory `/run/lnd`.
2020-09-15 12:09:02 +00:00
6f032e3c40
lnd: fix mnemonic file access vulnerability
...
Previously, the file was readable by 'other' for a short time after
creation.
2020-09-15 12:09:00 +00:00
b97584f5cb
netns: allow return traffic to outgoing connections
2020-09-15 12:08:58 +00:00
9d610991be
bitcoind: remove custom rpc user names
...
Simpler.
We've just removed option 'bitcoind.rpcuser', so we can also remove the
old name 'bitcoinrpc'.
2020-08-27 11:39:26 +02:00
1408403dec
bitcoind: clarify how bitcoin-cli RPC access is enabled
...
It's not immediately clear why rpcuser/rpcpassword are needed in addition to the rpcauth
config entries.
2020-08-26 22:52:47 +02:00
4790c601a1
bitcoind: move rpc user config to bitcoind
...
This enables modules-only usage.
The privileged user is needed by bitcoind (cli), the public user is
needed by other services.
2020-08-26 22:52:47 +02:00
876cfadf1a
bitcoind: add rpc user option 'passwordHMACFromFile'
...
This allows adding additional rpc users without the need for
user-specific code in preStart.
2020-08-26 22:52:47 +02:00
59434e79f0
bitcoind: simplify default rpc user name config
2020-08-26 21:16:32 +02:00
205829b91f
bitcoind: remove whitespace
2020-08-26 21:16:32 +02:00
91ebc2d517
netns-exec: simplify installation
2020-08-25 14:53:12 +02:00
Erik Arvstedt
nixbitcoin
Martin Milata
Jonas Nick
kon
Ian Shipman