Skip to content
Permalink
Browse files

Merge #20

20: Pbft threshold scripts r=disassembler a=disassembler

Adds pbftThreshold parameter to envConfig. Can be overrided with customConfig.

Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
  • Loading branch information...
iohk-bors and disassembler committed Aug 13, 2019
2 parents fd0273a + 8751c3a commit c76343381d6766554f67428f5b8c33e06de25864
Showing with 7 additions and 4 deletions.
  1. +5 −2 nix/byron-proxy-scripts.nix
  2. +2 −2 nix/old-cardano-sl-src.json
@@ -11,16 +11,19 @@ let
relays: [[{ host: ${relay} }]]
'';
pkgs = commonLib.pkgs;
inherit (pkgs) lib;
mkProxyScript = environment: let
envConfig = environments.${environment};
config = {
proxyHost = "127.0.0.1";
proxyPort = 7777;
topologyFile = mkTopology envConfig.relays;
loggingConfig = ../cfg/logging.yaml;
} // customConfig;
pbftThreshold = null;
} // envConfig
// customConfig;
in with config; pkgs.writeScript "byron-proxy-${environment}" ''
exec ${byronProxy}/bin/cardano-byron-proxy +RTS -T -RTS --database-path db-byron-proxy-${environment} --index-path index-byron-proxy-${environment} --configuration-file ${configuration}/lib/configuration.yaml --configuration-key ${envConfig.confKey} --topology ${topologyFile} --logger-config ${loggingConfig} --local-addr [${proxyHost}]:${toString proxyPort}
exec ${byronProxy}/bin/cardano-byron-proxy +RTS -T -RTS --database-path db-byron-proxy-${environment} --index-path index-byron-proxy-${environment} --configuration-file ${configuration}/lib/configuration.yaml --configuration-key ${envConfig.confKey} --topology ${topologyFile} --logger-config ${loggingConfig} --local-addr [${proxyHost}]:${toString proxyPort} ${lib.optionalString (pbftThreshold != null) "--pbft-threshold ${pbftThreshold}"}
'';
configuration = cardanoConfig;

@@ -1,6 +1,6 @@
{
"url": "https://github.com/input-output-hk/cardano-sl",
"rev": "21c288c4ef2011b7fbe5b52d61f49ee49820a4fe",
"sha256": "13bkyl9kh918gdipgv9hpyxh7h45dr4bd34q9mpspbif6sh380ip",
"rev": "95beb3b78f20738e71df4bcc44de0f0bb17c47d6",
"sha256": "15qmi283x3azifpslq67wx0pa47xm2rv9fi4iazmmg9mp88m25z3",
"fetchSubmodules": false
}

0 comments on commit c763433

Please sign in to comment.
You can’t perform that action at this time.