Skip to content

Commit 2ed89f7

Browse files
committed
Disable development eras configuration flag so we can hardfork to
Babbage and advertise that we know about the Babbage era
1 parent 147f78a commit 2ed89f7

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

cardano-api/src/Cardano/Api/Script.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -953,10 +953,10 @@ hashScript (PlutusScript PlutusScriptV1 (PlutusScriptSerialised script)) =
953953
ScriptHash
954954
. Ledger.hashScript @(ShelleyLedgerEra AlonzoEra)
955955
$ Alonzo.PlutusScript Alonzo.PlutusV1 script
956-
-- TODO: Babbage era PV2 only exists in Babbage era onwards!
956+
957957
hashScript (PlutusScript PlutusScriptV2 (PlutusScriptSerialised script)) =
958958
ScriptHash
959-
. Ledger.hashScript @(ShelleyLedgerEra AlonzoEra)
959+
. Ledger.hashScript @(ShelleyLedgerEra BabbageEra)
960960
$ Alonzo.PlutusScript Alonzo.PlutusV2 script
961961

962962
toShelleyScriptHash :: ScriptHash -> Shelley.ScriptHash StandardCrypto

cardano-node/src/Cardano/Node/Protocol/Cardano.hs

+2-5
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
8585
npcAlonzoGenesisFileHash
8686
}
8787
NodeHardForkProtocolConfiguration {
88-
npcTestEnableDevelopmentHardForkEras,
88+
-- npcTestEnableDevelopmentHardForkEras,
8989
-- During testing of the Alonzo era, we conditionally declared that we
9090
-- knew about the Alonzo era. We do so only when a config option for
9191
-- testing development/unstable eras is used. This lets us include
@@ -207,10 +207,7 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
207207
-- version that this node will declare that it understands, when it
208208
-- is in the Babbage era. Since Babbage is currently the last known
209209
-- protocol version then this is also the Babbage protocol version.
210-
Praos.babbageProtVer =
211-
if npcTestEnableDevelopmentHardForkEras
212-
then ProtVer 7 0 -- Advertise we can support Babbage
213-
else ProtVer 6 0, -- Otherwise we only advertise we know about (the second) Alonzo
210+
Praos.babbageProtVer = ProtVer 7 0
214211
Praos.babbageMaxTxCapacityOverrides =
215212
TxLimits.mkOverrides TxLimits.noOverridesMeasure
216213
}

0 commit comments

Comments
 (0)