From 54dce3a74c62e5bc4dbef54937e392407a7e0e46 Mon Sep 17 00:00:00 2001 From: John Ky Date: Thu, 16 Mar 2023 09:45:56 +1100 Subject: [PATCH] Use TestEnableDevelopmentHardForkEras to gate-keep Conway --- cardano-node/src/Cardano/Node/Protocol/Cardano.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cardano-node/src/Cardano/Node/Protocol/Cardano.hs b/cardano-node/src/Cardano/Node/Protocol/Cardano.hs index b1653c0bb26..5bfd87c8b57 100644 --- a/cardano-node/src/Cardano/Node/Protocol/Cardano.hs +++ b/cardano-node/src/Cardano/Node/Protocol/Cardano.hs @@ -90,7 +90,7 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration { npcConwayGenesisFileHash } NodeHardForkProtocolConfiguration { - -- npcTestEnableDevelopmentHardForkEras, + npcTestEnableDevelopmentHardForkEras, -- During testing of the Alonzo era, we conditionally declared that we -- knew about the Alonzo era. We do so only when a config option for -- testing development/unstable eras is used. This lets us include @@ -233,7 +233,10 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration { -- version that this node will declare that it understands, when it -- is in the Babbage era. Since Babbage is currently the last known -- protocol version then this is also the Babbage protocol version. - Praos.conwayProtVer = ProtVer 9 0, + Praos.conwayProtVer = + if npcTestEnableDevelopmentHardForkEras + then ProtVer 9 0 + else ProtVer 8 0, Praos.conwayMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure }