609 Commits

Author SHA1 Message Date
Jonas Nick
6e694890eb
Merge #203: Remove electrs tls
6365412312216391f58e2d4e0523ce6f4722179f test-script: remove nginx tls proxy test (nixbitcoin)
4dbc348921bffe19bd2c26f8313ace17f3e0cb61 electrs: remove TLSProxy (nixbitcoin)

Pull request description:

Top commit has no ACKs.

Tree-SHA512: 079a0c892f8e25d6ba0267cc99022550f4cfe74bad3f9270733ecda09350595a11aec8d40b89df6e6ad7cca1e26b7e480a265bf6e2d01d0fe912ca3ece00f655
2020-07-21 15:04:22 +00:00
nixbitcoin
6365412312
test-script: remove nginx tls proxy test 2020-07-21 13:58:32 +00:00
nixbitcoin
4dbc348921
electrs: remove TLSProxy
https://github.com/spesmilo/electrum/issues/5278 was resolved
2020-07-21 13:41:03 +00:00
Jonas Nick
6856b8cb42
Merge #210: bitcoind: postStart wait until bitcoind can receive rpc calls
02853067a14068b6f3b076da5a72f64658883307 bitcoind: postStart wait until bitcoind can receive rpc calls (nixbitcoin)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 02853067a14068b6f3b076da5a72f64658883307

Tree-SHA512: 601b04957a26853c04d768b074006f0716edb131698afde2afb94cb0c862dddb745b93ef39ed014f95a01545eb60d370fd82201d0a898c7dac4c19622d25dafe
2020-07-21 13:26:51 +00:00
nixbitcoin
02853067a1
bitcoind: postStart wait until bitcoind can receive rpc calls 2020-07-21 13:23:07 +00:00
Jonas Nick
aad0fe6e45
Merge #187: Network Namespaces
681728294bbebd16ab650e6542c7be3c05af6cbb tests: run scenarios as multiple Travis jobs (nixbitcoin)
43ce847e2b5c728018ac3219e29a14a36d6d25d5 tests: allow running integration tests with different configurations (nixbitcoin)
8783f38fba8ae6bc898c60b6a861c893089d5b46 tests: add netns to testing framework (nixbitcoin)
25adce29e508bf9013b5dc8096d5d1926e5f9542 secure-node: only mkHiddenServices if services are enabled (nixbitcoin)
c542b92e55d06a169e018d70565cfcf0e1b5d9a4 nginx: add netns (nixbitcoin)
ef89607704cef17566e6b9f38e1d36eab0249001 recurring-donations: add netns (nixbitcoin)
582cb86d7409bf4481fd2fa79b6d53bc136a6a6e nanopos: add netns (nixbitcoin)
7369f0a7ec5ec057a3360651bf2eab297fa829a0 lightning-charge: add netns (nixbitcoin)
c4ab73d51fc86434c8f3890e2622f522cac34481 spark-wallet: add netns (nixbitcoin)
d6296acabafdca807dcc10a9bdf71ecb7388988e electrs: add netns (nixbitcoin)
c0b02ac93a30abd606efe3f024bc2f1bb3beb33e liquid: add netns cli script (nixbitcoin)
672a416ede22fad6927ecfe3dfd9726a4ab0bc50 liquidd: add netns (nixbitcoin)
4b8ca52647accf351afd7416253576c27424e5a5 lnd: add netns cli script (nixbitcoin)
c55296433d4daff89ba8061447ec0519d801d267 lnd: add netns (nixbitcoin)
f3d2aaa5d44f93fc58738d0b6e73183b1d6919ad lnd: prepare for netns and bring in line with clightning (nixbitcoin)
3c0c4465470fb81d91e641c5a784c2008a2bc714 clightning: add netns (nixbitcoin)
ae1230e13b81bf6707ffe4572d6ccf8d6a7bef3a clightning: remove bitcoin-rpcuser option (nixbitcoin)
65b5dab3d4a453525e4d9e6a54a631c2644004b3 clightning: add announce-tor (nixbitcoin)
515aae28257a2a895044552fa9292ddc10ab501f bitcoind: add netns and nonetns cli scripts (nixbitcoin)
75ca6f186c36ed1c4c63facc3d93e24ca85177ae bitcoind: add netns (nixbitcoin)
e5e07b91f7c8babdf216931b3c770a99eee2baaf netns-isolation: netns architecture (nixbitcoin)
4a7199a3daaf0f4b9360203fd89d9e290c1d256a netns-exec: add c program to execute commands in netns (Jonas Nick)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 681728294bbebd16ab650e6542c7be3c05af6cbb

Tree-SHA512: 53083067dd94bfb38d06e9b7f0d2deaeb1b95067dc0c6e50d07073405ff5270de54fa56761e861d23eb0f0a9457f0e1e2c46ed71d732c0cfbaa09b6d425e0691
2020-07-21 12:05:50 +00:00
nixbitcoin
681728294b
tests: run scenarios as multiple Travis jobs 2020-07-21 09:39:01 +00:00
nixbitcoin
43ce847e2b
tests: allow running integration tests with different configurations 2020-07-21 09:38:59 +00:00
nixbitcoin
8783f38fba
tests: add netns to testing framework 2020-07-21 09:38:57 +00:00
nixbitcoin
25adce29e5
secure-node: only mkHiddenServices if services are enabled 2020-07-21 09:38:55 +00:00
nixbitcoin
c542b92e55
nginx: add netns
- Adds nginx to netns-isolation.services
- Adds host option (defaults to localhost) as target of hidden service
2020-07-21 09:38:53 +00:00
nixbitcoin
ef89607704
recurring-donations: add netns
- Adds recurring-donations to netns-isolation.services
- Adds cfg.enforceTor to bring recurring-donations in line with other
  services
- Removes torsocks dependency in favor of `curl --socks-hostname`
2020-07-21 09:38:51 +00:00
nixbitcoin
582cb86d74
nanopos: add netns
- Adds nanopos to netns-isolation.services
- Adds cfg.enforceTor and extraArgs to bring nanopos in line with other
  services
- Adds charged-url option to allow using nanopos with network
  namespaces.
- Modularizes nginx so webindex can be used without nanopos.
- Adds host option (defaults to localhost) as target of hidden service
- Removes unnecessary after
2020-07-21 09:38:49 +00:00
nixbitcoin
7369f0a7ec
lightning-charge: add netns
- Adds lightning-charge to netns-isolation.services
- Adds cfg.enforceTor to bring lightning-charge in line with other
  services
- Adds extraArgs option to allow using lightning-charge with network
  namespaces
- Adds host option (defaults to localhost) as target of hidden service
2020-07-21 09:38:47 +00:00
nixbitcoin
c4ab73d51f
spark-wallet: add netns
- Adds spark-wallet to netns-isolation.services
- Adds extraArgs option to allow using spark-wallet with network
  namespaces
- Adds host option (defaults to localhost) as target of hidden service
- Adds enforceTor option to bring in line with other services
2020-07-21 09:38:45 +00:00
nixbitcoin
d6296acaba
electrs: add netns
- Adds electrs to netns-isolation.services
- Adds daemonrpc option and specifies address option to allow using
  electrs with network namespaces
- Adds host option (defaults to localhost) as target of hidden service
2020-07-21 09:38:43 +00:00
nixbitcoin
c0b02ac93a
liquid: add netns cli script 2020-07-21 09:38:41 +00:00
nixbitcoin
672a416ede
liquidd: add netns
- Adds liquidd to netns-isolation.services
- Adds rpcbind, rpcallowip, and mainchainrpchost options to allow using
  liquidd with network namespaces
- Adds bind option (defaults to localhost) as target of hidden service
2020-07-21 09:38:39 +00:00
nixbitcoin
4b8ca52647
lnd: add netns cli script 2020-07-21 09:38:37 +00:00
nixbitcoin
c55296433d
lnd: add netns
- Adds lnd to netns-isolation.services
- Specifies listen option (defaults to localhost) as target of
  hiddenService.
- Amends hardcoded lnd ip to lnd-cert

WARNING: Breaking changes for lnd cert. lnd-key and lnd-cert will have
to be deleted and redeployed.
2020-07-21 09:38:35 +00:00
nixbitcoin
f3d2aaa5d4
lnd: prepare for netns and bring in line with clightning
- Adds bitcoind-host, and tor-socks options to allow using with
  network namespaces.
- Adds listen, rpclisten, and restlisten option to specify host on which
  to listen on for peer, rpc and rest connections respectively
- Adds announce-tor option and generates Tor Hidden Service with nix
  instead of lnd to bring in line with clightning.

WARNING: Breaking changes for Tor Hidden Service. Manual migration
necessary.
2020-07-21 09:38:32 +00:00
nixbitcoin
3c0c446547
clightning: add netns
- Adds clightning to netns-isolation.services
- Adds bitcoin-rpcconnect option to allow using clightning with network
  namespaces
- Uses bind-addr option (defaults to localhost) as target of hidden service
- Adds different bind-addr options depending on if netns-isolation is
  enabled or not.
2020-07-21 09:38:30 +00:00
nixbitcoin
ae1230e13b
clightning: remove bitcoin-rpcuser option
Simplifies the clightning module.
2020-07-21 09:38:28 +00:00
nixbitcoin
65b5dab3d4
clightning: add announce-tor
From the clightning manpage:

autolisten=BOOL By default, we bind (and maybe announce) on IPv4 and
IPv6 interfaces if no addr, bind-addr or  announce-addr options  are
specified. Setting this to false disables that.

We already set bind-addr by default, so autolisten had no effect.
Therefore, this commit replaces autolisten with the more granular
announce-addr option.

For now we are Tor-only, so we only need to announce our hidden service
to accept incoming connections. In the future, we can add clearnet
connectivity with `addr` and route connections into our netns with NAT.
2020-07-21 09:38:26 +00:00
nixbitcoin
515aae2825
bitcoind: add netns and nonetns cli scripts
nonetns script needed for bitcoind-import-banlist
2020-07-21 09:38:24 +00:00
nixbitcoin
75ca6f186c
bitcoind: add netns
- Adds bitcoind to netns-isolation.services
- Adds rpcbind and rpcallowip options to allow using bitcoind with
  network namespaces
- Adds bind option (defaults to localhost), used as target of hidden service
- Makes bitcoind-import-banlist run in netns
2020-07-21 09:38:22 +00:00
nixbitcoin
e5e07b91f7
netns-isolation: netns architecture
- Adds network namespace instantiation and routing architecture.
- netns-isolation disabled by default. Can be enabled with
  configuration.nix FIXME.
- Uses mkMerge to toggle certain options for non netns and netns
  systems.
- Adds security wrapper for netns-exec which allows operator to exec
  with cap_sys_admin
- User can select the 169.254.N.0/24 addressblock netns's are created in.
- nix-bitcoin-services IpAddressAllow is amended with link-local
  addresses
2020-07-21 09:38:20 +00:00
Jonas Nick
4a7199a3da
netns-exec: add c program to execute commands in netns
c program allows executing commands in nb-bitcoind, nb-lnd, nb-liquidd
(the netns's needed for operator cli scripts).
2020-07-21 09:38:16 +00:00
Jonas Nick
5bb9aa5d6d
Merge #201: Update: nixpkgs and elementsd
ae364a68ad969cddcbaafc5dcb9973be712bf292 hwi: 1.0.3 -> 1.1.2 (nixbitcoin)
fe6e118bb33ef94eee5c831504a69bd28b6ee8c5 elementsd: 0.18.1.3 -> 0.18.1.8 (nixbitcoin)
5ca58a2a2662a900c0ac65106dd8b89ef05989a4 nixpkgs: update stable and unstable (nixbitcoin)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK ae364a68ad969cddcbaafc5dcb9973be712bf292

Tree-SHA512: b8eb4be1ae6496586acb3d0635d6dea676f029a85f17512dccab280aaf3135fccf0455feaf17517e54af85aa5bf92d13df3194ba8893d7c7631d089b9b208b8d
2020-07-19 19:27:11 +00:00
nixbitcoin
ae364a68ad
hwi: 1.0.3 -> 1.1.2
hidapi needed to be added as a custom dependency to be able to build
from unstable.
2020-07-19 13:52:46 +00:00
nixbitcoin
fe6e118bb3
elementsd: 0.18.1.3 -> 0.18.1.8
Also includes `get-sha256.sh` to easily determine verified sha256's
2020-07-19 12:15:39 +00:00
nixbitcoin
5ca58a2a26
nixpkgs: update stable and unstable
Includes bitcoin 0.20.0 and lnd 0.10.3
2020-07-19 12:15:33 +00:00
Jonas Nick
b2d6f0929b
Merge #208: Missing folder added to path in example
56b6ce00afa1f930719e74c1f788b72d3d1c2c34 Missing folder added to path in example (Candle)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    ACK 56b6ce00afa1f930719e74c1f788b72d3d1c2c34

Tree-SHA512: 1f32f7b528f63218e47285cfb0b899c935312d35bb0c01e6edac0820e2324eb05f1c6803a43692fde30310c8f31e56a39d7c9dddc6ef8014817606205f34c18c
2020-07-10 07:03:49 +00:00
Candle
56b6ce00af
Missing folder added to path in example 2020-07-09 14:51:16 +00:00
Jonas Nick
5563a9e10b
Merge #205: Update jonasnick's gpg key
d63bbd07b74741c73d9704cc0a2acd12c5dc8b09 Update jonasnick's gpg key (Jonas Nick)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    ACK d63bbd07b74741c73d9704cc0a2acd12c5dc8b09

Tree-SHA512: 67f8b8ce434cadb760745266b41eb1441487f4176b9d6b3f98ecfc3e2d059ffe709cc1c3c07a0641448c3c2faaf813352abcc35cd831f95abbf5899a92ee772d
2020-07-08 12:16:55 +00:00
Jonas Nick
d63bbd07b7
Update jonasnick's gpg key
The subkey used for signing releases recently expired (which is ignored when
verifying with gpg). The primary key would expire soon. Therefore this commit
adds a key with extended expiry date of both primary key and subkey.
2020-07-08 12:03:57 +00:00
Jonas Nick
c93d326cfc
Merge #204: electrs: 0.8.3 -> 0.8.5
a20807b8a3573c4c93ae90a0a2ccf083aad05f8c travis: fix (nixbitcoin)
e81ccb659659bed87d0b76cbe0086ea77fad9e38 electrs: 0.8.3 -> 0.8.5 (nixbitcoin)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK a20807b8a3573c4c93ae90a0a2ccf083aad05f8c

Tree-SHA512: 0be617a32e7daf28c9cd14e7827f13fff0176edd2dd5da210533b5758610ed66ec58acbfb5f632fb72168cdc02c2cb57565038e643ae4c0169b4752d92520bfa
2020-07-08 10:17:04 +00:00
nixbitcoin
a20807b8a3
travis: fix
Simplify installing nix package manager. Issue 2733 is fixed in nix
2.3.3 and travis installs 2.3.6.
2020-07-08 09:26:33 +00:00
nixbitcoin
e81ccb6596
electrs: 0.8.3 -> 0.8.5 2020-07-07 10:54:40 +00:00
Jonas Nick
a03597ae8e
Merge #189: Update configuration.nix
f280d54bb88e2d0e9603f9cc4214ff536c9944b8 add module assertions (nixbitcoin)
23cd323ad12cabe4c3921234de480a2f94e50661 assertions: add lnd, clightning exclusivity (nixbitcoin)
0ad524ca2d4125909b40b0661a20f126ab85c056 example config: clarify nix-bitcoin will auto-detect invalid settings (nixbitcoin)
c16924b8506889c118b6a380d4a7024e5d5422f8 example config: change hwi excluding dependency to high-memory (nixbitcoin)
0fd99c4cc0f3da94ba6d65671c23f7b32b27b740 bitcoind: simplify pruning (nixbitcoin)
b9a7a71873475deca779029f5377b117ad8cc57d example config: document enabling pruning (nixbitcoin)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK f280d54bb88e2d0e9603f9cc4214ff536c9944b8

Tree-SHA512: a900dc2b95cdc01b457c65853930cb1c31b5288fab06d665207ffb2bcd1d54d75add73113ccaacd98e882d4e6674eb8393fec1ae0a01688de1b56250d5d3d3d6
2020-06-17 09:27:46 +00:00
nixbitcoin
f280d54bb8
add module assertions 2020-06-17 09:23:17 +00:00
nixbitcoin
23cd323ad1
assertions: add lnd, clightning exclusivity 2020-06-15 13:02:58 +00:00
nixbitcoin
0ad524ca2d
example config: clarify nix-bitcoin will auto-detect invalid settings 2020-06-15 10:56:01 +00:00
nixbitcoin
c16924b850
example config: change hwi excluding dependency to high-memory
HWI can be enabled if electrs is enabled as long as electrs.high-memory
is disabled.
2020-06-15 10:55:59 +00:00
nixbitcoin
0fd99c4cc0
bitcoind: simplify pruning
Remove the possible null value for bitcoind.prune and set prune = 0 in
bitcoind as a default. Remove prune = 0 in secure-node.nix and the
mkForce in configuration.nix (bitcoind.prune = lib.mkForce ).
2020-06-15 10:55:57 +00:00
nixbitcoin
b9a7a71873
example config: document enabling pruning 2020-06-15 10:55:55 +00:00
Jonas Nick
919ea334a3
Merge #199: banlist: update to newest version
12adabe407dda2818e6e379aca2e3c732ddcb305 banlist: update to newest version (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 12adabe407dda2818e6e379aca2e3c732ddcb305.
  jonasnick:
    ACK 12adabe407dda2818e6e379aca2e3c732ddcb305

Tree-SHA512: 9dc7816817f524d06f40f16fb73253d2623e32eee48f7d296fb3d0682c0f0c8fd166d7d818298ffbb87004a4ee06a314282a8cff21cd451e38267c1eb97e990e
2020-06-12 20:58:35 +00:00
nixbitcoin
12adabe407
banlist: update to newest version
Received by E-Mail from gmaxwell
2020-06-11 09:23:26 +00:00
Jonas Nick
94672e8f34
Merge #188: lnd: add option for configuring REST port
03a627a06f62446a388ce76dc8ea1305fcb22317 lnd: add option for configuring REST port (Martin Milata)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    ACK 03a627a06f62446a388ce76dc8ea1305fcb22317

Tree-SHA512: b184d5ee825382d1f104e17a091ff49fa170230e4e690323cdfd570a0c7f0bf11e57da84f39fda9169fcbead75f0c0597268f728665135e743fa7fee73a1b66c
2020-06-07 14:40:54 +00:00
Jonas Nick
16e602e2b5
Merge #190: services: use 'port' option type
db48ab9b6946c0222810e7e516c2271803a0c5ab services: use 'port' option type (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK db48ab9b6946c0222810e7e516c2271803a0c5ab

Tree-SHA512: 24cf0c307b40652d1275575fdf4216696890b0f7786832e7bbee9e21cf6d23d3fc35480926c475fc98c17eba668f5ee2c8c0875689e725c8ad05f2fb6b9ecd20
2020-06-05 20:40:57 +00:00