Merge pull request #4987 from input-output-hk/bench-master

workbench: support Conway
IntersectMBO · Mar 17, 2023 · 168b92b · 168b92b
2 parents b63c325 + 1a37289
commit 168b92b
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 12 deletions.
diff --git a/flake.nix b/flake.nix
@@ -319,8 +319,6 @@
               };
             };
             nonRequiredPaths = [
-              #FIXME: hydraJobs.native.workbench-ci-test need some work to support Conway
-              "native\\.(.*\\.)?workbench-ci-test"
               #FIXME: cardano-tracer-test for windows should probably be disabled in haskell.nix config:
               "windows\\.(.*\\.)?checks\\.cardano-tracer\\.cardano-tracer-test"
               #FIXME: plutus-scripts-bench (dep of tx-generator) does not compile for windows:

diff --git a/nix/nixos/tx-generator-service.nix b/nix/nixos/tx-generator-service.nix
@@ -109,6 +109,7 @@ in pkgs.commonLib.defServiceModule
                                       "mary"
                                       "alonzo"
                                       "babbage"
+                                      "conway"
                                     ])
                               "mary"
                               "Cardano era to generate transactions for.";

diff --git a/nix/workbench/backend/nixops.nix b/nix/workbench/backend/nixops.nix
@@ -118,6 +118,7 @@ let
       AlonzoGenesisFile  = "${genesis.files}/genesis.alonzo.json";
       ShelleyGenesisFile = "${genesis.files}/genesis-shelley.json";
       ByronGenesisFile   = "${genesis.files}/byron/genesis.json";
+      ConwayGenesisFile  = "${genesis.files}/genesis.conway.json";
     in
     rec {
       profile = profileNix;
@@ -159,12 +160,14 @@ let
           inherit  AlonzoGenesisFile;
           inherit ShelleyGenesisFile;
           inherit   ByronGenesisFile;
+          inherit  ConwayGenesisFile;
         };
         nodeConfig = (removeAttrs envConfigBase.nodeConfig ["AlonzoGenesisHash"]) // {
           Protocol = "Cardano";
           inherit  AlonzoGenesisFile;
           inherit ShelleyGenesisFile;
           inherit   ByronGenesisFile;
+          inherit  ConwayGenesisFile;
         } // {
           shelley =
             { TestShelleyHardForkAtEpoch = 0;
@@ -191,10 +194,18 @@ let
               TestAlonzoHardForkAtEpoch  = 0;
               TestBabbageHardForkAtEpoch = 0;
             };
+          conway =
+            { TestShelleyHardForkAtEpoch = 0;
+              TestAllegraHardForkAtEpoch = 0;
+              TestMaryHardForkAtEpoch    = 0;
+              TestAlonzoHardForkAtEpoch  = 0;
+              TestBabbageHardForkAtEpoch = 0;
+              TestConwayHardForkAtEpoch  = 0;
+            };
         }.${profileNix.value.era};
         txSubmitConfig = {
           inherit (networkConfig) RequiresNetworkMagic;
-          inherit AlonzoGenesisFile ShelleyGenesisFile ByronGenesisFile;
+          inherit ConwayGenesisFile AlonzoGenesisFile ShelleyGenesisFile ByronGenesisFile;
         } // pkgs.iohkNix.cardanoLib.defaultExplorerLogConfig;
 
         ## This is overlaid atop the defaults in the tx-generator service,

diff --git a/nix/workbench/chaindb.sh b/nix/workbench/chaindb.sh
@@ -125,6 +125,7 @@ snapshot-at-slot )
          jq '{ AlonzoGenesisFile:             .alonzo
              , ByronGenesisFile:              .byron
              , ShelleyGenesisFile:            .shelley
+             , ConwayGenesisFile:             .conway
              , ShelleyGenesisHash:            "'$shelleyGenesisHash'"
              , RequiresNetworkMagic:          "RequiresNoMagic"
              # , Protocol:                      "Cardano"

diff --git a/nix/workbench/genesis/genesis.sh b/nix/workbench/genesis/genesis.sh
@@ -1,4 +1,4 @@
-global_genesis_format_version=March-14-2022
+global_genesis_format_version=March-14-2023
 
 usage_genesis() {
      usage "genesis" "Genesis" <<EOF
@@ -161,8 +161,15 @@ case "$op" in
            "$global_basedir"/profile/presets/mainnet/genesis/genesis.alonzo.json \
            >   "$dir"/genesis.alonzo.spec.json
 
-        cardano-cli genesis create --genesis-dir "$dir"/ \
-            $(jq '.cli_args.createSpec | join(" ")' "$profile_json" --raw-output)
+        jq '{ genDelegs: {} }' --null-input \
+           >   "$dir"/genesis.conway.spec.json
+
+        local create_args=(
+              --genesis-dir "$dir"/ $(jq '.cli_args.createSpec | join(" ")' "$profile_json" --raw-output)
+        )
+        verbose "genesis" "$(colorise cardano-cli genesis create ${create_args[*]})"
+        cardano-cli genesis create "${create_args[@]}" ||
+            fail "failed:  $(colorise cardano-cli genesis create ${create_args[*]})"
 
         ## Overlay the verbatim genesis part into the profile spec:
         local params=(
@@ -207,11 +214,13 @@ case "$op" in
         | from_entries
         ' "$node_specs" > "$dir"/pool-relays.json
 
-        params=(--genesis-dir "$dir"
-                --relay-specification-file "$dir/pool-relays.json"
-                $(jq '.cli_args.createFinalBulk | join(" ")' "$profile_json" --raw-output)
-               )
-        time cardano-cli genesis create-staked "${params[@]}"
+        create_staked_args=(
+            --genesis-dir "$dir"
+            --relay-specification-file "$dir/pool-relays.json"
+            $(jq '.cli_args.createFinalBulk | join(" ")' "$profile_json" --raw-output)
+        )
+        verbose "genesis" "$(colorise cardano-cli genesis create-staked ${create_staked_args[*]})"
+        cardano-cli genesis create-staked "${create_staked_args[@]}"
         jq      . "$dir"/genesis.json > "$dir"/genesis-shelley.json &&
             rm -f "$dir"/genesis.json
         mv "$dir"/genesis.spec.json "$dir"/genesis-shelley.spec.json

diff --git a/nix/workbench/profile/profile.sh b/nix/workbench/profile/profile.sh
@@ -22,6 +22,7 @@ global_profile_eras=(
     mary
     alonzo
     babbage
+    conway
 )
 
 profile_default_op='profile-json'

diff --git a/nix/workbench/service/generator.nix b/nix/workbench/service/generator.nix
@@ -37,6 +37,7 @@ let
         AlonzoGenesisFile    = "../genesis/genesis.alonzo.json";
         ShelleyGenesisFile   = "../genesis/genesis-shelley.json";
         ByronGenesisFile     = "../genesis/byron/genesis.json";
+        ConwayGenesisFile    = "../genesis/genesis.conway.json";
       } // optionalAttrs backend.useCabalRun {
         executable           = "tx-generator";
       });
@@ -51,7 +52,11 @@ let
         (__fromJSON (__readFile ../../../bench/tx-generator-config-base.json))
         // { inherit (exemplarNode.nodeConfig.value)
                Protocol
-               ShelleyGenesisFile ByronGenesisFile;
+               ByronGenesisFile
+               ShelleyGenesisFile
+               AlonzoGenesisFile
+               ConwayGenesisFile
+               ;
            };
     in
         finaliseGeneratorService profile

diff --git a/nix/workbench/service/nodes.nix b/nix/workbench/service/nodes.nix
@@ -134,6 +134,7 @@ let
           AlonzoGenesisFile    = "../genesis/genesis.alonzo.json";
           ShelleyGenesisFile   = "../genesis/genesis-shelley.json";
           ByronGenesisFile     = "../genesis/byron/genesis.json";
+          ConwayGenesisFile    = "../genesis/genesis.conway.json";
         }
       );
 
@@ -161,12 +162,14 @@ let
           [ "AlonzoGenesisHash"
             "ByronGenesisHash"
             "ShelleyGenesisHash"
+            "ConwayGenesisHash"
           ]
         //
         {
           TestEnableDevelopmentHardForkEras     = true;
           TestEnableDevelopmentNetworkProtocols = true;
           TurnOnLogMetrics                      = true;
+          SnapshotFrequency                     = 1100;
         };
       tracing-transform = {
         trace-dispatcher = cfg:
@@ -209,6 +212,14 @@ let
             TestAlonzoHardForkAtEpoch  = 0;
             TestBabbageHardForkAtEpoch = 0;
           };
+        conway =
+          { TestShelleyHardForkAtEpoch = 0;
+            TestAllegraHardForkAtEpoch = 0;
+            TestMaryHardForkAtEpoch    = 0;
+            TestAlonzoHardForkAtEpoch  = 0;
+            TestBabbageHardForkAtEpoch = 0;
+            TestConwayHardForkAtEpoch  = 0;
+          };
       }.${profile.era};
     };
     in