Merge pull request #3836 from input-output-hk/lehins/pparamsupdate-en…

…actment-tests PParamsUpdate enactment fix
IntersectMBO · Nov 3, 2023 · c9d2d53 · c9d2d53
2 parents 0533bfb + d1ed550
commit c9d2d53
Show file tree

Hide file tree

Showing 12 changed files with 541 additions and 337 deletions.
diff --git a/eras/alonzo/impl/CHANGELOG.md b/eras/alonzo/impl/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Version history for `cardano-ledger-alonzo`
 
-## 1.5.1.0
+## 1.6.0.0
+
+* Swap the order of arguments for `updateCostModels`
 
 ### `testlib`
 

diff --git a/eras/alonzo/impl/cardano-ledger-alonzo.cabal b/eras/alonzo/impl/cardano-ledger-alonzo.cabal
@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name: cardano-ledger-alonzo
-version: 1.5.1.0
+version: 1.6.0.0
 license: Apache-2.0
 maintainer: operations@iohk.io
 author: IOHK

diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Scripts.hs
@@ -547,13 +547,13 @@ data CostModels = CostModels
 emptyCostModels :: CostModels
 emptyCostModels = CostModels mempty mempty mempty
 
--- | Updates the first @CostModels@ with the second one so that only the
--- cost models that are present in the second one get updated while all the
+-- | Updates the second @CostModels@ with the first one so that only the
+-- cost models that are present in the first one get updated while all the
 -- others stay unchanged
 updateCostModels :: CostModels -> CostModels -> CostModels
 updateCostModels
- (CostModels oldValid oldErrors oldUnk)
- (CostModels newValid newErrors newUnk) =
+ (CostModels newValid newErrors newUnk)
+ (CostModels oldValid oldErrors oldUnk) =
  CostModels
  (Map.union newValid oldValid)
  (Map.union newErrors oldErrors)

diff --git a/eras/conway/impl/CHANGELOG.md b/eras/conway/impl/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Version history for `cardano-ledger-conway`
 
-## 1.10.1.0
+## 1.11.0.0
 
 * Switch to using `OMap` for `ProposalsSnapshot` #3791
 * Add `VotingOnExpiredGovAction` predicate failure in `GOV` #3825
+* Rename `modifiedGroups` -> `modifiedPPGroups` and move into `ConwayEraPParams`
+* Expose `pparamsUpdateThreshold`
+* Fix [#3835](https://github.com/input-output-hk/cardano-ledger/issues/3835)
+* Rename `PParamGroup` to `PPGroup` and `GovernanceGroup` to `GovGroup`
+* Introduce `THKD` and use it for `ConwayPParams`
 
 ### `testlib`
 

diff --git a/eras/conway/impl/cardano-ledger-conway.cabal b/eras/conway/impl/cardano-ledger-conway.cabal
@@ -78,7 +78,7 @@ library
  cardano-data >=1.1.2.0,
  cardano-ledger-binary >=1.2,
  cardano-ledger-allegra >=1.1,
- cardano-ledger-alonzo ^>=1.5,
+ cardano-ledger-alonzo ^>=1.6,
  cardano-ledger-babbage >=1.4.1,
  cardano-ledger-core ^>=1.8,
  cardano-ledger-mary >=1.1,

diff --git a/eras/conway/impl/src/Cardano/Ledger/Conway/Governance.hs b/eras/conway/impl/src/Cardano/Ledger/Conway/Governance.hs
@@ -115,6 +115,9 @@ module Cardano.Ledger.Conway.Governance (
  psDRepDistrL,
  psDRepStateL,
  RunConwayRatify (..),
+
+ -- * Exported for testing
+ pparamsUpdateThreshold,
 ) where
 
 import Cardano.Ledger.BaseTypes (
@@ -186,11 +189,10 @@ import Cardano.Ledger.Conway.Governance.Snapshots (
  snapshotRemoveIds,
  )
 import Cardano.Ledger.Conway.PParams (
- ConwayEraPParams,
+ ConwayEraPParams (..),
  DRepVotingThresholds (..),
- PParamGroup (..),
+ PPGroup (..),
  PoolVotingThresholds (..),
- modifiedGroups,
  ppCommitteeMinSizeL,
  ppDRepVotingThresholdsL,
  ppPoolVotingThresholdsL,
@@ -688,14 +690,14 @@ pparamsUpdateThreshold ::
 pparamsUpdateThreshold pp ppu =
  let thresholdLens = \case
  NetworkGroup -> dvtPPNetworkGroupL
- GovernanceGroup -> dvtPPGovGroupL
+ GovGroup -> dvtPPGovGroupL
  TechnicalGroup -> dvtPPTechnicalGroupL
  EconomicGroup -> dvtPPEconomicGroupL
  lookupGroupThreshold grp =
  pp ^. ppDRepVotingThresholdsL . thresholdLens grp
  in Set.foldr' max minBound $
  Set.map lookupGroupThreshold $
- modifiedGroups @era ppu
+ modifiedPPGroups @era ppu
 
 data VotingThreshold
  = -- | This is the actual threshold. It is lazy, because upon proposal we only care if