Commit Graph

1883 Commits

Author SHA1 Message Date
Erik Arvstedt
329fbac404
docs/install: don't enter examples shell while creating node config
1. This simplifies the setup

2. Fixes a bug where a user skipped step 4.6 (run `nix-shell`) which
   he deemed superfluous because a Nix shell was already active.
   This caused an error during deployment.
2023-08-18 16:28:15 +02:00
Jonas Nick
70bfb03e88
Merge fort-nix/nix-bitcoin#635: update nixpkgs
7ec5830169 update nixpkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 7ec5830169

Tree-SHA512: 768fa5751ecfdb3dad1b5c12911d313e265d27ecb8a5522addfa0a3c1bd326d96e85a03ce4203aac6f5947ddf47a0b71ffacb8071f62bb8c5fa5981e14acbbce
2023-08-18 12:53:35 +00:00
Erik Arvstedt
7ec5830169
update nixpkgs
btcpayserver: 1.10.3 -> 1.11.2
2023-08-18 13:36:19 +02:00
Jonas Nick
9d9925621a
Merge fort-nix/nix-bitcoin#621: Trustedcoin fixes
4e8369705d dev: add trustedcoin (Erik Arvstedt)
ac59f93e63 trustedcoin: add regtest support, reenable test (Erik Arvstedt)
aa418869b3 tests/trustedcoin: extract fn (Erik Arvstedt)
6de5029c49 tests/trustedcoin: refactor (Erik Arvstedt)
53ea447ab7 trustedcoin: add option `tor.proxy` (Erik Arvstedt)
31b76f1ffe clightning: add option `useBcliPlugin` (Erik Arvstedt)
f3e9c644e3 clightning-plugins/trustedcoin: improve docs (Erik Arvstedt)
7640c69d79 tests/clightning-plugins: enable active plugin test for `trustedcoin` (Erik Arvstedt)
57455eb897 tests/clightning-plugins: set actual `clboss` pkg path (Erik Arvstedt)
dca6813d6b tests/clightning-plugins: extract variable (Erik Arvstedt)
858ab1cfd6 clightning: revert whitespace changes (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 4e8369705d

Tree-SHA512: 4abf6f2e6ba51b39351f8c2ef97c6afc7c2e686da41b7a6bb4a8d6e89bc9f829ca53109efb800d7b26d360319271bcc8beafc5ddfe133668cf412790d645682b
2023-08-05 20:09:31 +00:00
Erik Arvstedt
4e8369705d
dev: add trustedcoin 2023-08-03 18:40:13 +02:00
Erik Arvstedt
ac59f93e63
trustedcoin: add regtest support, reenable test 2023-08-03 18:40:13 +02:00
Erik Arvstedt
aa418869b3
tests/trustedcoin: extract fn 2023-08-03 18:40:12 +02:00
Erik Arvstedt
6de5029c49
tests/trustedcoin: refactor
- No need to wait for bitcoind:
  clightning being active implies that bitcoind is active.

- Remove redundant log checks
2023-08-03 18:40:12 +02:00
Erik Arvstedt
53ea447ab7
trustedcoin: add option tor.proxy
By disabling `trustedcoin.tor.proxy` and enabling `clightning.tor.proxy`,
`trustedcoin` can be used without Tor proxying, while clighting still
uses Tor for lightning layer connections.

Previously, disabling Tor for `trustedcoin` required to also disable
Tor for clightning.

Also fix the workaround in the docs for the trustedcoin Tor connection issues:
The previous config snippet only affected systemd hardening settings,
but didn't disable Tor for trustedcoin.
2023-08-03 18:40:12 +02:00
Erik Arvstedt
31b76f1ffe
clightning: add option useBcliPlugin
This decouples modules `clightning` and `trustedcoin`.
`clightning` no longer depends on `trustedcoin`, which restores
the acyclic dependency graph described in `modules.nix`
2023-08-03 18:40:12 +02:00
Erik Arvstedt
f3e9c644e3
clightning-plugins/trustedcoin: improve docs 2023-08-03 17:14:40 +02:00
Erik Arvstedt
7640c69d79
tests/clightning-plugins: enable active plugin test for trustedcoin 2023-08-03 01:20:05 +02:00
Erik Arvstedt
57455eb897
tests/clightning-plugins: set actual clboss pkg path 2023-08-03 01:20:04 +02:00
Erik Arvstedt
dca6813d6b
tests/clightning-plugins: extract variable 2023-08-03 01:20:04 +02:00
Erik Arvstedt
858ab1cfd6
clightning: revert whitespace changes 2023-08-03 01:20:04 +02:00
Jonas Nick
2e53fd2e51
Merge fort-nix/nix-bitcoin#631: rtl: fix lnd, lightning-loop connection errors
14ca8b461b rtl: fix lnd, lightning-loop connection errors (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 14ca8b461b

Tree-SHA512: 9e82da82c0964c5f24fda1276b2dc27f1d4c57e040bf755568905225e6e3ad00a810a9c99c21041acbae10bbaf030f06aaaa715170e8a754025cf358f5ba1535
2023-07-29 20:41:46 +00:00
Jonas Nick
369ce1c60c
Merge fort-nix/nix-bitcoin#629: update nixpkgs
aca0b1e6ec update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK aca0b1e6ec

Tree-SHA512: de44d8ad85665d0e0a7d79ed06bdc70cd3c831d06f58d237bd75b50a14c2cc02f7c1252350962884ef8bb9b35fccf1ecabedf883a516d6c054938381b0998d9a
2023-07-29 19:22:14 +00:00
Erik Arvstedt
14ca8b461b
rtl: fix lnd, lightning-loop connection errors
lnd and lightning-loop resolve `localhost` to an IPv4 address when
creating RPC sockets.

Since NixOS 23.05, RTL (nodejs) resolves `localhost` to an IPv6
address when connecting to lnd and lightning-loop, which leads to
connection errors.

To fix these and other potential errors, replace all instances
of `localhost` with `127.0.0.1`.
2023-07-29 19:07:10 +02:00
Jonas Nick
aca0b1e6ec
update nixpkgs
btcpayserver: 1.10.2 -> 1.10.3

Also, don't override boost provided to the bitcoin package, same as in the
nixpkgs.
2023-07-29 14:13:08 +00:00
Jonas Nick
d8954ec8dd
Merge fort-nix/nix-bitcoin#627: Fix clightning prometheus plugin msat purge error
8157cd4fe3 fix prometheus msat purge error (Haos Games)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 8157cd4fe3

Tree-SHA512: 0e4634106d15762aeb1ed86d2e5d59d018bf3b36a14c15dd126d5e9987cd3c3b8c937bdb02d6795ec77985a88cb5f30f70b613d92d30e057fea5db894098d459
2023-07-24 08:47:41 +00:00
Haos Games
8157cd4fe3 fix prometheus msat purge error 2023-07-23 19:45:19 +02:00
Jonas Nick
6eaddd970a
Merge fort-nix/nix-bitcoin#617: Update to NixOS 23.05
e658209d56 run-tests.sh: fix building tests for Nix ≥ 2.15 (Erik Arvstedt)
bb2e88cec2 fix python packages for nixos 23.05 (Erik Arvstedt)
e31cc686f2 run-tests: make compatible with new shellcheck version (Erik Arvstedt)
76dc7b92e1 examples/deploy-container.sh: add extra-container version check (Erik Arvstedt)
6c2d1108a4 update the required extra-container version for nixos 23.05 (Erik Arvstedt)
e2cce7daa8 update to nixos 23.05 (Erik Arvstedt)
55c64d8dff update nixpkgs (Erik Arvstedt)
bd77b89fea rtl, clightning-rest: update to nodejs 18 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK e658209d56

Tree-SHA512: 5814f56e469ad384dfb81bc11f9ac256a35cd2647e7fd997b14f84927448fbb880b0b1cee3bdf5a2b926760b74aab291e901e67a0759d43ffaf705ff6b741b97
2023-07-19 17:37:08 +00:00
Erik Arvstedt
e658209d56
run-tests.sh: fix building tests for Nix ≥ 2.15 2023-07-19 17:22:01 +02:00
Erik Arvstedt
bb2e88cec2
fix python packages for nixos 23.05 2023-07-19 17:22:01 +02:00
Erik Arvstedt
e31cc686f2
run-tests: make compatible with new shellcheck version 2023-07-19 17:22:01 +02:00
Erik Arvstedt
76dc7b92e1
examples/deploy-container.sh: add extra-container version check
It now uses the same version check as
make-container.sh (which is called by run-tests.sh)
2023-07-19 17:22:01 +02:00
Erik Arvstedt
6c2d1108a4
update the required extra-container version for nixos 23.05 2023-07-19 17:22:01 +02:00
Erik Arvstedt
e2cce7daa8
update to nixos 23.05 2023-07-19 17:22:01 +02:00
Erik Arvstedt
55c64d8dff
update nixpkgs
clightning: 23.05.1 -> 23.05.2
lightning-pool: 0.5.3-alpha -> 0.6.4-beta
2023-07-19 17:22:01 +02:00
Erik Arvstedt
bd77b89fea
rtl, clightning-rest: update to nodejs 18
16 is no longer supported by NixOS 23.05.
18 is the latest LTS version.
2023-07-19 17:22:01 +02:00
Jonas Nick
48b360439c
Merge fort-nix/nix-bitcoin#625: Add versioned release branches
6510f269f6 release: add `nixos-*` version branch (Erik Arvstedt)
dd532d4738 push-release: fix `OAUTH_TOKEN` error handling (Erik Arvstedt)
a2b45e00c7 push-release: auto-create release version number (Erik Arvstedt)
0ce3fb1c94 push-release: use `curl -fSs` (Erik Arvstedt)
40c5419a75 push-release: rename `TAG_NAME` -> `releaseVersion` (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 6510f269f6

Tree-SHA512: f5df058d3f140fbc3dca47316b00dd46cffef6cf21276a6884abf9d99ebcb84791e135fee852216da0afc247b914603022e716ca6f4f7696a606549902f10fb0
2023-07-19 08:44:14 +00:00
Jonas Nick
e504def824
Merge fort-nix/nix-bitcoin#626: secure-node: add sudo shell alias for doas
5eaf104efe secure-node: add `sudo` shell alias for `doas` (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 5eaf104efe

Tree-SHA512: a53121599a36318e76a63a74b912fed1d315365dcb19c476a1f1b75a684f9b9c49c22946081e86d11743b749850b58d19f90eb51214f5006bc2d5bd2a0ffa402
2023-07-12 15:44:53 +00:00
Erik Arvstedt
5eaf104efe
secure-node: add sudo shell alias for doas
A convenience helper which allows running most `sudo` cmds while
`doas` is enabled.

This is safe because all args supported by both `sudo` and
`doas` that lead to command execution (like `-u <user>`)
have identical semantics.
2023-07-10 07:22:00 +02:00
Erik Arvstedt
6510f269f6
release: add nixos-* version branch
Best practice for flakes containing NixOS modules.

`push-release` now pushes to an extra branch named `nixos-<version>`,
alongside branch `release`.
This allows users to track a specific NixOS release, so that their
config doesn't break when nix-bitcoin switches to a new NixOS
release.
2023-07-09 13:13:05 +02:00
Erik Arvstedt
dd532d4738
push-release: fix OAUTH_TOKEN error handling 2023-07-09 13:07:29 +02:00
Erik Arvstedt
a2b45e00c7
push-release: auto-create release version number 2023-07-09 13:07:29 +02:00
Erik Arvstedt
0ce3fb1c94
push-release: use curl -fSs
Best practice when using curl in scripts.
2023-07-09 13:07:29 +02:00
Erik Arvstedt
40c5419a75
push-release: rename TAG_NAME -> releaseVersion
More precise name.
2023-07-09 13:07:29 +02:00
Jonas Nick
03fb70efa4
Merge fort-nix/nix-bitcoin#624: clightning-rest: 0.10.4 -> 0.10.5
50aa13c3b4 clightning-rest: 0.10.4 -> 0.10.5 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 50aa13c3b4

Tree-SHA512: 9aeb6e4b06029ef8f40d144e13711e63e7419d222171d84038944b37df01a60babb36e5a197bb77d45616fce3e5556a7d525a02b9d6a4f45819330918820e7f8
2023-07-02 10:12:06 +00:00
Erik Arvstedt
50aa13c3b4
clightning-rest: 0.10.4 -> 0.10.5 2023-06-29 12:48:25 +02:00
Jonas Nick
01c6148056
Merge fort-nix/nix-bitcoin#620: update nixpkgs
71b4191095 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 71b4191095

Tree-SHA512: 9f9ee35462f83ed9fd0b4e70fd4d0daaeb6b66c04c990fd78bc0285328bb00f54a271df8da58d1409368be29e9934880566edb8151c62c9d94e1971e6b57f82c
2023-06-27 20:13:10 +00:00
Jonas Nick
71b4191095
update nixpkgs
extra-container: 0.11 -> 0.12
lnd: 0.16.2-beta -> 0.16.3-beta
2023-06-27 09:59:02 +00:00
Jonas Nick
f946ea4bb9
Merge fort-nix/nix-bitcoin#623: tests/trustedcoin: remove from CI, disable temporarily
26b35120ad tests/trustedcoin: remove from CI, disable temporarily (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 26b35120ad

Tree-SHA512: e68af4b7f0ddd852ecf15e522199400857b34a68ccc33f6e642f198dc3b3321d5097b61a44e42a0af096ccc3e74ec2afc0593974b66fd932c8f192a9a2c78fd4
2023-06-27 09:58:22 +00:00
Erik Arvstedt
26b35120ad
tests/trustedcoin: remove from CI, disable temporarily
- Don't spin up a CI node for the minor `trustedcoin` test.
- Add the test to `run-tests.sh`, but disable it because it
  occasionally fails.
2023-06-26 00:10:31 +02:00
Jonas Nick
379b9a727a
Merge fort-nix/nix-bitcoin#619: clightning-rest: 0.10.3 -> 0.10.4
edcf39daf5 clightning-rest: 0.10.3 -> 0.10.4 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK edcf39daf5

Tree-SHA512: 5614cd36e11542cb599a9c419fe91c67f847b55f4232d07421e8cbde8028134154d18e55b516c4e025543c24684f5d994df8cfaeaaa80e7a7b7e9f5a6b9570ad
2023-06-24 20:35:48 +00:00
Erik Arvstedt
edcf39daf5
clightning-rest: 0.10.3 -> 0.10.4 2023-06-21 23:09:39 +02:00
Jonas Nick
9a1ea4f0d8
Merge fort-nix/nix-bitcoin#615: Typo
640f8d5ded Typo (JayDeLux)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 640f8d5ded

Tree-SHA512: 9e8789b502167cfdfc9e1a9db38cf9455c69a4ca96927189de8f71ee12bdbd04a906a233e8e2aa8e63fee11aed3060172cb006a898e98b1c602ac6ceeafafe83
2023-06-14 18:52:44 +00:00
JayDeLux
640f8d5ded
Typo 2023-06-13 22:49:46 +02:00
Jonas Nick
f2a970406b
Merge fort-nix/nix-bitcoin#614: update nixpkgs
acab8667db update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK acab8667db

Tree-SHA512: e87af78213f581963e0fd9d9f4eaaf8430dcecf727c266d7acf52fba67ed84cc30db793f51916b8b958bad95253c1939e09338693732e5d0637c93d595a487d6
2023-06-13 20:15:32 +00:00
Jonas Nick
acab8667db
update nixpkgs
btcpayserver: 1.10.1 -> 1.10.2
lightning-loop: 0.23.0-beta -> 0.24.1-beta
nbxplorer: 2.3.63 -> 2.3.65
clightning: 23.05 -> 23.05.1
2023-06-13 15:03:46 +00:00