Merge remote-tracking branch 'upstream-pull/99/head'
This commit is contained in:
commit
30b04d075f
@ -10,6 +10,7 @@ let
|
|||||||
${optionalString cfg.testnet "testnet=1"}
|
${optionalString cfg.testnet "testnet=1"}
|
||||||
${optionalString (cfg.dbCache != null) "dbcache=${toString cfg.dbCache}"}
|
${optionalString (cfg.dbCache != null) "dbcache=${toString cfg.dbCache}"}
|
||||||
${optionalString (cfg.prune != null) "prune=${toString cfg.prune}"}
|
${optionalString (cfg.prune != null) "prune=${toString cfg.prune}"}
|
||||||
|
${optionalString (cfg.validatepegin != null) "validatepegin=${if cfg.validatepegin then "1" else "0"}"}
|
||||||
|
|
||||||
# Connection options
|
# Connection options
|
||||||
${optionalString (cfg.port != null) "port=${toString cfg.port}"}
|
${optionalString (cfg.port != null) "port=${toString cfg.port}"}
|
||||||
@ -166,6 +167,13 @@ in {
|
|||||||
to stay under the specified target size in MiB)
|
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;
|
enforceTor = nix-bitcoin-services.enforceTor;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -143,6 +143,7 @@ in {
|
|||||||
mainchainrpcuser=${config.services.bitcoind.rpcuser}
|
mainchainrpcuser=${config.services.bitcoind.rpcuser}
|
||||||
mainchainrpcport=8332
|
mainchainrpcport=8332
|
||||||
";
|
";
|
||||||
|
services.liquidd.validatepegin = true;
|
||||||
services.liquidd.listen = true;
|
services.liquidd.listen = true;
|
||||||
services.liquidd.proxy = config.services.tor.client.socksListenAddress;
|
services.liquidd.proxy = config.services.tor.client.socksListenAddress;
|
||||||
services.liquidd.enforceTor = true;
|
services.liquidd.enforceTor = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user