Merge remote-tracking branch 'upstream-pull/99/head'

This commit is contained in:
Jonas Nick 2019-08-01 12:53:51 +00:00
commit 30b04d075f
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 9 additions and 0 deletions

View File

@ -10,6 +10,7 @@ let
${optionalString cfg.testnet "testnet=1"}
${optionalString (cfg.dbCache != null) "dbcache=${toString cfg.dbCache}"}
${optionalString (cfg.prune != null) "prune=${toString cfg.prune}"}
${optionalString (cfg.validatepegin != null) "validatepegin=${if cfg.validatepegin then "1" else "0"}"}
# Connection options
${optionalString (cfg.port != null) "port=${toString cfg.port}"}
@ -166,6 +167,13 @@ in {
to stay under the specified target size in MiB)
'';
};
validatepegin = mkOption {
type = types.nullOr types.bool;
default = null;
description = ''
Validate pegin claims. All functionaries must run this.
'';
};
enforceTor = nix-bitcoin-services.enforceTor;
};
};

View File

@ -143,6 +143,7 @@ in {
mainchainrpcuser=${config.services.bitcoind.rpcuser}
mainchainrpcport=8332
";
services.liquidd.validatepegin = true;
services.liquidd.listen = true;
services.liquidd.proxy = config.services.tor.client.socksListenAddress;
services.liquidd.enforceTor = true;