883 Commits

Author SHA1 Message Date
Erik Arvstedt
9977fa69af
ci: use run-tests.sh 2020-12-11 13:27:06 +01:00
Erik Arvstedt
a82f0f5f48
add test 'pkgsUnstable'
Included in 'basic' tests.
Function 'doBuild' is needed by the following commit.
2020-12-11 13:27:05 +01:00
Erik Arvstedt
95bc1237e2
run-tests: rename testDir -> scriptDir 2020-12-11 13:27:05 +01:00
Erik Arvstedt
466d23deaa
ci: extract build-to-cachix.sh
Needed by the following commits.
Also, don't use the cachix cache as a substituter for local, non-CI
builds. This obviates the need for the 'untrusted' warning in build.sh.
2020-12-11 13:27:05 +01:00
Erik Arvstedt
a70c3bf210
make-test-vm: remove unneeded leftover arg attrs 2020-12-11 13:27:05 +01:00
Erik Arvstedt
ed65e78a2b
make-test: expose test config
This is useful for programmatically exploring a test config or for building a test system
on a custom platform.
2020-12-11 13:27:04 +01:00
Erik Arvstedt
7265742655
run-tests: add 'instantiate' command
Useful for diffing test derivations.
2020-12-11 13:27:04 +01:00
Erik Arvstedt
8cbdef8bf6
run-tests: fix CLI
Restore the original behavior that was accidentally changed:
When no args are given, run the basic test suite.
Otherwise, run the given command with default scenario 'default'.
Previously, `run-tests.sh build` ran the basic test suite instead of
building the default scenario.
2020-12-11 13:27:04 +01:00
Jonas Nick
b2a7158c4e
Merge #279: Update nixpkgs
fabe4df478d7125155fab0d04620d9ade919a812 Update nixpkgs (Jonas Nick)
4318d0972de8d97767fabaf449f119c51c6549d3 Remove lightning-charge and nanopos from the unstable_pkgs CI test (Jonas Nick)
8e268c5ced755ac275f40501bb5061604869c98d Fetch from the nixpkgs repo instead of nixpkgs-channels (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK fabe4df478d7125155fab0d04620d9ade919a812

Tree-SHA512: b8445b9aff0fb57efb17cb162b6a07419063bfd6b3b2f71752d126a44d3a6dee6e8ccbc318c2b57d079e8915f525de7dffd7c0856fc78e864bb108bf4be9576f
2020-12-07 16:35:48 +00:00
Jonas Nick
7d370e9995
Merge #280: lnd: fix rpc/rest port configuration
5feb9e3eaea77d8db159d1d084a22434d3177841 lnd: fix rpc/rest port configuration (Martin Milata)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 5feb9e3eaea77d8db159d1d084a22434d3177841

Tree-SHA512: 7d743d4621e0a86dd636e77622a9369a630d6fe3375d0f89e22fc7175da94d5ab7eb17e61f3433061cb00ef5d5c9e7b51df6f7cd95578de9e33dd859c4547b46
2020-12-07 16:34:46 +00:00
Martin Milata
5feb9e3eae lnd: fix rpc/rest port configuration 2020-12-07 14:38:36 +01:00
Jonas Nick
fabe4df478
Update nixpkgs
Includes clightning: 0.9.1 -> 0.9.2 and btcpayserver: 1.0.5.5 -> 1.0.5.9
2020-12-07 12:30:11 +00:00
Jonas Nick
4318d0972d
Remove lightning-charge and nanopos from the unstable_pkgs CI test
They don't build with the nixpkgs-unstable update in the next commit and they're
deprecated anyway.
2020-12-07 12:29:59 +00:00
Jonas Nick
8e268c5ced
Fetch from the nixpkgs repo instead of nixpkgs-channels
nixpkgs-channels is deprecated.
2020-12-06 21:42:20 +00:00
Jonas Nick
ff7f5cc3bd
Merge #276: Use Cirrus CI
1c0233c0a8d35f73b1f2ba2ebd98f33590a0fd15 use Cirrus CI (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 1c0233c0a8d35f73b1f2ba2ebd98f33590a0fd15

Tree-SHA512: 504c3a7808b6138e97ad35d1c3fa0f8666eeff1b09d35d914745cc51f45af183fc9baa08ff4702335e2a67e0bb09164902d9f7357beb12c009ed2e6f9629dbf6
2020-12-06 20:24:38 +00:00
Erik Arvstedt
1c0233c0a8
use Cirrus CI
- Make more economic use of the free CI resources by removing redundant build tasks:
  - Build unstable pkgs in a single separate task ("pkgs_unstable").
  - All stable pkgs are implicitly built by the modules tests.
- The build script (ci/build.sh) can now be executed locally for easier
  debugging.
- Use an explicit 'cachix push' command instead of helper/wait-for-network-idle.rb.
  This is simpler and more reliable.
2020-12-06 19:07:54 +01:00
Jonas Nick
0b12a4b5a1
Merge #275: electrs: 0.8.5 -> 0.8.6
a6346c25618ffbfb6b4fc4ba3a20d7b13626e0e7 electrs: 0.8.5 -> 0.8.6 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK a6346c25618ffbfb6b4fc4ba3a20d7b13626e0e7

Tree-SHA512: 2440a30e5a158e78308e19af7aad8831a1b61a27581152867407ed92c2e6e353e27c9daef0ebf0f658f679f31739eb2428a94249f434cb653991c9d41aa1e15d
2020-12-01 20:43:27 +00:00
Erik Arvstedt
a6346c2561
electrs: 0.8.5 -> 0.8.6 2020-12-01 12:51:36 +01:00
Jonas Nick
e26d0577d9
Merge #270: Fix typo in gitignore
e01ef92379a303bdeb5730eca13eeabfaae12e0b Fix typo in gitignore (Daniela Brozzoni)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK e01ef92379a303bdeb5730eca13eeabfaae12e0b

Tree-SHA512: 77a48a42fe9cc828f0e0f933318d58bc3f90afed24167a353adfd4532e39d2ceab4917bb86d8718199852b1f4e593c408fc1f76e311252668acf382b1195a5e1
2020-11-25 13:00:28 +00:00
Daniela Brozzoni
e01ef92379
Fix typo in gitignore
Instead of excluding `examples/secrets` `example/secret` was excluded
2020-11-24 18:25:12 +01:00
Jonas Nick
fdc338e4a3
Merge #259: Adds curated clightning plugins
1d44b99340eb4535950f53579ff195de22e8b6cc add curated clightning plugins (Ian Shipman)
4640821f9660cc2231f3fabc88f793b7abbf3a87 make-test.nix: use writeText (Erik Arvstedt)
5399f73b2010293d3ab84cabdab894023152e844 add txzmq python pkg (Erik Arvstedt)
e62e163177940574143d27990c861ac8de847f3b add clightning python pkgs (Erik Arvstedt)
1a16e5523712dce7cc702128499dae41e268a338 move python packages to pkgs/python-packages (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 1d44b99340eb4535950f53579ff195de22e8b6cc
  nixbitcoin:
    ACK 1d44b99340eb4535950f53579ff195de22e8b6cc

Tree-SHA512: 566d1a606c27042de65d9291a2fbb2ee6866ae2befc43251e35b85cb035ed5aa26d7ef30bcf0364e045bd61d3460840ea5360466015d404febb5299a44c429f7
2020-11-22 20:06:22 +00:00
Ian Shipman
1d44b99340 add curated clightning plugins 2020-11-18 20:21:34 -06:00
Erik Arvstedt
4640821f96 make-test.nix: use writeText
Needed for the following commit which adds derivation outputs to `dataFile`.
2020-11-18 20:21:34 -06:00
Erik Arvstedt
5399f73b20 add txzmq python pkg 2020-11-18 20:21:34 -06:00
Erik Arvstedt
e62e163177 add clightning python pkgs 2020-11-18 20:21:34 -06:00
Erik Arvstedt
1a16e55237 move python packages to pkgs/python-packages
Remove obsolete passthru from joinmarket because joinmarket packages are
now accessible via pkgs/python-packages.
2020-11-18 20:21:34 -06:00
Jonas Nick
7e81071d0b
Merge #267: lightning-loop: 0.11.0-beta -> 0.11.1-beta
50372c9f2f97f372db3e24d93977cf3ec6114500 lightning-loop: 0.11.0-beta -> 0.11.1-beta (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 50372c9f2f97f372db3e24d93977cf3ec6114500

Tree-SHA512: 011e21cea2cc6c64b0a3a2ca1e0dd2704598bb8afa3531970d1571dffd94e451fa61a57059a6f41bb31039d16527c9da2c6fcaa5edcb99c21594bcf3882bea2b
2020-11-18 21:47:00 +00:00
nixbitcoin
50372c9f2f
lightning-loop: 0.11.0-beta -> 0.11.1-beta 2020-11-18 15:36:38 +00:00
Jonas Nick
ddd30cbb28
Merge #265: testing framework: re-add features removed in nixpkgs 20.09
7e3d2965a5ff0cce057bfca2e7f88d04a5f72192 testing framework: re-add features removed in nixpkgs 20.09 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 7e3d2965a5ff0cce057bfca2e7f88d04a5f72192

Tree-SHA512: d5527d56866f48022f8ccea3a85c41a5ea72288bc5dc87d920894af36619103d0a2734685d4ffd7c774aeb9ed4edcd7543fd223948f4cb12c022163dbec065a7
2020-11-14 22:13:05 +00:00
Erik Arvstedt
7e3d2965a5
testing framework: re-add features removed in nixpkgs 20.09
Since nixpks 20.09, the test output is just an empty directory.
Restore saving the log output and linking to the driver.

Without linking to the driver, the driver is eligible for
garbage collection after running a test via `run-tests.sh --out-link-prefix`,
which implies lengthy driver rebuilds.
2020-11-11 22:27:46 +01:00
Jonas Nick
3ba5888268
Merge #264: Fix containers for nixpkgs 20.09
f1681f5b45ebe2807503c2d8b00df701b4549ea8 add option nix-bitcoin.pkgs, remove overlay (Erik Arvstedt)
b1a5f5e7b9809f0bab83b0ebb82af62a6185986d don't add service-only pkgs to systemPackages (Erik Arvstedt)
e39ad358a4903ea9b79381b73ed384d11926eb67 lnd: remove unused bitcoind from PATH (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK f1681f5b45ebe2807503c2d8b00df701b4549ea8

Tree-SHA512: 1f55b015da3ab9696b6503b37bcf282e0c2776ea81117881e1b91d4807c4741c8fa9d0258d5e3fcd162b46836b245cf6f19ac8c0ca01481488de04df8eb39f96
2020-11-11 20:47:30 +00:00
Erik Arvstedt
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
Erik Arvstedt
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
Erik Arvstedt
e39ad358a4
lnd: remove unused bitcoind from PATH 2020-11-09 22:10:07 +01:00
Jonas Nick
eda6dcfde3
Merge #263: Update nixpkgs (stable 20.03 -> 20.09)
a36957203c2f72dc96f93ce9de652bc080d6b6ff Update nixpkgs (stable 20.03 -> 20.09) (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK a36957203c2f72dc96f93ce9de652bc080d6b6ff

Tree-SHA512: 3d30b4d44745453d3984da888a63cf3544b948d79d73fec38a40ec39f81567b89c8fb58e356ebcc2a0349535ba1df56afaaa053b90ae13e3c8b6e62146bfcfd1
2020-11-09 07:12:43 +00:00
Jonas Nick
a36957203c
Update nixpkgs (stable 20.03 -> 20.09) 2020-11-08 20:37:16 +00:00
Jonas Nick
4e8b9f2989
Merge #258: joinmarket 0.7.0 -> 0.7.2 & lightning-loop 0.10.0-beta -> 0.11.0-beta
546053511b041e401c09ea647d29cff95fa17ae3 lightning-loop: 0.10.0-beta -> 0.11.0-beta (nixbitcoin)
f2faf708fb61401c16f146a12fb5484d2db3da39 test: update joinmarket query strings (nixbitcoin)
59e128a994811d167fed8f88500671ddf438dcd7 joinmarket: add payjoin configuration (nixbitcoin)
f29f04c0c42a6bfd08eda0288a5c1591ab713ada secure-node: LND no longer requires ControlPort (nixbitcoin)
d4c0653c64e35a7a80dad4a62ebc0668987f1a5e joinmarket: 0.7.0 -> 0.7.2 (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 546053511b041e401c09ea647d29cff95fa17ae3

Tree-SHA512: b95742cba407725c95c240fb59b1a03dc27477c1d71e37b6e02847bb747e6cc7d51bb0960b299a1783ca5364706b0f2e6137aa4ab746a37c573196b0f22b551c
2020-11-06 12:17:18 +00:00
nixbitcoin
546053511b
lightning-loop: 0.10.0-beta -> 0.11.0-beta 2020-11-06 08:51:30 +00:00
nixbitcoin
f2faf708fb
test: update joinmarket query strings
JoinMarket changed message strings in
a2aafd254d and removed P2EPDaemonServerProtocolFactory in v0.7.1
2020-11-06 08:51:27 +00:00
nixbitcoin
59e128a994
joinmarket: add payjoin configuration 2020-11-06 08:51:25 +00:00
nixbitcoin
f29f04c0c4
secure-node: LND no longer requires ControlPort
Onion service is now generated through mkHiddenService function.
2020-11-06 08:51:23 +00:00
nixbitcoin
d4c0653c64
joinmarket: 0.7.0 -> 0.7.2 2020-11-06 08:51:15 +00:00
Jonas Nick
75bbd4d4a6
Merge #261: Fix netns restart
0972af55f16815c61626359be71cacf650d6400d netns: fix setup service restarts (Erik Arvstedt)
63a464431bfa4168d381901c62e51048113d130c netns: fail when netns already exists (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK 0972af55f16815c61626359be71cacf650d6400d

Tree-SHA512: 0923d26c144eb19a11ec4c1f0cd512bb7a70b12c9b73c787f4af476c95c91ea012ff593d2b59e1ccea34193c6995ba60783049c5086ab286b323460905ca62e7
2020-11-04 13:29:53 +00:00
Erik Arvstedt
0972af55f1
netns: fix setup service restarts 2020-11-03 21:55:13 +01:00
Erik Arvstedt
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
Jonas Nick
dbad828851
Merge #255: Improve netns-isolation and Tor config
b4b607dfa56eaa25a7af5eca55b3149322335db6 netns: simplify firewall setup (Erik Arvstedt)
25639cec427415a0e26d9ffcdc028edea1f11817 netns: fix error msg when starting netns (Erik Arvstedt)
67068afd6b92883df044678e18486e84d02761c5 netns: fix error when stopping netns (Erik Arvstedt)
4ff88efc500cdd7fd0a407c21087c4479390246a netns: add address binding test (Erik Arvstedt)
8da01fe8a65a7dacc9114b00a48432f2b93eea6b lightning-loop: allow RPC access from main netns (Erik Arvstedt)
d76b080b74e7f627ca7806398f716507932fc01a lightning-loop: add RPC and REST server options (Erik Arvstedt)
9ddf7864a4298df1dd996478f81a6a96d1a8af8f lightning-loop regtest: fix incorrectly succeeding test (Erik Arvstedt)
e66636ef0e2f35699516594acfb1b265377f4726 liquidd: use type str for rpcbind (Erik Arvstedt)
de23fdd37780406c9b09e9f0528d8f7ae7cf1a76 lnd: use type str for rpclisten, restlisten (Erik Arvstedt)
8b053326ccb9b08b585d65f54ad12ddbf86c1ff2 bitcoind: use type str for rpcbind (Erik Arvstedt)
6903e8afcce3af2689abe2a8c2454dc0c7774a5a netns-liquidd: allow RPC access from main netns (Erik Arvstedt)
82f4901880e5d8504c8f7d805f4597c0b2c2c6a9 netns-lnd: allow RPC access from main netns (Erik Arvstedt)
58d24e735de29fb76646b4032b53e82ae62ed9fa netns-bitcoind: allow RPC access from main netns (Erik Arvstedt)
0e2ff948d3223bf1ac9d6d6f7dbc22ab43aee60c test: add scenario 'netnsRegtest' (Erik Arvstedt)
e0675cb2564e5eeb41737554c27171c7bac0df1b move enforceTor logic to service modules (Erik Arvstedt)
0cc8caa737a6ac345af147d68f06cfa9d6bba262 lnd: only set tor.active on enforceTor (Erik Arvstedt)
9a931483b9a4be260b17b63e20eda829bad1281b netns test: remove strict dependency on clightning, electrs (Erik Arvstedt)
bae1b7f41331073d59a199cd1835e2c5a9889b49 netns test: improve ping test (Erik Arvstedt)
5e0e16529c573e8e377fe7ae87bb873a286db51b netns: fix default addressblock value type (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK b4b607dfa56eaa25a7af5eca55b3149322335db6
  nixbitcoin:
    ACK b4b607dfa56eaa25a7af5eca55b3149322335db6

Tree-SHA512: b290831d9a3fa4de56b0f19cf84a1998e830aa844532d7cba8cd8227c785a23bfa1514123a974652e8e61060e1297b6bfbcff9640580206a04c5292309b1daef
2020-11-02 16:11:34 +00:00
Erik Arvstedt
b4b607dfa5
netns: simplify firewall setup 2020-10-29 22:36:20 +01:00
Erik Arvstedt
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
Erik Arvstedt
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
Erik Arvstedt
4ff88efc50
netns: add address binding test
Proposed by Jonas Nick.
2020-10-29 21:21:30 +01:00