Jonas Nick
a9644a0e2b
update nixpkgs
2023-04-02 18:10:58 +00:00
Jonas Nick
d3c98698e0
update nixpkgs
...
clightning: 23.02 -> 23.02.2
2023-03-19 19:58:38 +00:00
Jonas Nick
282c45b746
Merge fort-nix/nix-bitcoin#575 : Improve lndconnect, support WireGuard
...
cea69b73d227d95fda8554a21874aea4bfefd562477e1709fbf996ef37d9b4bc621b8c907cfe4f4ccea69b73d2
2023-03-13 12:55:59 +00:00
Erik Arvstedt
a4bfefd562
add presets/wireguard.nix
...
This allows using `lndconnect` via a direct WireGuard connection.
2023-03-11 20:10:54 +01:00
Jonas Nick
b82eb458af
update nixpkgs
...
clightning: 22.11.1 -> 23.02
hwi: 2.2.0 -> 2.2.1
2023-03-07 21:08:35 +00:00
Erik Arvstedt
f996ef37d9
lnd, clightning-rest: remove lndconnectOnion, add generic option lndconnect
...
For both lnd and clightning-rest, `lndconnectOnion` is replaced by
options `lndconnect.enable` and `lndconnect.onion`.
This allows using lndconnect without Tor.
2023-02-27 14:39:29 +01:00
Jonas Nick
3480232f2a
update nixpkgs
...
btcpayserver: 1.7.3 -> 1.7.12
elementsd: 22.0.2 -> 22.1
nbxplorer: 2.3.54 -> 2.3.62
Also add new required argument to flake-info in CI test script.
2023-02-27 12:43:41 +00:00
Jonas Nick
475af2d6cb
Merge fort-nix/nix-bitcoin#586 : Misc. improvements
...
addfa8ec6bae733d887e6cbd0d93ae85310b533abc2f66d4f1519ae31202a1023696e634fe8675bda3bdecb10b690a8f62562af642f56a5634f08873b76728a1ecaddfa8ec6b
2023-02-03 13:11:41 +00:00
Erik Arvstedt
addfa8ec6b
test: support run, debug commands in basic NixOS tests
...
Currently, this only affects the basic NixOS test `clightning-replication`.
2023-02-02 10:51:41 +01:00
Erik Arvstedt
ae733d887e
tests/clightning-replication: reuse pkgs instance
...
This reduces eval time by 30%.
2023-02-02 10:51:41 +01:00
Erik Arvstedt
6cbd0d93ae
tests: rename clightningReplication -> clightning-replication
...
The test name now matches the file name.
2023-02-02 10:51:41 +01:00
Erik Arvstedt
56c2abd91a
update nixpkgs
...
btcpayserver: 1.7.2 -> 1.7.3
electrs: 0.9.10 -> 0.9.11
hwi: 2.1.1 -> 2.2.0
2023-01-25 23:57:29 +01:00
Jonas Nick
84fc4d48d3
Merge fort-nix/nix-bitcoin#574 : Add dev helper and docs
...
b4d7e1aa8fb35d08d3f24d76eb9183dc0710f3f49e30d2728bc6d85c6fe3a51f7b419eb4d7e1aa8f
2023-01-18 20:53:24 +00:00
Erik Arvstedt
b4d7e1aa8f
add dev helper and docs
2023-01-15 20:28:49 +01:00
Erik Arvstedt
b35d08d3f2
docs: move test docs from examples/README to test/README
2023-01-15 20:28:48 +01:00
Erik Arvstedt
dc0710f3f4
tests: add example scenario customTest
2023-01-15 20:28:48 +01:00
Jonas Nick
aae4b6bfc5
update nixpkgs
...
btcpayserver: 1.7.1 -> 1.7.2
fulcrum: 1.8.2 -> 1.9.0
nbxplorer: 2.3.49 -> 2.3.54
2023-01-06 22:53:47 +00:00
Erik Arvstedt
9e30d2728b
tests: formatting
...
Move line next to `services.lnd` config for clarity.
2023-01-06 23:46:43 +01:00
Erik Arvstedt
c6d85c6fe3
tests: fix broken unit file when clightning is disabled
...
Previously, an incomplete clightning unit was always created because
attr `clightning` was always defined in option attrset `systemd.services`.
2023-01-06 23:46:43 +01:00
Erik Arvstedt
a51f7b419e
run-tests: use arg instead of env var for scenario overrides
...
This removes a source of implicit state and guarantees that regular
calls to `run-tests.sh` always run the builtin tests.
2023-01-06 23:46:43 +01:00
Erik Arvstedt
109dccca27
treewide: use mdDoc for descriptions
...
Enable markdown syntax (instead of docbook) for descriptions.
This only affects external doc tooling that renders the descriptions.
2022-12-18 20:01:52 +01:00
Erik Arvstedt
9e456ea3a9
shellcheck-services.nix: update to NixOS 22.11
2022-12-18 20:01:52 +01:00
Erik Arvstedt
77d58162e7
test: update to NixOS 22.11
2022-12-18 20:01:52 +01:00
Jonas Nick
875fac6862
update nixpkgs
...
btcpayserver: 1.6.12 -> 1.7.1
bitcoind: 24.0 -> 24.0.1
clightning: 0.12.1 -> 22.11.1
lnd: 0.15.4-beta -> 0.15.5-beta
nbxplorer: 2.3.41 -> 2.3.49
2022-12-14 14:48:54 +00:00
Jonas Nick
d9fdc49e9a
update nixpkgs
...
bitcoin: 23.0 -> 24.0
bitcoind: 23.0 -> 24.0
charge-lnd: 0.2.12 -> 0.2.13
2022-11-28 12:54:11 +00:00
Jonas Nick
81350a03c9
Merge fort-nix/nix-bitcoin#570 : Update nixpkgs
...
a333989ca8313e374774a333989ca8
2022-11-10 12:56:47 +00:00
Jonas Nick
a333989ca8
update nixpkgs
...
electrs: 0.9.9 -> 0.9.10
elementsd: 22.0 -> 22.0.2
extra-container: 0.10 -> 0.11
lnd: 0.15.2-beta -> 0.15.4-beta
2022-11-10 11:03:23 +00:00
Erik Arvstedt
0de16095e1
clightning-replication: switch system before waiting for server sshd
...
This is primarily a cosmetic change.
- Increases code clarity because all system test blocks now start with `switch_to_system`
- Optimizes dependency ordering because `switch_to_system` has no
dependency on the server sshd
2022-11-04 11:51:44 +01:00
Erik Arvstedt
edbaeb9813
tests: define tests via flake
...
Advantages:
- Pure test evaluations
- The test framework can now be used by flakes that extend nix-bitcoin
- Most features of `run-tests.sh` are now accessible via `nix build`/`nix run`.
We keep `run-tests.sh` for advanced features like `scenarioOverridesFile` and adhoc scenarios.
Other changes:
- `run-tests.sh` now builds aggregate VM tests like `basic` or
`buildable` by creating all VMs in a single evaluation.
This speeds up the tests and eases debugging by separating the eval and build steps.
- Use the new `nix` CLI which has improved build output logging
by prefixing output lines with the origin drv name.
2022-11-03 23:08:06 +01:00
Erik Arvstedt
8eaa4cce30
tests: move mkIfTest to nix-bitcoin.lib
2022-11-03 23:08:06 +01:00
Erik Arvstedt
b0dfa69e84
nixos-search/flake: formatting
2022-11-03 23:08:05 +01:00
Erik Arvstedt
a12b701e75
tests/container: don't require services.clightning to be defined
2022-11-03 23:08:05 +01:00
Erik Arvstedt
450de19803
tests/run-tests.sh: print examples before running
...
This eases debugging example failures.
2022-11-03 23:08:05 +01:00
Erik Arvstedt
5f1bb2a8fc
tests/copy-src: always copy .git dir
...
This is required by a later commit that introduces flakes-based test
evaluation. Evaluating local flakes needs a repo dir.
2022-11-03 23:08:05 +01:00
Erik Arvstedt
a87a59a86b
make-container.sh: improve root handling
...
Don't auto-switch to root when executing make-container.sh, because
auto root switching is also implemented in extra-container.
Besides simplifying the code, this is useful for a later commit that
introduces flakes-based container building.
With this change, the container is built under the regular user
instead of root, thereby utilizing the user's regular fetcher and
evaluation caches.
2022-11-03 23:08:05 +01:00
Erik Arvstedt
73d2fbb448
add compatibility with Nix PR #6530 (Source tree abstraction)
...
Avoid adding flake resource paths to the store (via string
interpolation).
This reduces performance and can lead to modules getting imported
twice, once through a local path and once through a store path.
This might not be needed in a future Nix release, in which case we can
revert this.
2022-11-03 23:08:05 +01:00
Erik Arvstedt
3c816b862c
tests/vmWithoutTests: poweroff on shell exit
...
This allows quitting the VM with Ctrl-D like in the minimal example VM.
2022-11-03 23:08:04 +01:00
Erik Arvstedt
1d3f49f8da
tests, example: avoid lengthy documentation build
...
This options manual rebuild takes 30-60s and is triggered by the extra
NixOS options defined by nix-bitcoin.
2022-11-03 23:08:04 +01:00
Erik Arvstedt
b840548d40
test/shellcheck-services: add configurable source prefix
...
This allows using this module for services defined outside of nix-bitcoin.
2022-11-03 23:08:04 +01:00
Jonas Nick
7c16fc5865
Merge fort-nix/nix-bitcoin#563 : lnd: fix missing RPC permissions when bitcoind is pruned
...
67949a002a49303be2e046f17fe31367949a002a
2022-10-28 08:38:28 +00:00
Erik Arvstedt
67949a002a
lnd: fix missing RPC permissions when bitcoind is pruned
2022-10-25 22:56:51 +02:00
Erik Arvstedt
49303be2e0
test/shellcheck-services: fix error by excluding unavailable services
2022-10-25 22:36:30 +02:00
Erik Arvstedt
46f17fe313
test/shellcheck-services: simplify accessing service definitions
...
This also improves performance by removing the extra module evaluation.
2022-10-25 22:36:30 +02:00
Erik Arvstedt
277510c7ee
tests: run flake-info in sandbox
...
Don't use sandboxing in Cirrus CI where namespace support is missing.
2022-10-25 22:04:17 +02:00
Erik Arvstedt
d3b7e8c432
revert "tests: disable nixosSearch"
2022-09-23 09:04:57 +02:00
Jonas Nick
261f7a043f
update nixpkgs
...
electrs: 0.9.7 -> 0.9.9
elementsd: 0.21.0.2 -> 22.0
fulcrum: 1.7.0 -> 1.8.1
2022-09-22 16:57:19 +00:00
Erik Arvstedt
c3b97e6728
tests: add shellcheckServices
2022-09-12 21:00:00 +02:00
Otto Sabart
ee15837244
shellcheck: prevent globbing and word splitting in unit shell scripts
2022-09-12 21:00:00 +02:00
Jonas Nick
4e63301ac3
Merge fort-nix/nix-bitcoin#546 : Update nixpkgs
...
63f8b740265255c7e8bcc165836fd1623c238b1633144262ec9c766df16ab57e7466fb63f8b74026
2022-09-07 09:42:43 +00:00
Erik Arvstedt
49e30f7172
test/lib/create-git-repo: fix empty var expansion
...
When `amend` is empty, expand it to nothing instead of an empty
string (which causes a git error).
2022-09-07 11:02:15 +02:00
Jonas Nick
623c238b16
clightning-plugins: remove commando pkg and module
...
clightning 0.12.0 ships with a reimplementation of the commando plugin that is
incompatible with the commando module that existed in nix-bitcoin.
2022-09-07 08:44:52 +00:00
Jonas Nick
b57e7466fb
update nixpkgs
...
btcpayserver: 1.6.9 -> 1.6.10
lnd: 0.15.0-beta -> 0.15.1-beta
2022-09-07 08:44:47 +00:00
Erik Arvstedt
c63da4734e
tests: disable nixosSearch
2022-09-05 21:11:15 +02:00
Erik Arvstedt
67a573dae8
create-git-repo.sh: fix amend error if there's no branch checked out
...
In this case, `git commit --amend` fails.
The state of a .git repo existing without a branch being checked out
can be reached through the following sequence of events (which I just
seem to have triggered):
1. The script calls `git init`
2. The user interrupts the script before `git commit` is finished
2022-08-29 00:12:19 +02:00
Erik Arvstedt
d9eecb7d4c
nixos-search/flake: remove unused output
2022-08-29 00:12:19 +02:00
Erik Arvstedt
af115d746b
internal scripts: use pinned, cached pkgs
...
Instead of setting up the script PATH via nix-shell, use
`nix shell` with inputs from the nix-bitcoin flake.
Advantages:
- Uses the nixpkgs version from the nix-bitcoin flake instead of
`<nixpkgs>` from the user env (NIX_PATH), so the script runtime
env is reproducible.
- The pkg derivations for the runtime env are cached, which greatly
increases script startup speed.
This commit was generated by running the following script inside the
repo root dir:
def transform(path, src)
if src =~ /#! *nix-shell +-i +bash +-p +(.*)/
pkgs = $1
if src =~ /^.*?(set -e.*?pipefail)\n/
set_statement = $1
src.sub!($&, '')
end
src.sub!(/\A.*?#! *nix-shell.*?\n/m, '')
parents = ([ '..' ] * (path.split('/').count - 1)).join('/')
[
'#!/usr/bin/env bash',
*set_statement,
%(. "${BASH_SOURCE[0]%/*}/#{parents}/helper/run-in-nix-env" "#{pkgs}" "$@"),
nil,
src
].join("\n")
end
end
Dir['**/*.sh'].each do |f|
src = File.read(f)
if new_src = transform(f, src)
puts "Changed file #{f}"
File.write(f, new_src)
end
end
2022-08-28 23:49:12 +02:00
Otto Sabart
f184bb34e6
shellcheck: fix lint of scripts in tests
2022-08-28 18:25:37 +02:00
Otto Sabart
9a92d29111
tests: add shellcheck
2022-08-28 18:25:37 +02:00
Erik Arvstedt
b625325487
ci/modules_test: use flake-enabled nix
2022-08-28 18:25:37 +02:00
Erik Arvstedt
f2cb5bfc10
update nixpkgs
...
nbxplorer: 2.3.28 -> 2.3.33
btcpayserver: 1.6.1 -> 1.6.9
charge-lnd: 0.2.4 -> 0.2.12
lightning-loop: 0.19.1-beta -> 0.20.0-beta
2022-08-21 10:23:33 +02:00
Erik Arvstedt
5eb01498d5
tests: add comment
2022-08-05 13:48:53 +00:00
Erik Arvstedt
952cd3773f
run-tests: support tests with multiple VMs in run
2022-08-05 13:48:36 +00:00
nixbitcoin
17507835fc
clightning: native database replication
...
Don't put `clightning.replication` options in
`examples/configuration.nix` until it is more "battle-tested."
2022-08-05 13:48:24 +00:00
Erik Arvstedt
9c5dbeaa83
test/nixos-search: fix wrong flake being tested
...
Now the test targets the main nix-bitcoin flake instead of the
nixos-search flake.
Also remove `NIX_PATH`, which is no longer required.
2022-07-22 17:41:31 +02:00
Jonas Nick
7ec248dba1
Merge fort-nix/nix-bitcoin#521 : update nixpkgs
...
1276c40aaa1276c40aaa
2022-07-22 14:59:11 +00:00
Jonas Nick
1276c40aaa
update nixpkgs
...
btcpayserver: 1.5.4 -> 1.6.1
nbxplorer: 2.3.26 -> 2.3.28
2022-07-22 13:15:25 +00:00
Jonas Nick
34c4b61402
Merge fort-nix/nix-bitcoin#504 : Add fulcrum module
...
7d7f2df006edd8bd311cf946a7cd9b79994d0bd27d7f2df006
2022-07-22 13:11:40 +00:00
Erik Arvstedt
8dc4858872
bitcoind: remove banlist loader
...
Gmaxwell's banlist (https://people.xiph.org/~greg/banlist.cli.txt ) is
no longer maintained and hasn't been updated since 2 years.
2022-07-15 14:45:37 +02:00
Erik Arvstedt
7d7f2df006
fulcrum: add module
2022-07-09 11:07:09 +02:00
Erik Arvstedt
f946a7cd9b
examples: use mkDefault for setting system.stateVersion
...
This makes it easier for users to override the default.
2022-07-08 15:10:03 +02:00
Erik Arvstedt
c853f380d4
lightning-loop: add certificate options extraIPs and extraDomains
...
This is useful for non-local access to the lightning-loop REST server.
2022-07-07 16:09:26 +02:00
Erik Arvstedt
edfbe700e7
lnd: add certificate options extraIPs and extraDomains
...
This is useful for non-local access to the lnd REST server.
2022-07-07 16:09:26 +02:00
Erik Arvstedt
79994d0bd2
tests: increase postgresql startup timeout
...
Required for Cirrus CI.
2022-07-07 11:43:21 +02:00
Erik Arvstedt
2ae2eea54e
run-tests: fix command debug on NixOS 22.05
2022-07-05 10:13:55 +02:00
Erik Arvstedt
a8255d61d7
lib/make-container: update required extra-container version
2022-07-05 10:13:54 +02:00
Erik Arvstedt
f02f27cbca
lib/make-test: fix system.stateVersion warning
2022-07-05 10:13:54 +02:00
Erik Arvstedt
4579b44781
update nixpkgs
...
clightning: 0.11.1 -> 0.11.2
lnd: 0.14.3-beta -> 0.15.0-beta
2022-07-03 02:09:33 +02:00
Jonas Nick
c7eab98a31
tests: fix deprecation warning
2022-06-27 21:15:38 +00:00
Jonas Nick
805eb26d12
update nixpkgs (stable: 21.11 -> 22.05)
...
extra-container: 0.8 -> 0.10
btcpayserver: 1.5.3 -> 1.5.4
lightning-loop: 0.18.0-beta -> 0.19.1-beta
2022-06-27 21:15:34 +00:00
Jonas Nick
043ef53cb9
Merge fort-nix/nix-bitcoin#489 : Update nixpkgs & joinmarket: 0.9.5 -> 0.9.6
...
cb295d1a16568d728e5ca3ff1351d9636d508b50cb295d1a16
2022-06-04 07:56:24 +00:00
Jonas Nick
a3ff1351d9
update nixpkgs
...
btcpayserver: 1.5.1 -> 1.5.3
hwi: 2.1.0 -> 2.1.1
lndconnect: 0.2.0 -> 0.2.1
nbxplorer: 2.3.20 -> 2.3.26
2022-06-01 12:37:32 +00:00
Erik Arvstedt
f9315db52c
clightning/feeadjuster: add test
2022-05-27 11:22:00 +02:00
Jonas Nick
ebaa9a3f2e
Merge fort-nix/nix-bitcoin#484 : Update RTL
...
3755b3ebeaff228a604dbeae9f8df74c2d908a383755b3ebea
2022-05-25 19:48:42 +00:00
Erik Arvstedt
84fe731c94
treewide: curl: exit with error status on HTTP errors
...
This makes scripts fail early on request errors.
Previously, curl exited with status 0 when enountering HTTP error status
codes.
`-fsS` equals `--fail --silent --show-error`.
2022-05-17 13:19:38 +02:00
Jonas Nick
b2ac602b46
update nixpkgs
...
clightning: 0.11.0.1 -> 0.11.1
2022-05-16 21:03:10 +00:00
Erik Arvstedt
3755b3ebea
rtl: add option extraConfig for nodes
...
Also define rtl config as a Nix attrset that is converted to JSON
2022-05-15 21:25:32 +02:00
Erik Arvstedt
ff228a604d
rtl: change nodes options
...
- Move option `rtl.nodes.{lnd,clightning}` -> `rtl.nodes.{lnd,clightning}.enable`
This is required by the next commit.
- Move option `rtl.loop` -> `rtl.nodes.lnd.loop`
- Only enable loop when `nodes.lnd` is enabled
2022-05-15 21:25:32 +02:00
Erik Arvstedt
e2fee4bf1a
lnd-rest-onion-service.nix: move to lndconnect-onion.nix, add clightning support
...
Option `services.lnd.restOnionService.package` has been removed.
There's not much use in overriding the [lndconnect pkg](https://github.com/LN-Zap/lndconnect ).
2022-05-06 16:26:40 +02:00
Erik Arvstedt
acf5fe69ad
add standalone clightning-rest service
...
- Rename `services.rtl.cl-rest` to `services.clightning-rest`.
`clightning-rest` is generally useful for connecting external REST clients
to clightning.
- Add a dedicated network namespace in netns-isolation.
- Add nodeinfo entry.
- Add datadir (which contains REST auth data) to backups.
2022-05-06 16:26:40 +02:00
Jonas Nick
6bdf0ac3fb
update nixpkgs{,-unstable}
...
This commit does not pass the tests. Fixup is in the next commit.
bitcoin: 22.0 -> 23.0
bitcoind: 22.0 -> 23.0
btcpayserver: 1.4.7 -> 1.5.1
clightning: 0.10.2 -> 0.11.0.1
electrs: 0.9.6 -> 0.9.7
hwi: 2.0.2 -> 2.1.0
lightning-loop: 0.17.0-beta -> 0.18.0-beta
lnd: 0.14.2-beta -> 0.14.3-beta
nbxplorer: 2.2.20 -> 2.3.20
2022-05-06 13:35:32 +00:00
Erik Arvstedt
408486ac9c
tests: update nbxplorer
2022-05-06 13:35:28 +00:00
Erik Arvstedt
aa21fb454e
tests: disable btcpayserver.lbtc for regtest
...
Previously, in case of btcpayserver.lbtc on regtest, nbxplorer just
printed a log error while trying to generate liquidd regtest blocks.
Now nbxplorer exits with an error, so disable lbtc.
2022-05-06 13:35:27 +00:00
Jonas Nick
d394a079a8
update nixpkgs{,-unstable}
2022-04-04 17:17:31 +00:00
nixbitcoin
4f74690292
joinmarket: 0.9.4 -> 0.9.5
...
Notes
- We can no longer test for `unknown error in JSON-RPC`. `jm-ob-watcher`
now simply outputs `Starting ob-watcher`. Tested working on
https://nixbitcoin.org/orderbook .
- Removed Agora IRC server since it is offline semi-permanently. Should
probably also be removed upstream.
- Includes patch for
https://github.com/JoinMarket-Org/joinmarket-clientserver/issues/1193
2022-03-30 11:25:45 +00:00
Jonas Nick
16daaaf79f
update nixpkgs{,-unstable}
...
btcpayserver: 1.4.4 -> 1.4.7
elementsd: 0.21.0.1 -> 0.21.0.2
lightning-loop: 0.16.0-beta -> 0.17.0-beta
2022-03-05 21:49:07 +00:00
Jonas Nick
2618af74e4
Merge fort-nix/nix-bitcoin#445 : clightning-plugins: add commando plugin
...
ee4cdb05862d6c4e829e0bede274a8380ec3bb7880312ba9d771eccb73d6570e271695ee4cdb0586
2022-02-27 18:38:18 +00:00
Erik Arvstedt
0bede274a8
clightning-plugins/commando: add module
2022-02-24 08:31:54 -08:00
Jonas Nick
282454f16e
update nixpkgs{,-unstable}
...
btcpayserver: 1.3.7 -> 1.4.4
electrs: 0.9.4 -> 0.9.5
lnd: 0.14.1-beta -> 0.14.2-beta
nbxplorer: 2.2.18 -> 2.2.20
2022-02-11 08:42:51 +00:00
Martin Milata
dac62375c1
update nixpkgs{-unstable}
2022-01-27 14:56:41 +01:00
Jonas Nick
5b7bc2d6ff
update nixpkgs{-unstable}
...
electrs: 0.9.3 -> 0.9.4
2022-01-20 21:59:13 +00:00
