Merge pull request #4991 from IntersectMBO/td/fix-pparam-json-serialization

teodanciu · web-flow · commit cd56d4b2419b · 2025-04-16T11:41:17.000+01:00
Fix `PParams` JSON deserialization
diff --git a/eras/alonzo/impl/cardano-ledger-alonzo.cabal b/eras/alonzo/impl/cardano-ledger-alonzo.cabal
@@ -15,6 +15,7 @@ build-type: Simple
 data-files:
   cddl-files/alonzo.cddl
   golden/*.cbor
+  golden/*.json
 
 extra-source-files: CHANGELOG.md
 
@@ -214,6 +215,7 @@ test-suite tests
     Paths_cardano_ledger_alonzo
     Test.Cardano.Ledger.Alonzo.Binary.CddlSpec
     Test.Cardano.Ledger.Alonzo.BinarySpec
+    Test.Cardano.Ledger.Alonzo.GoldenSpec
     Test.Cardano.Ledger.Alonzo.GoldenTranslation
 
   default-language: Haskell2010
diff --git a/eras/alonzo/impl/golden/pparams.json b/eras/alonzo/impl/golden/pparams.json
@@ -0,0 +1,40 @@
+{
+    "txFeePerByte":44,
+    "txFeeFixed":155381,
+    "maxBlockBodySize":65536,
+    "maxTxSize":16384,
+    "maxBlockHeaderSize":1100,
+    "stakeAddressDeposit":2000000,
+    "stakePoolDeposit":500000000,
+    "poolRetireMaxEpoch":18,
+    "stakePoolTargetNum":500,
+    "poolPledgeInfluence":0.3,
+    "monetaryExpansion":0.003,
+    "treasuryCut":0.2,
+    "decentralization":0.0,
+    "extraPraosEntropy":null,
+    "protocolVersion":{
+       "major":6,
+       "minor":0
+    },
+    "minPoolCost":340000000,
+    "utxoCostPerByte":4310,
+    "costModels":{
+       "PlutusV1":[ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
+      },
+    "executionUnitPrices":{
+       "priceSteps":0.0000721,
+       "prMem":0.0577
+    },
+    "maxTxExecutionUnits":{
+       "steps":10000000000,
+       "memory":14000000
+    },
+    "maxBlockExecutionUnits":{
+       "steps":40000000000,
+       "memory":62000000
+    },
+    "maxValueSize":5000,
+    "collateralPercentage":150,
+    "maxCollateralInputs":3
+ }
diff --git a/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs b/eras/alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs
@@ -134,7 +134,6 @@ import Data.Aeson as Aeson (
   object,
   pairs,
   withObject,
-  (.!=),
   (.:),
  )
 import qualified Data.Aeson.Types as Aeson
@@ -484,7 +483,7 @@ instance FromJSON (AlonzoPParams Identity era) where
         <*> obj .: "decentralization"
         <*> obj .: "extraPraosEntropy"
         <*> obj .: "protocolVersion"
-        <*> obj .: "minPoolCost" .!= mempty
+        <*> obj .: "minPoolCost"
         <*> obj .: "utxoCostPerByte"
         <*> obj .: "costModels"
         <*> obj .: "executionUnitPrices"
diff --git a/eras/alonzo/impl/test/Main.hs b/eras/alonzo/impl/test/Main.hs
@@ -7,7 +7,8 @@ import qualified Test.Cardano.Ledger.Alonzo.Binary.CddlSpec as CddlSpec
 import qualified Test.Cardano.Ledger.Alonzo.Binary.CostModelsSpec as CostModelsSpec
 import qualified Test.Cardano.Ledger.Alonzo.Binary.TxWitsSpec as TxWitsSpec
 import qualified Test.Cardano.Ledger.Alonzo.BinarySpec as BinarySpec
-import qualified Test.Cardano.Ledger.Alonzo.GoldenTranslation as Golden
+import qualified Test.Cardano.Ledger.Alonzo.GoldenSpec as Golden
+import qualified Test.Cardano.Ledger.Alonzo.GoldenTranslation as GoldenTranslation
 import qualified Test.Cardano.Ledger.Alonzo.Imp as Imp
 import Test.Cardano.Ledger.Alonzo.ImpTest ()
 import Test.Cardano.Ledger.Common
@@ -20,7 +21,8 @@ main =
       BinarySpec.spec
       CddlSpec.spec
       roundTripJsonEraSpec @AlonzoEra
-      Golden.tests
+      GoldenTranslation.tests
+      Golden.spec
       describe "Imp" $ do
         Imp.spec @AlonzoEra
       describe "CostModels" $ do
diff --git a/eras/alonzo/impl/test/Test/Cardano/Ledger/Alonzo/GoldenSpec.hs b/eras/alonzo/impl/test/Test/Cardano/Ledger/Alonzo/GoldenSpec.hs
@@ -0,0 +1,15 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
+
+module Test.Cardano.Ledger.Alonzo.GoldenSpec (spec) where
+
+import Cardano.Ledger.Alonzo
+import Paths_cardano_ledger_alonzo (getDataFileName)
+import Test.Cardano.Ledger.Common
+import Test.Cardano.Ledger.Core.JSON (goldenJsonPParamsSpec)
+
+spec :: Spec
+spec =
+  describe "Golden" $ do
+    beforeAll (getDataFileName "golden/pparams.json") $
+      goldenJsonPParamsSpec @AlonzoEra
diff --git a/eras/babbage/impl/cardano-ledger-babbage.cabal b/eras/babbage/impl/cardano-ledger-babbage.cabal
@@ -17,6 +17,7 @@ build-type: Simple
 data-files:
   cddl-files/babbage.cddl
   golden/*.cbor
+  golden/*.json
 
 extra-source-files: CHANGELOG.md
 
@@ -188,6 +189,7 @@ test-suite tests
     Paths_cardano_ledger_babbage
     Test.Cardano.Ledger.Babbage.Binary.CddlSpec
     Test.Cardano.Ledger.Babbage.BinarySpec
+    Test.Cardano.Ledger.Babbage.GoldenSpec
     Test.Cardano.Ledger.Babbage.GoldenTranslation
 
   default-language: Haskell2010
diff --git a/eras/babbage/impl/golden/pparams.json b/eras/babbage/impl/golden/pparams.json
@@ -0,0 +1,36 @@
+{
+   "txFeePerByte":125936,
+   "txFeeFixed":708372,
+   "maxBlockBodySize":1,
+   "maxTxSize":1,
+   "maxBlockHeaderSize":1,
+   "stakeAddressDeposit":568321,
+   "stakePoolDeposit":525721,
+   "poolRetireMaxEpoch":0,
+   "stakePoolTargetNum":1,
+   "poolPledgeInfluence":4.00525056366491892,
+   "monetaryExpansion":0.956320129784306867,
+   "treasuryCut":0.1704528968981345,
+   "minPoolCost":805247,
+   "costModels":{
+      "PlutusV1":[ 0, -1, 0, 1, 1, -1, 0, -1, 0, -1, 1, 1, 0, 1, 0, 0, -1, 0, -1, 0, 0, -1, 1, 0, 1, -1, 0, 1, 1, 0, 1, 1, -1, 1, 0, 1, 1, -1, -1, -1, 1, 1, -1, 0, 0, 1, 1, 0, -1, 1, -1, -1, -1, 0, -1, 1, -1, -1, 1, -1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 0, 1, 0, -1, -1, 0, -1, -1, 0, -1, 1, 1, -1, 0, 0, 1, 0, 1, 1, -1, -1, 0, -1, -1, 1, 0, 1, 0, 1, 1, 1, 0, 0, 1, 0, -1, 1, -1, -1, -1, -1, 1, 0, 1, -1, 1, 1, 1, 0, -1, 1, 1, 0, 0, 1, -1, 1, 1, 0, -1, -1, 0, -1, 1, 0, 1, 1, 1, 1, 1, -1, 0, 1, 1, 0, 0, -1, 0, 0, -1, -1, -1, -1, 0, -1, 0, -1, -1, 0, 0, 1, 0, 1 ],
+      "PlutusV2":[ -1, 1, -1, -1, -1, 0, 1, 1, 0, -1, -1, 0, -1, 0, 1, 1, 0, 0, -1, 1, -1, 0, -1, 0, 0, -1, 1, -1, 0, 1, 1, 0, -1, -1, -1, -1, 1, 0, -1, -1, 0, -1, 0, -1, 0, 1, 0, 1, -1, 1, -1, 1, -1, 0, -1, 1, -1, -1, -1, 0, -1, -1, 1, 0, -1, -1, -1, -1, 0, 0, -1, 0, 0, 0, 1, 1, -1, -1, 0, 0, 1, 0, 0, -1, 1, 0, 1, 1, -1, 1, 0, 0, 0, 1, -1, -1, -1, 1, 0, 0, -1, -1, 0, 1, 1, -1, 1, -1, -1, -1, -1, -1, -1, 0, 1, -1, 0, -1, 0, -1, 0, 0, 1, 1, 0, -1, 0, 0, -1, 1, 0, 1, 1, 1, -1, 0, -1, -1, -1, 0, 0, -1, 0, 1, 1, 0, 1, 1, 1, 1, 1, -1, 0, 1, -1, 1, 1, 0, -1, 1, 0, 1, 0, 1, -1, -1, 0, -1, -1, 1, 0, 1, -1, -1, -1 ]
+   },
+   "executionUnitPrices":{ "priceMemory":1708.666753535008936, "priceSteps":9548718419223053632 },
+   "maxTxExecutionUnits":{
+      "memory":5032611896682840784,
+      "steps":4247616078198573105
+   },
+   "maxBlockExecutionUnits":{
+      "memory":7479707704554150331,
+      "steps":1214717225589080517
+   },
+   "maxValueSize":1,
+   "collateralPercentage":0,
+   "maxCollateralInputs":0,
+   "utxoCostPerByte":441050,
+   "protocolVersion":{
+      "major":7,
+      "minor":1
+   }
+}
diff --git a/eras/babbage/impl/src/Cardano/Ledger/Babbage/PParams.hs b/eras/babbage/impl/src/Cardano/Ledger/Babbage/PParams.hs
@@ -106,7 +106,6 @@ import Data.Aeson as Aeson (
   object,
   pairs,
   withObject,
-  (.!=),
   (.:),
  )
 import Data.Functor.Identity (Identity (..))
@@ -364,7 +363,7 @@ instance FromJSON (BabbagePParams Identity era) where
         <*> obj .: "monetaryExpansion"
         <*> obj .: "treasuryCut"
         <*> obj .: "protocolVersion"
-        <*> obj .: "minPoolCost" .!= mempty
+        <*> obj .: "minPoolCost"
         <*> obj .: "utxoCostPerByte"
         <*> obj .: "costModels"
         <*> obj .: "executionUnitPrices"
diff --git a/eras/babbage/impl/test/Main.hs b/eras/babbage/impl/test/Main.hs
@@ -7,7 +7,8 @@ import qualified Test.Cardano.Ledger.Alonzo.Binary.CostModelsSpec as CostModelsS
 import qualified Test.Cardano.Ledger.Alonzo.Binary.TxWitsSpec as TxWitsSpec
 import qualified Test.Cardano.Ledger.Babbage.Binary.CddlSpec as CddlSpec
 import qualified Test.Cardano.Ledger.Babbage.BinarySpec as BinarySpec
-import qualified Test.Cardano.Ledger.Babbage.GoldenTranslation as Golden
+import qualified Test.Cardano.Ledger.Babbage.GoldenSpec as Golden
+import qualified Test.Cardano.Ledger.Babbage.GoldenTranslation as GoldenTranslation
 import qualified Test.Cardano.Ledger.Babbage.Imp as Imp
 import Test.Cardano.Ledger.Babbage.ImpTest ()
 import Test.Cardano.Ledger.Common
@@ -17,6 +18,7 @@ main :: IO ()
 main =
   ledgerTestMain $
     describe "Babbage" $ do
+      GoldenTranslation.spec
       Golden.spec
       BinarySpec.spec
       CddlSpec.spec
diff --git a/eras/babbage/impl/test/Test/Cardano/Ledger/Babbage/GoldenSpec.hs b/eras/babbage/impl/test/Test/Cardano/Ledger/Babbage/GoldenSpec.hs
@@ -0,0 +1,15 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
+
+module Test.Cardano.Ledger.Babbage.GoldenSpec (spec) where
+
+import Cardano.Ledger.Babbage
+import Paths_cardano_ledger_babbage (getDataFileName)
+import Test.Cardano.Ledger.Common
+import Test.Cardano.Ledger.Core.JSON (goldenJsonPParamsSpec)
+
+spec :: Spec
+spec =
+  describe "Golden" $ do
+    beforeAll (getDataFileName "golden/pparams.json") $
+      goldenJsonPParamsSpec @BabbageEra
diff --git a/eras/conway/impl/cardano-ledger-conway.cabal b/eras/conway/impl/cardano-ledger-conway.cabal
@@ -14,6 +14,7 @@ build-type: Simple
 data-files:
   cddl-files/conway.cddl
   golden/*.cbor
+  golden/*.json
   test/data/*.json
 
 extra-source-files: CHANGELOG.md
@@ -241,6 +242,7 @@ test-suite tests
     Test.Cardano.Ledger.Conway.CommitteeRatifySpec
     Test.Cardano.Ledger.Conway.DRepRatifySpec
     Test.Cardano.Ledger.Conway.GenesisSpec
+    Test.Cardano.Ledger.Conway.GoldenSpec
     Test.Cardano.Ledger.Conway.GoldenTranslation
     Test.Cardano.Ledger.Conway.GovActionReorderSpec
     Test.Cardano.Ledger.Conway.Plutus.PlutusSpec
diff --git a/eras/conway/impl/golden/pparams.json b/eras/conway/impl/golden/pparams.json
@@ -0,0 +1,65 @@
+{
+    "txFeePerByte":308902,
+    "txFeeFixed":561284,
+    "maxBlockBodySize":1,
+    "maxTxSize":1,
+    "maxBlockHeaderSize":1,
+    "stakeAddressDeposit":891166,
+    "stakePoolDeposit":50289,
+    "poolRetireMaxEpoch":0,
+    "stakePoolTargetNum":0,
+    "poolPledgeInfluence":7.627502235451851497e15,
+    "monetaryExpansion":0.8525271,
+    "treasuryCut":0.81278270399268,
+    "minPoolCost":268334,
+    "costModels":{ },
+    "executionUnitPrices":{
+       "priceMemory":1.547187767003867398,
+       "priceSteps":81940.41318383031469
+    },
+    "maxTxExecutionUnits":{
+       "memory":3261458539401522829,
+       "steps":7599368326734706029
+    },
+    "maxBlockExecutionUnits":{
+       "memory":9153082808307892327,
+       "steps":8498837228457130010
+    },
+    "maxValueSize":0,
+    "collateralPercentage":0,
+    "maxCollateralInputs":1,
+    "utxoCostPerByte":568321,
+    "poolVotingThresholds":{
+       "committeeNoConfidence":0.43126437780517319,
+       "committeeNormal":0.368763,
+       "hardForkInitiation":0.9468703887234305,
+       "motionNoConfidence":0.69591767,
+       "ppSecurityGroup":0.850009830033369808
+    },
+    "dRepVotingThresholds":{
+       "committeeNoConfidence":0.6890130821,
+       "committeeNormal":0.9009078,
+       "hardForkInitiation":{
+          "denominator":2000000000000000000,
+          "numerator":694018963415406037
+       },
+       "motionNoConfidence":0.17136653722,
+       "ppEconomicGroup":0.5,
+       "ppGovGroup":0.497,
+       "ppNetworkGroup":0.255887448574,
+       "ppTechnicalGroup":2.9039187157159e-2,
+       "treasuryWithdrawal":0.6562,
+       "updateToConstitution":3.04346452e-2
+    },
+    "committeeMinSize":1,
+    "committeeMaxTermLength":1,
+    "govActionLifetime":0,
+    "govActionDeposit":190162,
+    "dRepDeposit":302491,
+    "dRepActivity":0,
+    "minFeeRefScriptCostPerByte":23896.4809186040265,
+    "protocolVersion":{
+       "major":4,
+       "minor":1
+    }
+ }
diff --git a/eras/conway/impl/test/Main.hs b/eras/conway/impl/test/Main.hs
@@ -12,7 +12,8 @@ import qualified Test.Cardano.Ledger.Conway.BinarySpec as Binary
 import qualified Test.Cardano.Ledger.Conway.CommitteeRatifySpec as CommitteeRatify
 import qualified Test.Cardano.Ledger.Conway.DRepRatifySpec as DRepRatify
 import qualified Test.Cardano.Ledger.Conway.GenesisSpec as Genesis
-import qualified Test.Cardano.Ledger.Conway.GoldenTranslation as Golden
+import Test.Cardano.Ledger.Conway.GoldenSpec as Golden
+import qualified Test.Cardano.Ledger.Conway.GoldenTranslation as GoldenTranslation
 import qualified Test.Cardano.Ledger.Conway.GovActionReorderSpec as GovActionReorder
 import qualified Test.Cardano.Ledger.Conway.Imp as Imp
 import Test.Cardano.Ledger.Conway.Plutus.PlutusSpec as PlutusSpec
@@ -26,6 +27,7 @@ main :: IO ()
 main =
   ledgerTestMain $
     describe "Conway" $ do
+      GoldenTranslation.spec
       Golden.spec
       Spec.spec
       Proposals.spec
diff --git a/eras/conway/impl/test/Test/Cardano/Ledger/Conway/GoldenSpec.hs b/eras/conway/impl/test/Test/Cardano/Ledger/Conway/GoldenSpec.hs
@@ -0,0 +1,15 @@
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
+
+module Test.Cardano.Ledger.Conway.GoldenSpec (spec) where
+
+import Cardano.Ledger.Conway
+import Paths_cardano_ledger_conway (getDataFileName)
+import Test.Cardano.Ledger.Common
+import Test.Cardano.Ledger.Core.JSON (goldenJsonPParamsSpec)
+
+spec :: Spec
+spec =
+  describe "Golden" $ do
+    beforeAll (getDataFileName "golden/pparams.json") $
+      goldenJsonPParamsSpec @ConwayEra
diff --git a/eras/shelley/impl/cardano-ledger-shelley.cabal b/eras/shelley/impl/cardano-ledger-shelley.cabal
@@ -6,7 +6,10 @@ maintainer: operations@iohk.io
 author: IOHK
 synopsis: Shelley Ledger Executable Model
 build-type: Simple
-data-files: cddl-files/shelley.cddl
+data-files:
+  cddl-files/shelley.cddl
+  golden/*.json
+
 extra-source-files: CHANGELOG.md
 
 source-repository head
@@ -220,6 +223,7 @@ test-suite tests
   main-is: Main.hs
   hs-source-dirs: test
   other-modules:
+    Paths_cardano_ledger_shelley
     Test.Cardano.Ledger.Shelley.Binary.CddlSpec
     Test.Cardano.Ledger.Shelley.Binary.GoldenSpec
     Test.Cardano.Ledger.Shelley.Binary.RoundTripSpec
diff --git a/eras/shelley/impl/golden/pparams.json b/eras/shelley/impl/golden/pparams.json
@@ -0,0 +1,22 @@
+{
+    "txFeePerByte":44,
+    "txFeeFixed":155381,
+    "maxBlockBodySize":65536,
+    "maxTxSize":16384,
+    "maxBlockHeaderSize":1100,
+    "stakeAddressDeposit":2000000,
+    "stakePoolDeposit":500000000,
+    "poolRetireMaxEpoch":18,
+    "stakePoolTargetNum":500,
+    "poolPledgeInfluence":0.3,
+    "monetaryExpansion":0.003,
+    "treasuryCut":0.2,
+    "decentralization":0.0,
+    "extraPraosEntropy":null,
+    "protocolVersion":{
+       "major":2,
+       "minor":0
+    },
+    "minUTxOValue":1000000,
+    "minPoolCost":340000000
+ }
diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/PParams.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/PParams.hs
@@ -79,9 +79,7 @@ import Data.Aeson (
   ToJSON (..),
   object,
   pairs,
-  (.!=),
   (.:),
-  (.:?),
   (.=),
  )
 import qualified Data.Aeson as Aeson
@@ -284,8 +282,8 @@ instance FromJSON (ShelleyPParams Identity era) where
         <*> obj .: "decentralization"
         <*> obj .: "extraPraosEntropy"
         <*> obj .: "protocolVersion"
-        <*> obj .:? "minUTxOValue" .!= mempty
-        <*> obj .:? "minPoolCost" .!= mempty
+        <*> obj .: "minUTxOValue"
+        <*> obj .: "minPoolCost"
 
 emptyShelleyPParams :: forall era. Era era => ShelleyPParams Identity era
 emptyShelleyPParams =
diff --git a/eras/shelley/impl/test/Test/Cardano/Ledger/Shelley/Binary/GoldenSpec.hs b/eras/shelley/impl/test/Test/Cardano/Ledger/Shelley/Binary/GoldenSpec.hs
diff --git a/libs/cardano-ledger-core/CHANGELOG.md b/libs/cardano-ledger-core/CHANGELOG.md
diff --git a/libs/cardano-ledger-core/testlib/Test/Cardano/Ledger/Core/JSON.hs b/libs/cardano-ledger-core/testlib/Test/Cardano/Ledger/Core/JSON.hs
