Skip to content

Commit 168b92b

Browse files
authored
Merge pull request #4987 from input-output-hk/bench-master
workbench: support Conway
2 parents b63c325 + 1a37289 commit 168b92b

File tree

8 files changed

+49
-12
lines changed

8 files changed

+49
-12
lines changed

Diff for: flake.nix

-2
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,6 @@
319319
};
320320
};
321321
nonRequiredPaths = [
322-
#FIXME: hydraJobs.native.workbench-ci-test need some work to support Conway
323-
"native\\.(.*\\.)?workbench-ci-test"
324322
#FIXME: cardano-tracer-test for windows should probably be disabled in haskell.nix config:
325323
"windows\\.(.*\\.)?checks\\.cardano-tracer\\.cardano-tracer-test"
326324
#FIXME: plutus-scripts-bench (dep of tx-generator) does not compile for windows:

Diff for: nix/nixos/tx-generator-service.nix

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ in pkgs.commonLib.defServiceModule
109109
"mary"
110110
"alonzo"
111111
"babbage"
112+
"conway"
112113
])
113114
"mary"
114115
"Cardano era to generate transactions for.";

Diff for: nix/workbench/backend/nixops.nix

+12-1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ let
118118
AlonzoGenesisFile = "${genesis.files}/genesis.alonzo.json";
119119
ShelleyGenesisFile = "${genesis.files}/genesis-shelley.json";
120120
ByronGenesisFile = "${genesis.files}/byron/genesis.json";
121+
ConwayGenesisFile = "${genesis.files}/genesis.conway.json";
121122
in
122123
rec {
123124
profile = profileNix;
@@ -159,12 +160,14 @@ let
159160
inherit AlonzoGenesisFile;
160161
inherit ShelleyGenesisFile;
161162
inherit ByronGenesisFile;
163+
inherit ConwayGenesisFile;
162164
};
163165
nodeConfig = (removeAttrs envConfigBase.nodeConfig ["AlonzoGenesisHash"]) // {
164166
Protocol = "Cardano";
165167
inherit AlonzoGenesisFile;
166168
inherit ShelleyGenesisFile;
167169
inherit ByronGenesisFile;
170+
inherit ConwayGenesisFile;
168171
} // {
169172
shelley =
170173
{ TestShelleyHardForkAtEpoch = 0;
@@ -191,10 +194,18 @@ let
191194
TestAlonzoHardForkAtEpoch = 0;
192195
TestBabbageHardForkAtEpoch = 0;
193196
};
197+
conway =
198+
{ TestShelleyHardForkAtEpoch = 0;
199+
TestAllegraHardForkAtEpoch = 0;
200+
TestMaryHardForkAtEpoch = 0;
201+
TestAlonzoHardForkAtEpoch = 0;
202+
TestBabbageHardForkAtEpoch = 0;
203+
TestConwayHardForkAtEpoch = 0;
204+
};
194205
}.${profileNix.value.era};
195206
txSubmitConfig = {
196207
inherit (networkConfig) RequiresNetworkMagic;
197-
inherit AlonzoGenesisFile ShelleyGenesisFile ByronGenesisFile;
208+
inherit ConwayGenesisFile AlonzoGenesisFile ShelleyGenesisFile ByronGenesisFile;
198209
} // pkgs.iohkNix.cardanoLib.defaultExplorerLogConfig;
199210

200211
## This is overlaid atop the defaults in the tx-generator service,

Diff for: nix/workbench/chaindb.sh

+1
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ snapshot-at-slot )
125125
jq '{ AlonzoGenesisFile: .alonzo
126126
, ByronGenesisFile: .byron
127127
, ShelleyGenesisFile: .shelley
128+
, ConwayGenesisFile: .conway
128129
, ShelleyGenesisHash: "'$shelleyGenesisHash'"
129130
, RequiresNetworkMagic: "RequiresNoMagic"
130131
# , Protocol: "Cardano"

Diff for: nix/workbench/genesis/genesis.sh

+17-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
global_genesis_format_version=March-14-2022
1+
global_genesis_format_version=March-14-2023
22

33
usage_genesis() {
44
usage "genesis" "Genesis" <<EOF
@@ -161,8 +161,15 @@ case "$op" in
161161
"$global_basedir"/profile/presets/mainnet/genesis/genesis.alonzo.json \
162162
> "$dir"/genesis.alonzo.spec.json
163163

164-
cardano-cli genesis create --genesis-dir "$dir"/ \
165-
$(jq '.cli_args.createSpec | join(" ")' "$profile_json" --raw-output)
164+
jq '{ genDelegs: {} }' --null-input \
165+
> "$dir"/genesis.conway.spec.json
166+
167+
local create_args=(
168+
--genesis-dir "$dir"/ $(jq '.cli_args.createSpec | join(" ")' "$profile_json" --raw-output)
169+
)
170+
verbose "genesis" "$(colorise cardano-cli genesis create ${create_args[*]})"
171+
cardano-cli genesis create "${create_args[@]}" ||
172+
fail "failed: $(colorise cardano-cli genesis create ${create_args[*]})"
166173

167174
## Overlay the verbatim genesis part into the profile spec:
168175
local params=(
@@ -207,11 +214,13 @@ case "$op" in
207214
| from_entries
208215
' "$node_specs" > "$dir"/pool-relays.json
209216

210-
params=(--genesis-dir "$dir"
211-
--relay-specification-file "$dir/pool-relays.json"
212-
$(jq '.cli_args.createFinalBulk | join(" ")' "$profile_json" --raw-output)
213-
)
214-
time cardano-cli genesis create-staked "${params[@]}"
217+
create_staked_args=(
218+
--genesis-dir "$dir"
219+
--relay-specification-file "$dir/pool-relays.json"
220+
$(jq '.cli_args.createFinalBulk | join(" ")' "$profile_json" --raw-output)
221+
)
222+
verbose "genesis" "$(colorise cardano-cli genesis create-staked ${create_staked_args[*]})"
223+
cardano-cli genesis create-staked "${create_staked_args[@]}"
215224
jq . "$dir"/genesis.json > "$dir"/genesis-shelley.json &&
216225
rm -f "$dir"/genesis.json
217226
mv "$dir"/genesis.spec.json "$dir"/genesis-shelley.spec.json

Diff for: nix/workbench/profile/profile.sh

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ global_profile_eras=(
2222
mary
2323
alonzo
2424
babbage
25+
conway
2526
)
2627

2728
profile_default_op='profile-json'

Diff for: nix/workbench/service/generator.nix

+6-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ let
3737
AlonzoGenesisFile = "../genesis/genesis.alonzo.json";
3838
ShelleyGenesisFile = "../genesis/genesis-shelley.json";
3939
ByronGenesisFile = "../genesis/byron/genesis.json";
40+
ConwayGenesisFile = "../genesis/genesis.conway.json";
4041
} // optionalAttrs backend.useCabalRun {
4142
executable = "tx-generator";
4243
});
@@ -51,7 +52,11 @@ let
5152
(__fromJSON (__readFile ../../../bench/tx-generator-config-base.json))
5253
// { inherit (exemplarNode.nodeConfig.value)
5354
Protocol
54-
ShelleyGenesisFile ByronGenesisFile;
55+
ByronGenesisFile
56+
ShelleyGenesisFile
57+
AlonzoGenesisFile
58+
ConwayGenesisFile
59+
;
5560
};
5661
in
5762
finaliseGeneratorService profile

Diff for: nix/workbench/service/nodes.nix

+11
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ let
134134
AlonzoGenesisFile = "../genesis/genesis.alonzo.json";
135135
ShelleyGenesisFile = "../genesis/genesis-shelley.json";
136136
ByronGenesisFile = "../genesis/byron/genesis.json";
137+
ConwayGenesisFile = "../genesis/genesis.conway.json";
137138
}
138139
);
139140

@@ -161,12 +162,14 @@ let
161162
[ "AlonzoGenesisHash"
162163
"ByronGenesisHash"
163164
"ShelleyGenesisHash"
165+
"ConwayGenesisHash"
164166
]
165167
//
166168
{
167169
TestEnableDevelopmentHardForkEras = true;
168170
TestEnableDevelopmentNetworkProtocols = true;
169171
TurnOnLogMetrics = true;
172+
SnapshotFrequency = 1100;
170173
};
171174
tracing-transform = {
172175
trace-dispatcher = cfg:
@@ -209,6 +212,14 @@ let
209212
TestAlonzoHardForkAtEpoch = 0;
210213
TestBabbageHardForkAtEpoch = 0;
211214
};
215+
conway =
216+
{ TestShelleyHardForkAtEpoch = 0;
217+
TestAllegraHardForkAtEpoch = 0;
218+
TestMaryHardForkAtEpoch = 0;
219+
TestAlonzoHardForkAtEpoch = 0;
220+
TestBabbageHardForkAtEpoch = 0;
221+
TestConwayHardForkAtEpoch = 0;
222+
};
212223
}.${profile.era};
213224
};
214225
in

0 commit comments

Comments
 (0)