Merge pull request #2963 from input-output-hk/jj/conway-genesis

Conway GenDelegs update
IntersectMBO · Aug 9, 2022 · d4743d8 · d4743d8
2 parents 66cb664 + 5302e70
commit d4743d8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/eras/conway/impl/src/Cardano/Ledger/Conway.hs b/eras/conway/impl/src/Cardano/Ledger/Conway.hs
@@ -11,6 +11,7 @@
 module Cardano.Ledger.Conway (ConwayEra) where
 
 import Cardano.Ledger.Alonzo (reapplyAlonzoTx)
+import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis)
 import Cardano.Ledger.Alonzo.TxInfo (ExtendedUTxO (..))
 import Cardano.Ledger.Alonzo.TxWitness (TxWitness (..))
 import Cardano.Ledger.Babbage.Rules (babbageMinUTxOValue)
@@ -23,7 +24,7 @@ import Cardano.Ledger.Babbage.Tx
   )
 import Cardano.Ledger.Babbage.TxInfo (babbageTxInfo)
 import Cardano.Ledger.Conway.Era (ConwayEra)
-import Cardano.Ledger.Conway.Genesis (AlonzoGenesis, extendPPWithGenesis)
+import Cardano.Ledger.Conway.Genesis (extendPPWithGenesis)
 import Cardano.Ledger.Conway.PParams (BabbagePParamsHKD (..))
 import Cardano.Ledger.Conway.Tx ()
 import Cardano.Ledger.Conway.TxBody (BabbageEraTxBody (..))

diff --git a/eras/conway/impl/src/Cardano/Ledger/Conway/Genesis.hs b/eras/conway/impl/src/Cardano/Ledger/Conway/Genesis.hs
@@ -1,8 +1,10 @@
 module Cardano.Ledger.Conway.Genesis
-  ( AlonzoGenesis (..),
+  ( ConwayGenesis (..),
     extendPPWithGenesis,
   )
 where
 
-import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis (..))
 import Cardano.Ledger.Babbage.Genesis (extendPPWithGenesis)
+import Cardano.Ledger.Keys (GenDelegs)
+
+newtype ConwayGenesis crypto = ConwayGenesis (GenDelegs crypto)
diff --git a/eras/conway/impl/src/Cardano/Ledger/Conway/Translation.hs b/eras/conway/impl/src/Cardano/Ledger/Conway/Translation.hs
@@ -13,14 +13,14 @@
 module Cardano.Ledger.Conway.Translation where
 
 import Cardano.Binary (DecoderError)
-import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis)
 import Cardano.Ledger.Alonzo.Scripts (AlonzoScript (..))
 import qualified Cardano.Ledger.Alonzo.Tx as Alonzo
 import Cardano.Ledger.Babbage (BabbageEra)
 import Cardano.Ledger.Babbage.PParams (BabbagePParamsHKD (..))
 import Cardano.Ledger.Babbage.Tx (AlonzoTx (..))
 import Cardano.Ledger.Babbage.TxBody (BabbageTxOut (..), Datum (..))
 import Cardano.Ledger.Conway (ConwayEra)
+import Cardano.Ledger.Conway.Genesis (ConwayGenesis (..))
 import Cardano.Ledger.Conway.Scripts ()
 import Cardano.Ledger.Conway.TxOut ()
 import qualified Cardano.Ledger.Core as Core
@@ -33,7 +33,9 @@ import Cardano.Ledger.Era
   )
 import Cardano.Ledger.Serialization (translateViaCBORAnn)
 import Cardano.Ledger.Shelley.API
-  ( EpochState (..),
+  ( DPState (..),
+    DState (..),
+    EpochState (..),
     NewEpochState (..),
     ShelleyGenesis,
     StrictMaybe (..),
@@ -59,7 +61,7 @@ import Data.Coerce
 
 type instance PreviousEra (ConwayEra c) = BabbageEra c
 
-type instance TranslationContext (ConwayEra c) = AlonzoGenesis
+type instance TranslationContext (ConwayEra c) = ConwayGenesis c
 
 instance Crypto c => TranslateEra (ConwayEra c) NewEpochState where
   translateEra ctxt nes =
@@ -135,12 +137,16 @@ instance Crypto c => TranslateEra (ConwayEra c) EpochState where
         }
 
 instance Crypto c => TranslateEra (ConwayEra c) API.LedgerState where
-  translateEra ctxt ls =
+  translateEra ctxt@(ConwayGenesis newGenDelegs) ls =
     pure
       API.LedgerState
         { API.lsUTxOState = translateEra' ctxt $ API.lsUTxOState ls,
-          API.lsDPState = API.lsDPState ls
+          API.lsDPState = updateGenesisKeys $ API.lsDPState ls
         }
+    where
+      updateGenesisKeys (DPState dstate pstate) = DPState dstate' pstate
+        where
+          dstate' = dstate {_genDelegs = newGenDelegs}
 
 instance Crypto c => TranslateEra (ConwayEra c) API.UTxOState where
   translateEra ctxt us =