greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,446 Commits 8 Branches 0 Tags
Commit Graph

646 Commits

Author SHA1 Message Date
Jonas Nick
19abacc41c
Merge fort-nix/nix-bitcoin#458: liquidd: add service timeouts like in bitcoind 
2493c8c20186d2aae93388ab3cf92865a01fac1e liquidd: add service timeouts like in bitcoind (Erik Arvstedt)
59bf0274c0e9fb1d13fc1e7ebb145d9289a43ac0 pkgs: add groups, sort alphabetically (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    ACK 2493c8c20186d2aae93388ab3cf92865a01fac1e

Tree-SHA512: 229f57a4093b996d500f95f81992b7f0314596828639179ed57936a4bc5d0f556498bf29e1acd9aabd3cbee97f034ccabd9dad2fde01deddc5e226c6c46c7bb2
 2022-03-01 14:21:39 +00:00
Erik Arvstedt
2493c8c201
liquidd: add service timeouts like in bitcoind 
Previously, liquidd could fail with error:
liquidd.service: start operation timed out. Terminating.
 2022-02-28 14:01:54 +01:00
Jonas Nick
2618af74e4
Merge fort-nix/nix-bitcoin#445: clightning-plugins: add commando plugin 
ee4cdb0586117125fd1a2c2329655aeedd601da7 pyln-proto: relax pycparser constraint (William Casarin)
2d6c4e829e655260dd4f33f2dae85ae1e8090ed7 readme: fix monitor c-lightning plugin link (William Casarin)
0bede274a8054f126d8f2bf811ced45efd7cbbe9 clightning-plugins/commando: add module (Erik Arvstedt)
380ec3bb7871ddeb9cc9768433d20af31ee9e5ae clightning-plugins: add commando (William Casarin)
80312ba9d7176a5877a93052b759fb88674566cf python-packages/sha256: init at 0.1 (William Casarin)
71eccb73d63b758aa7c8f404ce5549124c602b5d python-packages/runes: init at 0.4.0 (William Casarin)
570e2716955f3c85092a505860f3ff13ea751953 clightning-plugins: bump to latest git (William Casarin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK ee4cdb0586117125fd1a2c2329655aeedd601da7

Tree-SHA512: 2db97ee758f061ce72f8e049299c453cc4e9947d9af55c68745aa15bcd9529cb47defb52366ca216249441fb8e113c3b3b048a5381f41fd1ef80e677dae0fe37
 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
0ac9d6f4c8
Merge fort-nix/nix-bitcoin#450: Misc. improvements 
d959d5b5581a02b6faef30f876489ca1cf89c564 secure-node: don't set `nix-bitcoin.secretsDir` (Erik Arvstedt)
7b0c3d48c9f347a2738a282ec3b813e35c2612ad docs/services.md: link to clightning plugin list (Erik Arvstedt)
7402212263c332a933fe46131583d8f9c3ad5b63 examples/configuration.nix: disable `passwordAuthentication` (Erik Arvstedt)
e093bb64d98e7851e54acb188f8d3be7b8c33582 examples/configuration.nix: fix links to `docs/services.md` (Erik Arvstedt)
d41a550355379461fe2a20961dea9837f186ad49 fetch-release: export GNUPGHOME (Erik Arvstedt)
397b372cf36f3f5d79dbe1f301b61437eeea0144 bitcoind: improve option `rpc.users` (Erik Arvstedt)
679e7b6544f83ef77af40f09cfb8d6e664be2378 bitcoind: remove unneeded tmpfile rule (Erik Arvstedt)
98f419233f0b90d764efdb212db0551044d3faad bitcoind: don't log timestamps (Erik Arvstedt)
6f8b4d9ebe00e7b62ce5bff1fb3a9573d976b721 flake: optimize nixpkgs importing (Erik Arvstedt)
16e2d4c8b714f3861405bb610694a0e3dc6a7ee9 flake: remove unneeded indirection in legacyPackages (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK d959d5b5581a02b6faef30f876489ca1cf89c564

Tree-SHA512: e62fcf36ac77df62b9f86279d0ebac807525d188cbf1ee5c13cf1406b3caadad0f2df7527b0c8713259cbc6d5cdfa006f01e90d5377f974213f204a2f85a8ae6
 2022-02-06 17:00:59 +00:00
Erik Arvstedt
d959d5b558
secure-node: don't set nix-bitcoin.secretsDir 
This simplifies the docs and the secure-node module.

This change doesn't affect users that deploy via krops.
 2022-02-05 21:35:50 +01:00
Erik Arvstedt
397b372cf3
bitcoind: improve option rpc.users 
- Move description to top
- Improve example
 2022-02-03 20:47:25 +01:00
Erik Arvstedt
679e7b6544
bitcoind: remove unneeded tmpfile rule 2022-02-03 20:47:25 +01:00
Erik Arvstedt
98f419233f
bitcoind: don't log timestamps 
Timestamps are already logged via journald.
 2022-02-03 20:47:25 +01:00
Konstantin Nick
793a127372 [LND] Remove pruning assertion 2022-02-03 09:34:24 +01:00
Erik Arvstedt
d8af0aca02
lnd: improve service initialization 
- Use systemd startup notification.
- Use new option `--wallet-unlock-password-file` instead of
  manual unlocking.
 2022-01-15 22:49:05 +01:00
nixbitcoin
40c5f63f04
joinmarket: fix fidelity bond default values 2022-01-11 11:05:42 +00:00
Erik Arvstedt
bf92d6094d
bitcoind: fix error when defining passwordHMAC for RPC users 2022-01-07 03:32:07 +01:00
Erik Arvstedt
5ab85cb2a5
pkgs: add meta attr 
Also add more detailed `enable` option descriptions.
 2021-12-15 14:39:31 +01:00
Erik Arvstedt
602281b132
rtl, cl-rest: add /bin to pkg output 2021-12-15 10:58:04 +01:00
Erik Arvstedt
d296b2d1fb
charge-lnd: remove unneeded use of literalExample 2021-12-15 10:58:04 +01:00
Erik Arvstedt
bbebd0b383
treewide: remove invalid docbook XML from option descriptions 
NixOS will soon use CommonMark Markdown for option descriptions.
We can then switch back the old, slightly clearer bracket syntax.
 2021-12-12 16:20:40 +01:00
Erik Arvstedt
3681f118f7
nix-bitcoin.nix: add defaultText (automatic) 
This enables generating module option documentation.

This commit was genereated by running the following script inside the
repo root dir:

def add_default_text(file)
  src = File.read(file)
  src2 = src.gsub(/( = mkOption\s+\{[^{]*?)(\n\s+default = )(.*?);$(.*?\})/m) do |str|
    pre, defaultVar, default, post = Regexp.last_match.captures
    replacement =
      if !post.include?('defaultText =')
        if default =~ /\bpkgs\b/
          defaultText = default.lines.length == 1 ? default : "(See source)"
          "#{pre}#{defaultVar}#{default};#{defaultVar.sub('default', 'defaultText')}#{defaultText.inspect};#{post}"
        end
      end
    replacement or str
  end
  File.write(file, src2) if src2 != src
end

Dir["modules/**/*.nix"].each do |f|
  next if File.basename(f) == "nix-bitcoin.nix"
  add_default_text f
end
 2021-12-12 16:20:39 +01:00
Erik Arvstedt
d24c029435
treewide: add defaultText (manual) 
This enables generating module option documentation.

Add `defaultText` to options where the default value can't be
evaluated during metadata generation.
 2021-12-12 16:18:14 +01:00
Erik Arvstedt
f0096371bf
btcpayserver: expand nbPkgs in option defaults 
Required by commit `nix-bitcoin.nix: add `defaultText` (automatic)`.
 2021-12-11 13:27:51 +01:00
Erik Arvstedt
349f904e79
secrets: use assertion instead of error in default value 
This enables generating module option documentation.
 2021-12-11 13:27:48 +01:00
Erik Arvstedt
2f0f1ec15a
hardened-extended: define kernelParams as separate strings 
This is now checked by the modules.
 2021-12-10 12:16:31 +00:00
Erik Arvstedt
71e9864060
netns-isolation: add compatibility with 21.11 
`security.wrappers` now requires `group` be defined.
 2021-12-10 12:16:09 +00:00
nixbitcoin
b5984a603c
joinmarket: 0.9.3 -> 0.9.4 
Ilita IRC server & use upstream twisted again
 2021-12-08 12:38:28 +00:00
nixbitcoin
1a8e7d6348
clightning: re-enable seccomp filtering 2021-12-08 12:38:10 +00:00
Erik Arvstedt
6b539627ee
add presets/bitcoind-remote.nix 
This simplifies integrating a remote bitcoind instance and
makes `bitcoin-cli` work with the remote node.

Add note regarding `whitelistedPort` to docs.
 2021-12-07 15:35:33 +01:00
Erik Arvstedt
1596b3a5d2
minor fixes 
- README: fix uppercase

- bitcoind: add whitespace

- hardware-wallets: remove unused variables
 2021-12-07 15:35:33 +01:00
Jonas Nick
747019a9e9
Merge fort-nix/nix-bitcoin#425: Misc. improvements 
def64a73b8d87a1c6cb261508b53c9477d3b049f treewide: use TODO-EXTERNAL (Erik Arvstedt)
6f37bef2a359ee7f3926e3a253711cb2f04ff95f netns-isolation: simplify firewall setup (Erik Arvstedt)
f52059ce3c3729fd68245d6781e7c4f13ffd0a6b docs: add doc 'Configuration and maintenance' (Erik Arvstedt)
94aee8174d291a7f1265834c8e515a64451841eb usage.md: add section `Managing services` (Erik Arvstedt)
8cc7b83da1077f68f7323a26717212b506f45ef9 usage.md: convert to '#' heading syntax (Erik Arvstedt)
91fbcfcc776db3201ee30869f9dded59931786a7 faq.md: reformat (Erik Arvstedt)
9e4f4d6b0f9fd57ee893adb754e76501c98d36fc bitcoind: add option `txindex` (Erik Arvstedt)
10a744a59845e59c7a31ac4fd922368110728047 rtl: add option `extraCurrency` (Erik Arvstedt)
62a2602e7832e01b668090d5f3df1d9b2c231d11 electrs: use dataDir for storing extra config (Erik Arvstedt)
9bda7305fd270765734b7a08f3a45dd8debe1650 services: add `tor.*` options (Erik Arvstedt)
ff24e73ad7491cb5b26ae1492ada803f6960992b onion-addresses: fix files not being copied (Erik Arvstedt)
c6fe017aeb8acde5b14ab91c4f76cc1f5ed9fdd3 netns-isolation: avoid creating service files for disabled services (Erik Arvstedt)
017e08ca10d44d3e08b11de3c6c5613c89c5999c btcpayserver: move nbxplorer options to bottom (Erik Arvstedt)
e1d869d76c40c5d981b302a1df102891e4e2560c modules.nix: move rtl to fix topological sorting (Erik Arvstedt)
e44cd7ecdc7ae72cf7256d01bdf4efbf9d06f417 rtl: improve descriptions (Erik Arvstedt)
bd275d3a9ad45d950e157821d4345d2d37257c08 minor improvements (Erik Arvstedt)
8aa28da110123c1d5de9dad343615dace8cb4337 remove `recurring-donations` module (Erik Arvstedt)

Pull request description:

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

Tree-SHA512: 13acd2a3dd73c07f9c31874c8e961f12f39accb48847cbad08479b9a8154b79a6f186819272072dfb5c4768264b81f6e058e9afa57a729db2096784e48352dfd
 2021-11-29 18:05:19 +00:00
Erik Arvstedt
def64a73b8
treewide: use TODO-EXTERNAL 
Use TODO-EXTERNAL for TODOs that depend on external factors like
upstream fixes.
 2021-11-29 13:47:48 +01:00
Erik Arvstedt
6f37bef2a3
netns-isolation: simplify firewall setup 
Set all allowed INPUT/OUTPUT addresses in a single `iptables` command.
 2021-11-29 13:47:48 +01:00
Erik Arvstedt
9e4f4d6b0f
bitcoind: add option txindex 2021-11-29 13:22:44 +01:00
Erik Arvstedt
10a744a598
rtl: add option extraCurrency 2021-11-29 13:22:44 +01:00
Erik Arvstedt
62a2602e78
electrs: use dataDir for storing extra config 
This is simpler and more memory-efficient.
We've also changed other services to use this appraoch.

Also remove unneded `wait_for_unit` in the electrs regtest test.
 2021-11-29 13:22:44 +01:00
Erik Arvstedt
9bda7305fd
services: add tor.* options 
Split `enforceTor` into `tor.proxy` and `tor.enforce`.
By enabling `tor.proxy` without `tor.enforce`, a service can accept
incoming clearnet connections.
E.g., this allows setting up a Tor-proxied bitcoind node that accepts
RPC connections from LAN.
 2021-11-29 13:22:43 +01:00
Erik Arvstedt
ff24e73ad7
onion-addresses: fix files not being copied 
When NixOS is already running and Tor is restarted due to config
changes, `/var/lib/tor/state` may be present even when Tor has not
yet finished setting up onion services.
This caused the previous version of `onion-addresses` to not wait for
Tor and to skip not yet present onion service files.

`onion-addresses` now waits until each required onion service file
has appeared.
 2021-11-29 13:22:43 +01:00
Erik Arvstedt
c6fe017aeb
netns-isolation: avoid creating service files for disabled services 
Only set the `serviceConfig` option when the service is enabled.
Otherwise a service file is created.
 2021-11-29 13:22:43 +01:00
Erik Arvstedt
017e08ca10
btcpayserver: move nbxplorer options to bottom 
These are largely irrelevant to end users.
 2021-11-28 21:18:49 +01:00
Erik Arvstedt
e1d869d76c
modules.nix: move rtl to fix topological sorting 
rtl depends on lnd and lightning-loop.
 2021-11-28 21:18:47 +01:00
Erik Arvstedt
e44cd7ecdc
rtl: improve descriptions 
Also move cl-rest to the bottom.
 2021-11-28 21:18:44 +01:00
Erik Arvstedt
bd275d3a9a
minor improvements 
- README:
  - Add RTL

- examples/configuration.nix:
  - Fix comment

- btcpayserver.nix:
  - Use nbLib.addressWithPort
  - Embed optionalString like the other optionalStrings

- clboss.nix:
  - Improve description

- clightning.nix:
  - Option `extraConfig`: Add example, improve description.
  - Disable `log-timestamps`. Timestamps are already logged via journald.
  - Simplify `preStart` script

- electrs.nix:
  - Use `port` description wording like in other services.
 2021-11-28 21:18:40 +01:00
Erik Arvstedt
8aa28da110
remove recurring-donations module 
This module has failed to evaluate for quite some time.
We might bring it back someday with bolt12 and LNURL support.
 2021-11-28 21:18:39 +01:00
Jonas Nick
76737ead9f
update nixpkgs 
btcpayserver: 1.3.3 -> 1.3.6
electrs: 0.9.2 -> 0.9.3
lnd: 0.13.3-beta -> 0.14.1-beta
nbxplorer: 2.2.16 -> 2.2.18

electrs does not accept command line argument -vv anymore, so we have to use
--log-filter instead.
 2021-11-28 17:34:10 +00:00
Jonas Nick
6673c8245c
Merge fort-nix/nix-bitcoin#423: Misc. improvements 
4a74b7de084f46655b1f11f738d9e1763ccefcc7 clightning: work around unsupported seccomp syscall (Erik Arvstedt)
38a843d005698152e0d9cf0753a82f84944c40fe clightning: update python pkgs to new version (Erik Arvstedt)
6ad7107ddbd26a45b3838c38301bc4bbad40e4e4 update nixpkgs (Erik Arvstedt)
f58d67677e3179258159d0dc3145ac1aac65e1ec netns-isolation: separate host and netns setup (Erik Arvstedt)
cb6e5ef7029954a737bdb45401c573d051cf9501 netns-isolation: fix routing issues due to netns restarting (Erik Arvstedt)
7f77147b600b62326db9192c2f0c2e5ac62236be makeShell: minor improvements (Erik Arvstedt)
a5730eb736c2f71b3762621d978e38258932799a makeShell: make the help msg a shell derivation variable (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 4a74b7de084f46655b1f11f738d9e1763ccefcc7

Tree-SHA512: 75454b51db6d7ab41590d8579e0a5136e5ac1be78d5c2f547c6ef1982c0de679968879bb9bac57dd66413f59a4659236601ab75414486b0137c7c43d73d22759
 2021-11-10 21:57:16 +00:00
Erik Arvstedt
4a74b7de08
clightning: work around unsupported seccomp syscall 2021-11-10 21:26:56 +01:00
nixbitcoin
f569227410
rtl: add module 2021-11-09 14:13:42 +00:00
Erik Arvstedt
f58d67677e
netns-isolation: separate host and netns setup 
- Improves readability

- `netns exec ...` (called via `netnsIptables`) incurs a large
  overhead: In addition to netns switching, a mount namespace
  is setup and populated with the contents of /etc/netns/<ns>/.
  Instead, simply run `nsenter`.
 2021-11-08 12:46:28 +01:00
Erik Arvstedt
cb6e5ef702
netns-isolation: fix routing issues due to netns restarting 
Previously, restarting a service implied restarting its netns.
For unknown reasons, this sometimes caused the netns-local address
to not be routable from the root netns for up to 20 s.
I.e., the service was sometimes unreachable after restarting.

Now the netns is no longer stopped when the service is stopped.
 2021-11-08 12:46:27 +01:00
Jonas Nick
3f844c06f0
Merge fort-nix/nix-bitcoin#418: update nixpkgs 
b3e868d0af9a1b724d8466affbaa4c7d5454084d tests/regtest: disable incompatible `validatepegin` for liquidd (Erik Arvstedt)
c30fe1919b81d89e0d6e22a58028c7b7e112c16d netns-isolation: don't auto-assign IPv6 addrs to peer links (Erik Arvstedt)
6584540828242d15ab9f50831b47581d9ff793a2 makeShell: make help message extensible (Erik Arvstedt)
0478354477c67de6df65ca1c070deb2b200d30ea versioning: move variable (Erik Arvstedt)
8616254d63a391a1f7948cb6b4c3273b134d7496 bitcoind-rpc-public-whitelist: remove waitfornewblock (Erik Arvstedt)
083e141e3e6dabeceb83221fbd2a8296f98f42db tests/btcpayserver: test bitcoind P2P connection in regtest (Erik Arvstedt)
82c92df162b6635708f7b281b749ae8eb25defa4 tests/regtest: fix restarting bitcoind (Erik Arvstedt)
49086abcc53f80134e5fa62cea5e5edbe9f5e8da liquidd: use systemd startup notification (Erik Arvstedt)
b83fd845c29787504f2e3378bb7ca1198f25ac3d update nixpkgs (nixbitcoin)
852c112603fb93d552904f8664dba3c798ebaea9 Use HTTPS URL for spark-wallet GitHub node packages (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK b3e868d0af9a1b724d8466affbaa4c7d5454084d
  jonasnick:
    utACK b3e868d0af9a1b724d8466affbaa4c7d5454084d

Tree-SHA512: 300410157a54f90f40abda064ed9b8f2310e3002bd2eac0527404d5402cd7d87c2d2d1d79d68cf1569841645c333b281d706607deae9461e1ef07f6c20427297
 2021-11-03 10:25:38 +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