Commit graph

2122 commits

Author SHA1 Message Date
Erik Arvstedt
9a044fbfed
mempool: remove unneded nginx config files
mempool.conf, nginx.conf were not used in nix-bitcoin.
2025-06-02 10:46:54 +02:00
Erik Arvstedt
710a92d18c
mempool: improve comments 2025-06-02 10:46:54 +02:00
Erik Arvstedt
d61099a535
mempool: minor refactorings
- Use `sourceRoot`
- Allow `generate.sh` to directly trigger the build of `nodeModules`.
  Needed by mempool 3.2.1, where `mempool-backend` has multiple fixed output
  derivation dependencies, which can only be updated if they can be
  built directly.
2025-06-02 10:46:52 +02:00
Erik Arvstedt
c48b99782d
mempool: fix version
Remove `v` prefix of mempool drv versions: `v2.5.0` -> `2.5.0`
2025-06-02 10:32:32 +02:00
Jonas Nick
a06d1d8118
Merge fort-nix/nix-bitcoin#784: update nixpkgs
343bf4731c charge-lnd: remove electrum server support (Erik Arvstedt)
b111cf9c57 update nixpkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 343bf4731c

Tree-SHA512: 912b96fc4ea47ada176f05fa2c71d71bc94b37f0e42af23b41a44b8ed46d3ad3cd5b403ccabb05342c3f52ad420e57249bac5dc632147761619b969b79dc07a4
2025-05-25 15:30:31 +00:00
Erik Arvstedt
343bf4731c
charge-lnd: remove electrum server support
This has been removed upstream:
481ccf5282
2025-05-25 13:28:21 +02:00
Erik Arvstedt
b111cf9c57
update nixpkgs
btcpayserver: 2.1.0 -> 2.1.1
charge-lnd: 0.2.13 -> 0.3.0
clightning: 25.02.1 -> 25.02.2
2025-05-25 12:02:31 +02:00
Jonas Nick
e7e6353b3a
Merge fort-nix/nix-bitcoin#783: bitcoind: remove upper limit of option dbcache
c65cfdcbec bitcoind: remove upper limit of option `dbcache` (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK c65cfdcbec

Tree-SHA512: a29aa43684aa05ec703a0be78cc4fcf6687d84aabde257dcca3f9eb40d31a8a9d41a4f68ee433fbb19ff027bc9e129fcde850dcca411895ab735baa8e148e18b
2025-05-24 04:56:37 +00:00
Jonas Nick
03c154bbaa
Merge fort-nix/nix-bitcoin#782: trustedcoin: 2024-11-15 -> 0.8.4
44662a8fa5 trustedcoin: 2024-11-15 -> 0.8.4 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 44662a8fa5

Tree-SHA512: 532289c866b8c40603c2dbadea4305d4a15bdcf524caeb277062d48cfac5141230ad309e7ef3ce98828871ca61253a55b4834f5d86f04e3c00997e4e4e574a37
2025-05-24 04:52:18 +00:00
Erik Arvstedt
c65cfdcbec
bitcoind: remove upper limit of option dbcache
The upper limit has been removed.
See item `The maximum allowed value...` at
https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-29.0.md#updated-settings
2025-05-22 15:04:37 +02:00
Erik Arvstedt
44662a8fa5
trustedcoin: 2024-11-15 -> 0.8.4 2025-05-22 10:42:46 +02:00
Jonas Nick
52809afbf4
Merge fort-nix/nix-bitcoin#780: clightning: set service as active only after clnrest has started
ce6244cc69 clightning: set service as active only after clnrest has started (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK ce6244cc69

Tree-SHA512: e92df9fc5f42ad59eb05421e1645012fc98a8bd020215fa894d22bdde8b2860b6462c1db96b4c957e256beac9b93b76336bad9eb313c0b5cc727fffbf6b42970
2025-05-21 20:11:12 +00:00
Erik Arvstedt
ce6244cc69
clightning: set service as active only after clnrest has started 2025-05-20 22:42:41 +02:00
Jonas Nick
1586a34e90
Merge fort-nix/nix-bitcoin#776: bitcoind-rpc-public-whitelist: add getblockfrompeer
a2a0174d0f bitcoind-rpc-public-whitelist.nixbitcoind-rpc-public-whitelist: add `getblockfrompeer` (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK a2a0174d0f

Tree-SHA512: cfcb21239da22c2d051f7dfbbf3a3390a0c06f09f196d2b6e227b25518063c755064228081882e11ff85a5297b9dd3da6402b395323fcb4615c72ea599615588
2025-05-17 07:01:15 +00:00
Jonas Nick
f61e4c3910
Merge fort-nix/nix-bitcoin#775: nbxplorer: init at 2.5.26
742eb2e401 nbxplorer: init at 2.5.26 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 742eb2e401

Tree-SHA512: 734f2e5cb5d54a38785db70efc87d40f35ccf63a7ab018fe37d34556a0c8a2312a8b9872409fc1fd32d5614d450281b0961e0390cb035d3b513111cb12ec8aed
2025-05-17 06:59:09 +00:00
Erik Arvstedt
a2a0174d0f
bitcoind-rpc-public-whitelist.nixbitcoind-rpc-public-whitelist: add getblockfrompeer
This is used by nbxplorer since v2.5.24 on pruned nodes:
https://github.com/dgarage/NBXplorer/pull/511
2025-05-15 23:11:37 +02:00
Erik Arvstedt
742eb2e401
nbxplorer: init at 2.5.26
Backport of https://github.com/NixOS/nixpkgs/pull/407336
Fixes https://github.com/MetacoSA/NBitcoin/pull/1269
2025-05-15 22:34:31 +02:00
Jonas Nick
040231d830
Merge fort-nix/nix-bitcoin#773: pinned pkgs: add bitcoind-knots
69090cddfa pinned pkgs: add `bitcoind-knots` (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 69090cddfa

Tree-SHA512: f99036bad7535d6b8617b2384d63922158138ddfd7284b59837a3566babe156372be427956f907a87e78b57d21efa6921b95350f36d7d301c70bb79ef7712118
2025-05-14 10:17:56 +00:00
Erik Arvstedt
69090cddfa
pinned pkgs: add bitcoind-knots 2025-05-13 00:00:54 +02:00
Jonas Nick
b2bc5e6e75
Merge fort-nix/nix-bitcoin#772: update nixpkgs
411b131c3a test: remove clightning plugin start timeout patch (Erik Arvstedt)
815f2cd325 clightning: don't set `datadir` for `bitcoin-cli` plugin (Erik Arvstedt)
04b6a09be4 clightning-plugins: use `clnrest`, remove Python version (Erik Arvstedt)
ac86e67c85 clnrest: init at 0.2.0 (Erik Arvstedt)
6e3c5db5f5 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 411b131c3a

Tree-SHA512: 8dd521079d76b75d4db5cbb94d622fe4713b52cf2ffe196d997838c918ba0d07622e5ae5789851c38520dcbd00f24c4657d04a82b21342adb0bb52eca609664d
2025-05-09 14:18:48 +00:00
Erik Arvstedt
411b131c3a
test: remove clightning plugin start timeout patch
Unneded because the timeout has been increased upstream:
ee3133f198
2025-05-09 13:56:33 +02:00
Erik Arvstedt
815f2cd325
clightning: don't set datadir for bitcoin-cli plugin
This option is unneeded because `bitcoin-cli` auth and connection
settings are already provided by other options like `bitcoin-rpcpassword`.

In bitcoind versions prior to 29.0, option `datadir` (passed by clightning to `bitcoin-cli`)
was therefore ignored.
Since 29.0, option `datadir` is always checked for validity. This causes a
file permission error because service clighting has no access to the
bitcoin datadir. This is now fixed.
2025-05-09 13:56:18 +02:00
Erik Arvstedt
04b6a09be4
clightning-plugins: use clnrest, remove Python version 2025-05-09 13:32:19 +02:00
Erik Arvstedt
ac86e67c85
clnrest: init at 0.2.0 2025-05-08 23:59:08 +02:00
Jonas Nick
6e3c5db5f5
update nixpkgs
bitcoin: 28.1 -> 29.0
bitcoind: 28.1 -> 29.0
btcpayserver: 2.0.7 -> 2.1.0
clightning: 24.11.1 -> 25.02.1
fulcrum: 1.11.1 -> 1.12.0.1
nbxplorer: 2.5.23 -> 2.5.25
2025-05-05 12:40:09 +00:00
Jonas Nick
990805aa7c
Merge fort-nix/nix-bitcoin#770: update nixpkgs
f1788b181c update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK f1788b181c

Tree-SHA512: 2e5b179cfc8b123b78b6bb37ddf28d004f44517bb01b1ca06f83f13c7ced3c032b62f320962763631617a3b7955baf8f6bad24554b2616e3c91f2f213278be66
2025-03-28 09:52:29 +00:00
Jonas Nick
f1788b181c
update nixpkgs 2025-03-27 16:39:54 +00:00
Jonas Nick
875d25066d
Merge fort-nix/nix-bitcoin#769: update nixpkgs
8f99c63303 update nixpkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 8f99c63303

Tree-SHA512: d0f9417586576b63ce4324fa972e301fd8bae6111a4204eb253aac53276d1ddd8293ebe6ad35c31cc47094f6bd89af3801792cb5e249c5252cb800a5431c0b4a
2025-03-11 20:31:17 +00:00
Erik Arvstedt
8f99c63303
update nixpkgs
btcpayserver: 1.13.7 -> 2.0.7
nbxplorer: 2.5.17 -> 2.5.23

Co-authored-by: Erik Arvstedt <erik.arvstedt@gmail.com>
2025-03-11 19:36:26 +00:00
Jonas Nick
bff10a66e5
Merge fort-nix/nix-bitcoin#765: update nixpkgs
3872f893dc update nixpkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 3872f893dc

Tree-SHA512: d05441f1743d8b56be24ab00762322a3835c3fd918efc09c9924f0ffa89528434d9c0b38411128837bd3fb7613c28909db9b3a5c81e604baced98936cbe7e0b0
2025-02-16 12:43:25 +00:00
Erik Arvstedt
3872f893dc
update nixpkgs
electrs: 0.10.8 -> 0.10.9
lnd: 0.18.4-beta -> 0.18.5-beta
nbxplorer: 2.5.16 -> 2.5.17
2025-02-14 15:51:16 +01:00
Jonas Nick
df7b000efc
Merge fort-nix/nix-bitcoin#761: services: use wants dependency where possible
4aaef5fdf4 services: use `wants` dependency where possible (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 4aaef5fdf4

Tree-SHA512: 183c0dea60d59542654503401c4fac10699e5c0703214061e705c5a47915f18c56ad88ae9dcebc746a90b4dcb4b41dc31725436605cb4b395af1f9e21cae681e
2025-01-31 11:21:03 +00:00
Erik Arvstedt
4aaef5fdf4
services: use wants dependency where possible
Let A be a service that depends on another service B.
When A can gracefully handle failures and restarts of B, use
```
wants = [ "B.service" ];
after = [ "B.service" ];
```
instead of
```
requires = [ "B.service" ];
after = [ "B.service" ];
```
in the definition of A.

This way, A keeps running when B is stopped or restarted after a failure.
With `requires`, A is instead stopped when B is stopped or restarted due to a failure.

This brings two benefits:

1. Improved uptime
Examples:
- RTL keeps running when one lightning node has failed
- btcpayserver keeps running and accepting on-chain payments when the lightning node has crashed

2. Avoids a systemd bug where depending units (`A.service` in the
above example) are not restarted when their dependency fails
(issue github/systemd#18856, no full link to avoid spamming the issue).
In real world nix-bitcoin deployments, this issue was only likely to
appear when clightning failed during activation, causing depending
units (like `RTL`) to stop and not be restarted.
All services depending on `clightning` have now been changed to use
`wants`, thereby avoiding the bug.

Services `electrs` and `lightning-loop` fail when their respective
dependencies stop, so these services have not been changed.
I also haven't changed services `joinmarket` and
`joinmarket-yieldgenerator`. Further manual testing is needed to
determine if they can be switched to `wants`.
2025-01-29 20:44:26 +01:00
Jonas Nick
296ef4a546
Merge fort-nix/nix-bitcoin#762: dev: add more automation to NixOS version updates
fe8c6b1e6a dev: add more automation to NixOS version updates (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK fe8c6b1e6a

Tree-SHA512: 692348f608dfe0aa0ab88427b8402f6a03c8b4fc1e62070ae6ceda40c7f96dbf02bda759437273bd6c73c5b55d2a1c149a9d1be3c05ae9f6483023dff1efcc18
2025-01-26 08:45:29 +00:00
Erik Arvstedt
fe8c6b1e6a
dev: add more automation to NixOS version updates
Use the `update-flake.sh` script to auto-update the NixOS version at
various places.

Also update `examples/container/flake.nix` which has been
missing in the update instructions.
2025-01-25 22:24:09 +01:00
Jonas Nick
c7e5de3b2b
Merge fort-nix/nix-bitcoin#760: Fix test persistentContainerExample
b8f6343ee4 fix test `persistentContainerExample` (Erik Arvstedt)
b36867c845 examples/container: use faster `destroy` cmd (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK b8f6343ee4

Tree-SHA512: 2649f7f93698c1b072f0c9a92cbb24ae770904f5c390e7869fec3dc9941022029ee70918f517d4c77ee5aed02b79f65d1deaeef775dc027a3d7ef741eb7ec81a
2025-01-24 08:18:14 +00:00
Jonas Nick
f47727b28a
Merge fort-nix/nix-bitcoin#759: test/README: mention Flakes requirement
6486bca30f test/README: mention Flakes requirement (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 6486bca30f

Tree-SHA512: a1c4e2cf2595306587bf411174a2271a9b2a5b526225b5e7bf2453c779c82a28f28279535df1a257186f0a1a2a940e1cea40c8f84bc8c6a815afdd833125df01
2025-01-24 08:05:30 +00:00
Erik Arvstedt
6486bca30f
test/README: mention Flakes requirement 2025-01-22 20:48:12 +01:00
Erik Arvstedt
b8f6343ee4
fix test persistentContainerExample
This test requires `electrs` to be enabled.

Also, by using `electrs` instead of `clightning` we avoid the bug
where clightning hangs at startup when internet access is unavailable.
Due to technical limititations, internet access is available in NixOS
containers only after the container has started.
2025-01-22 20:41:52 +01:00
Erik Arvstedt
b36867c845
examples/container: use faster destroy cmd
This skips evaluating the container system derivation.
2025-01-22 20:31:30 +01:00
Jonas Nick
dc4d14e073
Merge fort-nix/nix-bitcoin#758: update nixpkgs
ed163fece1 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK ed163fece1

Tree-SHA512: 671d40ed9e545a8076e67c29e32f74fd071d1d0f388c57e6204120d96a8a58e92f1559ddb33620e11f1260f0843ff5ceeb49bde0cbfb966f6ecbaeabd173270f
2025-01-21 17:52:17 +00:00
Jonas Nick
ed163fece1
update nixpkgs
bitcoin: 28.0 -> 28.1
bitcoind: 28.0 -> 28.1
clightning: 24.11 -> 24.11.1
electrs: 0.10.7 -> 0.10.8
extra-container: 0.12 -> 0.13
lnd: 0.18.3-beta -> 0.18.4-beta
2025-01-21 16:51:29 +00:00
Jonas Nick
1113d2cedb
Merge fort-nix/nix-bitcoin#754: container example: add clightning to flake, remove electrs
306b30cf62 container example: add clightning to flake, remove electrs (Sean Gilligan)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 306b30cf62

Tree-SHA512: eaba319734a8263d809d9d9365316b43b36d64996a2b04849bb0c827f342f3350acc0b34e33dec396d5cb41fd77a9cab882fbb66129a7fd6e1cca242e7e33ebe
2024-12-18 21:47:58 +00:00
Sean Gilligan
306b30cf62 container example: add clightning to flake, remove electrs
Some of the commands listed in usage.sh require clightning to be
enabled. This commit enables clightning so they will work. It also
removes electrs to keep things simple, since electrs is not in
usage.sh
2024-12-18 10:17:34 -08:00
Jonas Nick
33dbb41d58
Merge fort-nix/nix-bitcoin#753: update nixpkgs
64bfc3f3a0 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 64bfc3f3a0

Tree-SHA512: 0d0283e62c1ebab57828b35556925fd315ed2ec64f89f2d188bd3ec92f66854cd4c1e25989aac3882438d393190c5a3b11e51af82a0abaff9eca0ada8e1c30bb
2024-12-18 07:47:26 +00:00
Jonas Nick
64bfc3f3a0
update nixpkgs
Pkg updates in nixpkgs stable:
btcpayserver: 1.13.5 -> 1.13.7
nbxplorer: 2.5.7 -> 2.5.16

Pkg updates in nixpkgs unstable:
clboss: 0.14.0 -> 0.14.1
clightning: 24.08.2 -> 24.11
electrs: 0.10.6 -> 0.10.7
elementsd: 23.2.1 -> 23.2.4
2024-12-17 09:22:23 +00:00
Jonas Nick
32b59a6b84
Merge fort-nix/nix-bitcoin#750: Update to NixOS 24.11
b5e5974b8a flake: update extra-container (Erik Arvstedt)
2d53b57636 tests.py: fix syntax warning (Erik Arvstedt)
09ba739719 nbxplorer: remove deprecated option (Erik Arvstedt)
d6bae0a9eb python3Packages.clnrest: update to NixOS 24.11 (Erik Arvstedt)
b78116b0da python3Packages.clnrest: use `--replace-fail` (Erik Arvstedt)
dc8f969eea python3Packages.pyln-proto: update to NixOS 24.11 (Erik Arvstedt)
8af7fc4b80 python3Packages.joinmarket: update to NixOS 24.11 (Erik Arvstedt)
c66a6aab3a python3Packages.joinmarket: allow Python 3.12 (Erik Arvstedt)
3ce3a000b2 modules: update to NixOS 24.11 (Erik Arvstedt)
a3ded4cf74 update to NixOS 24.11 (Erik Arvstedt)
ba46d20a25 update-flake.sh: add workflow for updating the NixOS version (Erik Arvstedt)
f60a50607d update-flake.sh: remove support for Nix < 2.19 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK b5e5974b8a

Tree-SHA512: a252a2e20266924c58877aebe03a25ef65166cf8404ecf6a5f8a0b0eb5bf569ec5f13894d08723058c8d6b354378c609cb626f6866f152b06d26e8a73181f02c
2024-12-17 08:09:51 +00:00
Erik Arvstedt
b5e5974b8a
flake: update extra-container
Adds support for NixOS 24.11
2024-12-14 10:52:27 +01:00
Erik Arvstedt
2d53b57636
tests.py: fix syntax warning
Fixes this warning from the NixOS VM test script linter:
SyntaxWarning: invalid escape sequence '\['
2024-12-14 10:52:27 +01:00
Erik Arvstedt
09ba739719
nbxplorer: remove deprecated option
Fixes this warning:
Explorer: Options 'automigrate' is obsolete and ignored...
2024-12-14 10:52:26 +01:00