Erik Arvstedt
7f77147b60
makeShell: minor improvements
...
- import pkgs without the global config to avoid pulling in external state
- rename `path` -> `setPath`
- export `nixpkgsUnstable`
This avoids garbage collection of nixpkgs-unstable for gcrooted
shell environments (like those created by lorri)
2021-11-08 12:46:27 +01:00
Erik Arvstedt
a5730eb736
makeShell: make the help msg a shell derivation variable
...
- The message is now a nix string, which simplifies formatting.
- The message can be now be modified via overrideAttrs in client shells.
This is more effective than changing the message in Bash.
2021-11-08 12:46:27 +01:00
Jonas Nick
3f844c06f0
Merge fort-nix/nix-bitcoin#418 : update nixpkgs
...
b3e868d0afc30fe1919b658454082804783544778616254d63083e141e3e82c92df16249086abcc5b83fd845c2852c112603b3e868d0afb3e868d0af
2021-11-03 10:25:38 +00:00
Jonas Nick
2f9b9b674b
Merge fort-nix/nix-bitcoin#420 : missing sys import for error path set_onion_address
...
ae1c90997dae1c90997d
2021-11-03 09:17:12 +00:00
cadwgan0
ae1c90997d
missing sys import for error path set_onion_address
2021-11-02 23:25:55 -04:00
Erik Arvstedt
b3e868d0af
tests/regtest: disable incompatible validatepegin for liquidd
...
Otherwise liquidd startup fails. This bug was not covered by our tests,
because we're not combining `regtest` with `secure-node`.
But nixbitcoin.org does, which should suffice for now.
2021-11-02 17:40:43 +01:00
Erik Arvstedt
c30fe1919b
netns-isolation: don't auto-assign IPv6 addrs to peer links
...
This simplifies the host's address configuration.
This also removes unused addresses that are returned when resolving
container hostnames via nss-mymachines:
`getent ahosts nb-test`
2021-11-02 17:40:43 +01:00
Erik Arvstedt
6584540828
makeShell: make help message extensible
...
Users can now override help and print more help messages alongside `nixBitcoinHelp`.
2021-11-02 17:40:43 +01:00
Erik Arvstedt
0478354477
versioning: move variable
...
The variable is an internal implementation detail. Move it close to
where it's used.
2021-11-02 17:40:43 +01:00
Erik Arvstedt
8616254d63
bitcoind-rpc-public-whitelist: remove waitfornewblock
...
This is an internal testing function and it's no longer used by electrs.
2021-11-02 17:40:43 +01:00
Erik Arvstedt
083e141e3e
tests/btcpayserver: test bitcoind P2P connection in regtest
...
nbxplorer requires at least 100 blocks (coinbase maturity) in regtest.
2021-11-02 17:40:43 +01:00
Erik Arvstedt
82c92df162
tests/regtest: fix restarting bitcoind
...
Previously, the test wallet was not loaded after restarting bitcoind and
generating blocks failed.
2021-11-02 17:40:43 +01:00
Erik Arvstedt
49086abcc5
liquidd: use systemd startup notification
2021-11-02 17:40:43 +01:00
nixbitcoin
b83fd845c2
update nixpkgs
...
Includes
- update stable
- btcpayserver: 1.2.4 -> 1.3.1
- electrs: 0.9.1 -> 0.9.2
- nbxplorer: 2.2.11 -> 2.2.16
2021-11-02 14:07:32 +00:00
nixbitcoin
852c112603
Use HTTPS URL for spark-wallet GitHub node packages
...
Manually patch spark-wallet until
https://github.com/svanderburg/node2nix/pull/269 is merged
2021-11-02 14:07:28 +00:00
Jonas Nick
42258feac3
Merge fort-nix/nix-bitcoin#417 : btcpayserver: fix liquidd whitelistedPort
...
c2eb81b57ec2eb81b57ec2eb81b57e
2021-11-01 13:08:47 +00:00
nixbitcoin
c2eb81b57e
btcpayserver: fix liquidd whitelistedPort
2021-11-01 11:59:05 +00:00
Jonas Nick
41514b8667
Merge fort-nix/nix-bitcoin#416 : secure-node: stop pruning liquidd
...
bac8518e7c347a0f3aeebac8518e7c
2021-10-31 15:41:58 +00:00
Jonas Nick
bac8518e7c
secure-node: stop pruning liquidd
...
There is no security reason why pruning should be enabled and therefore it
surprises users. Turning on pruning in the first place was simply a mistake.
2021-10-31 14:37:56 +00:00
Jonas Nick
347a0f3aee
secure-node: add dummy option to determine if the preset is enabled
...
This is useful for versioning.nix.
2021-10-31 14:00:46 +00:00
Jonas Nick
3e018d0263
Merge fort-nix/nix-bitcoin#414 : Update nixpkgs-unstable, fix whitelisting local services
...
aada35fc7b1da23cd9338c3a88b2e8cc3d43f4e9aada35fc7b
2021-10-30 15:37:12 +00:00
Erik Arvstedt
aada35fc7b
minor improvements
...
- README: add matrix room
- examples/configuration.nix: explain why bitcoind is enabled by default
- btcpayserver: group lnd service settings
- clightning:
Use public onion port only when the onion service is public
This allows users to enable the onion service while announcing a
non-onion public address.
- netns-isolation: move `readOnly` attr to the top
- tests: use mkDefault to allow for easier overriding
- tests/btcpayserver: test web server response
2021-10-30 15:34:48 +02:00
Erik Arvstedt
1da23cd933
bitcoind, liquidd: add whitelisted socket
...
This allows whitelisting local services without implicitly
whitelisting all inbound onion connections, which would happen when
setting bitcoind/liquidd option `whitelist=localhost`.
Used by electrs and nbxplorer, which requires the unsafe `mempool`
permission.
2021-10-29 18:28:31 +02:00
Erik Arvstedt
8c3a88b2e8
update nixpkgs-unstable
...
Switch back from nixpkgs master to unstable.
Pkg updates:
btcpayserver: 1.2.3 -> 1.2.4
electrs: 0.9.0 -> 0.9.1
elementsd: 0.18.1.12 -> 0.21.0
lightning-pool: 0.5.0-alpha -> 0.5.1-alpha
nbxplorer: 2.2.5 -> 2.2.11
- liquidd:
add `onionPort` like in bitcoind
- tests/electrs:
remove KillSignal workaround
2021-10-29 17:59:25 +02:00
Erik Arvstedt
cc3d43f4e9
bitcoind: set onionPort in bitcoind module
...
This removes the module-level dependency from onion-services to
bitcoind.
Due to the `or false` fallback, there's no dependency added in
the reverse direction.
In particular, this allows us to not add a dependency on liquidd in
the following commit.
2021-10-28 22:24:24 +02:00
Jonas Nick
20d4240919
Merge fort-nix/nix-bitcoin#410 : joinmarket: 0.9.2 -> 0.9.3
...
d5ce1c43a8a10aa21c69721ba1aebad5ce1c43a8d5ce1c43a8
2021-10-28 09:50:22 +00:00
nixbitcoin
d5ce1c43a8
test: make joinmarket work with regtest
2021-10-27 16:08:28 +02:00
nixbitcoin
a10aa21c69
joinmarket: 0.9.2 -> 0.9.3
2021-10-27 16:02:59 +02:00
Jonas Nick
c40a7a75cc
Merge fort-nix/nix-bitcoin#412 : clightning: fix announce addr
...
b6d1928e90b6d1928e90b6d1928e90
2021-10-26 19:53:55 +00:00
kon
b6d1928e90
clightning: add public port
...
Co-authored-by: Erik Arvstedt <erik.arvstedt@gmail.com>
2021-10-26 21:34:33 +02:00
Erik Arvstedt
721ba1aeba
python-packages: separate specific-versions pkgs
...
This simplifies maintenance.
2021-10-24 21:18:56 +02:00
Jonas Nick
bfe8ac972c
Merge fort-nix/nix-bitcoin#405 : bitcoind: add separate p2p socket for tor connections
...
ec4a4dbe41df2070b44aec4a4dbe41
2021-10-21 12:17:17 +00:00
Erik Arvstedt
ec4a4dbe41
btcpayserver: fix whitelist security issue
...
Whitelisting localhost implicitly whitelists all inbound onion
connections. This prevents banning misbehaving inbound onion peers
and enables message `mempool` which can cause privacy leaks.
Instead, grant `download` as the single bitcoind whitelist permission, which
should be safe for onion peers.
Remove liquidd whitelisting because it doesn't support fine-grained permissions.
After a cursory glance at the nbxplorer code I think that nbxplorer
requires none of the other default whitelist permissions (noban, mempool,
relay).
Details: https://github.com/dgarage/NBXplorer/issues/344
2021-10-21 11:40:40 +02:00
Erik Arvstedt
df2070b44a
bitcoind: add separate p2p socket for tor connections
...
This re-enables onion tagging while still supporting untagged connections.
Onion sockets are not yet supported in the latest liquidd/elements
version 0.18.1.12 available on nixpkgs.
2021-10-21 11:40:40 +02:00
Jonas Nick
8b1b06311d
Merge fort-nix/nix-bitcoin#406 : bitcoind: one-option i2p support
...
63836127c963836127c963836127c9
2021-10-15 11:02:09 +00:00
Jonas Nick
2250b9bcb7
Merge fort-nix/nix-bitcoin#408 : joinmarket: 0.9.1 -> 0.9.2
...
3781a85c9bced1637d0759fc003ebd3781a85c9b
2021-10-15 10:58:01 +00:00
Jonas Nick
8f25bb72bd
Merge fort-nix/nix-bitcoin#407 : lnd: Add TimoutStartSec
...
40ab4b368a40ab4b368a
2021-10-15 10:57:04 +00:00
nixbitcoin
3781a85c9b
joinmarket: enable Agora as a third IRC server
2021-10-13 14:45:52 +02:00
Erik Arvstedt
ced1637d07
joinmarket: share IRC server definitions between jm and ob-watcher
...
Also add server name comments.
2021-10-13 14:44:36 +02:00
nixbitcoin
59fc003ebd
joinmarket: 0.9.1 -> 0.9.2
...
Remove "improve-genwallet" patch
2021-10-13 11:52:42 +00:00
kon
40ab4b368a
add lnd TimoutSec
2021-10-12 21:56:59 +02:00
nixbitcoin
63836127c9
bitcoind: one-option i2p support
2021-10-12 10:22:09 +00:00
Jonas Nick
06a971dfa9
Merge fort-nix/nix-bitcoin#404 : Electrs 0.9.0
...
8938eadf0cb9301ce0d9265fc1911d75b89f39576f42fa81818938eadf0c8938eadf0c
2021-10-06 15:10:34 +00:00
Erik Arvstedt
8938eadf0c
bitcoind: don't tag all incoming connections as 'Tor'
...
We're also accepting local, non-Tor connections.
2021-10-06 16:55:41 +02:00
Erik Arvstedt
b9301ce0d9
emergency fix: lnd: 0.13.1-beta -> 0.13.3-beta
...
Fixes CVE-2021-41593.
Temporarily switch to nixpkgs/master.
2021-10-06 15:34:24 +02:00
Erik Arvstedt
265fc1911d
extra-container: pin to nixpkgs-unstable
...
extra-container is now part of nixpkgs.
2021-10-06 15:34:24 +02:00
Erik Arvstedt
75b89f3957
electrs: adapt to version 0.9.0
...
- `waitfornewblock` was previously not included in the public RPC
whitelist because it's reserved for testing and marked as hidden
in bitcoind.
- electrs changed its verbosity settings. `-vv` is now the best choice
for normal usage.
- bitcoind option `dataDirReadableByGroup` is now unused.
Because it can be valuable for other use cases and implementing
it is intricate, we're keeping it for now.
- test: keep `nc` connection open because otherwise the electrs
RPC server would now close the connection before sending a response.
2021-10-06 15:34:24 +02:00
Erik Arvstedt
6f42fa8181
update nixpkgs (electrs: 0.8.11 -> 0.9.0)
2021-10-06 15:34:24 +02:00
Jonas Nick
693c646c49
Merge fort-nix/nix-bitcoin#402 : Misc. improvements
...
6d694a62690c45415c860853dedc43b73c093d3d27905e2c3ac8251cdad73c6a664b7b4d5bc810ebe61c7436442cf12d8765e57ab83a511b597f92a6a92d6a8e80f36df8f56309169365d882d910e937f61e9281391848c3dd98e5616376006d694a62696d694a6269
2021-10-06 13:21:56 +00:00
Erik Arvstedt
6d694a6269
backups: allow extraFiles to override default settings
...
By moving them to the top they take precedence over the remaining
filelist entries.
2021-10-06 11:27:52 +02:00
