Continuation of 'Make it build with ghc-9.12'

Co-Authored-By: Marcin Szamotulski <[email protected]>

Author: erikd

cabal.project

@@ -10,8 +10,8 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2025-04-15T19:49:23Z
-  , cardano-haskell-packages 2025-04-16T08:24:34Z
+  , hackage.haskell.org 2025-04-29T21:50:43Z
+  , cardano-haskell-packages 2025-04-29T20:52:57Z
 
 packages:
   cardano-db

cardano-chain-gen/cardano-chain-gen.cabal

@@ -85,6 +85,7 @@ library
                       , extra
                       , mtl
                       , microlens
+                      , network-mux
                       , nothunks
                       , ouroboros-consensus
                       , ouroboros-consensus-cardano
@@ -100,7 +101,6 @@ library
                       , strict-sop-core
                       , strict-stm
                       , text
-                      , typed-protocols
 
 test-suite cardano-chain-gen
   type:                 exitcode-stdio-1.0

cardano-chain-gen/src/Cardano/Mock/ChainDB.hs

@@ -62,7 +62,7 @@ replaceGenesisDB chainDB st = chainDB {cchain = Genesis st}
 extendChainDB :: LedgerSupportsProtocol block => ChainDB block -> block -> ChainDB block
 extendChainDB chainDB blk = do
   let !chain = cchain chainDB
-      !st = tickThenReapply (Consensus.ExtLedgerCfg $ chainConfig chainDB) blk (getTipState chain)
+      !st = tickThenReapply ComputeLedgerEvents (Consensus.ExtLedgerCfg $ chainConfig chainDB) blk (getTipState chain)
    in chainDB {cchain = chain :> (blk, st)}
 
 findFirstPoint :: HasHeader block => [Point block] -> ChainDB block -> Maybe (Point block)

cardano-chain-gen/src/Cardano/Mock/ChainSync/Server.hs

@@ -48,7 +48,7 @@ import Data.ByteString.Lazy.Char8 (ByteString)
 import qualified Data.Map.Strict as Map
 import Data.Maybe (fromJust)
 import Data.Void (Void)
-import Network.TypedProtocol.Core (Peer (..))
+import qualified Network.Mux as Mux
 import Ouroboros.Consensus.Block (CodecConfig, HasHeader, Point, StandardHash, castPoint)
 import Ouroboros.Consensus.Config (TopLevelConfig, configCodec)
 import Ouroboros.Consensus.Ledger.Query (BlockQuery, ShowQuery)
@@ -86,7 +86,7 @@ import Ouroboros.Network.Driver.Simple (runPeer)
 import Ouroboros.Network.IOManager (IOManager)
 import qualified Ouroboros.Network.IOManager as IOManager
 import Ouroboros.Network.Magic (NetworkMagic)
-import Ouroboros.Network.Mux (MuxMode (..), OuroborosApplicationWithMinimalCtx)
+import Ouroboros.Network.Mux (OuroborosApplicationWithMinimalCtx)
 import Ouroboros.Network.NodeToClient (NodeToClientVersionData (..))
 import qualified Ouroboros.Network.NodeToClient as NodeToClient
 import Ouroboros.Network.NodeToNode (Versions)
@@ -216,7 +216,7 @@ runLocalServer iom codecConfig netMagic localDomainSock chainProdState =
       Versions
         NodeToClientVersion
         NodeToClientVersionData
-        (OuroborosApplicationWithMinimalCtx 'ResponderMode LocalAddress ByteString IO Void ())
+        (OuroborosApplicationWithMinimalCtx 'Mux.ResponderMode LocalAddress ByteString IO Void ())
     versions state =
       let version = fromJust $ snd $ latestReleasedNodeVersion (Proxy @blk)
           allVersions = supportedNodeToClientVersions (Proxy @blk)

cardano-chain-gen/src/Cardano/Mock/Forging/Interpreter.hs

@@ -75,11 +75,11 @@ import Ouroboros.Consensus.Block (
  )
 import qualified Ouroboros.Consensus.Block as Block
 import Ouroboros.Consensus.Cardano.Block (
+  AlonzoEra,
+  BabbageEra,
+  ConwayEra,
   LedgerState (..),
-  StandardAlonzo,
-  StandardBabbage,
-  StandardConway,
-  StandardShelley,
+  ShelleyEra,
  )
 import Ouroboros.Consensus.Cardano.CanHardFork ()
 import Ouroboros.Consensus.Config (
@@ -493,7 +493,7 @@ getCurrentSlot interp = istSlot <$> readTVarIO (interpState interp)
 
 withBabbageLedgerState ::
   Interpreter ->
-  (LedgerState (ShelleyBlock PraosStandard StandardBabbage) -> Either ForgingError a) ->
+  (LedgerState (ShelleyBlock PraosStandard BabbageEra) -> Either ForgingError a) ->
   IO a
 withBabbageLedgerState inter mk = do
   st <- getCurrentLedgerState inter
@@ -505,7 +505,7 @@ withBabbageLedgerState inter mk = do
 
 withConwayLedgerState ::
   Interpreter ->
-  (LedgerState (ShelleyBlock PraosStandard StandardConway) -> Either ForgingError a) ->
+  (LedgerState (ShelleyBlock PraosStandard ConwayEra) -> Either ForgingError a) ->
   IO a
 withConwayLedgerState inter mk = do
   st <- getCurrentLedgerState inter
@@ -517,7 +517,7 @@ withConwayLedgerState inter mk = do
 
 withAlonzoLedgerState ::
   Interpreter ->
-  (LedgerState (ShelleyBlock TPraosStandard StandardAlonzo) -> Either ForgingError a) ->
+  (LedgerState (ShelleyBlock TPraosStandard AlonzoEra) -> Either ForgingError a) ->
   IO a
 withAlonzoLedgerState inter mk = do
   st <- getCurrentLedgerState inter
@@ -529,7 +529,7 @@ withAlonzoLedgerState inter mk = do
 
 withShelleyLedgerState ::
   Interpreter ->
-  (LedgerState (ShelleyBlock TPraosStandard StandardShelley) -> Either ForgingError a) ->
+  (LedgerState (ShelleyBlock TPraosStandard ShelleyEra) -> Either ForgingError a) ->
   IO a
 withShelleyLedgerState inter mk = do
   st <- getCurrentLedgerState inter
@@ -542,10 +542,10 @@ withShelleyLedgerState inter mk = do
 mkTxId :: TxEra -> Ledger.TxId StandardCrypto
 mkTxId txe =
   case txe of
-    TxAlonzo tx -> txIdTx @StandardAlonzo tx
-    TxBabbage tx -> txIdTx @StandardBabbage tx
-    TxConway tx -> txIdTx @StandardConway tx
-    TxShelley tx -> txIdTx @StandardShelley tx
+    TxAlonzo tx -> txIdTx @AlonzoEra tx
+    TxBabbage tx -> txIdTx @BabbageEra tx
+    TxConway tx -> txIdTx @ConwayEra tx
+    TxShelley tx -> txIdTx @ShelleyEra tx
 
 mkValidated :: TxEra -> Validated (Consensus.GenTx CardanoBlock)
 mkValidated txe =

cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Alonzo.hs

@@ -63,24 +63,24 @@ import Data.Sequence.Strict (StrictSeq)
 import qualified Data.Sequence.Strict as StrictSeq
 import qualified Data.Set as Set
 import Lens.Micro
-import Ouroboros.Consensus.Cardano.Block (LedgerState, StandardAlonzo)
+import Ouroboros.Consensus.Cardano.Block (AlonzoEra, LedgerState)
 import Ouroboros.Consensus.Shelley.Eras (StandardCrypto)
 import Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock)
 import Prelude hiding (map)
 
-type AlonzoUTxOIndex = UTxOIndex StandardAlonzo
+type AlonzoUTxOIndex = UTxOIndex AlonzoEra
 
-type AlonzoLedgerState = LedgerState (ShelleyBlock TPraosStandard StandardAlonzo)
+type AlonzoLedgerState = LedgerState (ShelleyBlock TPraosStandard AlonzoEra)
 
 consTxBody ::
   Set (TxIn StandardCrypto) ->
   Set (TxIn StandardCrypto) ->
-  StrictSeq (AlonzoTxOut StandardAlonzo) ->
+  StrictSeq (AlonzoTxOut AlonzoEra) ->
   Coin ->
   MultiAsset StandardCrypto ->
-  [ShelleyTxCert StandardAlonzo] ->
+  [ShelleyTxCert AlonzoEra] ->
   Withdrawals StandardCrypto ->
-  AlonzoTxBody StandardAlonzo
+  AlonzoTxBody AlonzoEra
 consTxBody ins cols outs fees minted certs wdrl =
   AlonzoTxBody
     ins
@@ -111,13 +111,13 @@ addValidityInterval slotNo tx =
 consPaymentTxBody ::
   Set (TxIn StandardCrypto) ->
   Set (TxIn StandardCrypto) ->
-  StrictSeq (AlonzoTxOut StandardAlonzo) ->
+  StrictSeq (AlonzoTxOut AlonzoEra) ->
   Coin ->
   MultiAsset StandardCrypto ->
-  AlonzoTxBody StandardAlonzo
+  AlonzoTxBody AlonzoEra
 consPaymentTxBody ins cols outs fees minted = consTxBody ins cols outs fees minted mempty (Withdrawals mempty)
 
-consCertTxBody :: [ShelleyTxCert StandardAlonzo] -> Withdrawals StandardCrypto -> AlonzoTxBody StandardAlonzo
+consCertTxBody :: [ShelleyTxCert AlonzoEra] -> Withdrawals StandardCrypto -> AlonzoTxBody AlonzoEra
 consCertTxBody = consTxBody mempty mempty mempty (Coin 0) mempty
 
 mkPaymentTx ::
@@ -126,7 +126,7 @@ mkPaymentTx ::
   Integer ->
   Integer ->
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkPaymentTx inputIndex outputIndex amount fees sta = do
   (inputPair, _) <- resolveUTxOIndex inputIndex sta
   addr <- resolveAddress outputIndex sta
@@ -141,7 +141,7 @@ mkPaymentTx' ::
   AlonzoUTxOIndex ->
   [(AlonzoUTxOIndex, MaryValue StandardCrypto)] ->
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkPaymentTx' inputIndex outputIndex sta = do
   inputPair <- fst <$> resolveUTxOIndex inputIndex sta
   outps <- mapM mkOuts outputIndex
@@ -162,7 +162,7 @@ mkLockByScriptTx ::
   Integer ->
   Integer ->
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkLockByScriptTx inputIndex spendable amount fees sta = do
   (inputPair, _) <- resolveUTxOIndex inputIndex sta
 
@@ -173,7 +173,7 @@ mkLockByScriptTx inputIndex spendable amount fees sta = do
   -- No witnesses are necessary when the outputs is a script address. Only when it's consumed.
   Right $ mkSimpleTx True $ consPaymentTxBody input mempty (StrictSeq.fromList $ outs <> [change]) (Coin fees) mempty
   where
-    datahash = hashData @StandardAlonzo plutusDataList
+    datahash = hashData @AlonzoEra plutusDataList
     mkOut sp =
       let outAddress = if sp then alwaysSucceedsScriptAddr else alwaysFailsScriptAddr
        in AlonzoTxOut outAddress (valueFromList (Coin amount) []) (Strict.SJust datahash)
@@ -186,7 +186,7 @@ mkUnlockScriptTx ::
   Integer ->
   Integer ->
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkUnlockScriptTx inputIndex colInputIndex outputIndex succeeds amount fees sta = do
   inputPairs <- fmap fst <$> mapM (`resolveUTxOIndex` sta) inputIndex
   (colInputPair, _) <- resolveUTxOIndex colInputIndex sta
@@ -202,13 +202,13 @@ mkUnlockScriptTx inputIndex colInputIndex outputIndex succeeds amount fees sta =
     $ consPaymentTxBody inpts colInput (StrictSeq.fromList [output]) (Coin fees) mempty
 
 mkScriptInp' ::
-  (Word64, (TxIn StandardCrypto, Core.TxOut StandardAlonzo)) ->
-  Maybe (AlonzoPlutusPurpose AsIx era, Maybe (ScriptHash StandardCrypto, Core.Script StandardAlonzo))
+  (Word64, (TxIn StandardCrypto, Core.TxOut AlonzoEra)) ->
+  Maybe (AlonzoPlutusPurpose AsIx era, Maybe (ScriptHash StandardCrypto, Core.Script AlonzoEra))
 mkScriptInp' = map (second Just) . mkScriptInp
 
 mkScriptInp ::
-  (Word64, (TxIn StandardCrypto, Core.TxOut StandardAlonzo)) ->
-  Maybe (AlonzoPlutusPurpose AsIx era, (ScriptHash StandardCrypto, Core.Script StandardAlonzo))
+  (Word64, (TxIn StandardCrypto, Core.TxOut AlonzoEra)) ->
+  Maybe (AlonzoPlutusPurpose AsIx era, (ScriptHash StandardCrypto, Core.Script AlonzoEra))
 mkScriptInp (n, (_txIn, txOut))
   | addr == alwaysFailsScriptAddr =
       Just
@@ -252,7 +252,7 @@ mkMAssetsScriptTx ::
   Bool ->
   Integer ->
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkMAssetsScriptTx inputIndex colInputIndex outputIndex minted succeeds fees sta = do
   inputPairs <- fmap fst <$> mapM (`resolveUTxOIndex` sta) inputIndex
   colInput <- Set.singleton . fst . fst <$> resolveUTxOIndex colInputIndex sta
@@ -269,18 +269,18 @@ mkMAssetsScriptTx inputIndex colInputIndex outputIndex minted succeeds fees sta
   where
     mkOuts (outIx, vl) = do
       addr <- resolveAddress outIx sta
-      Right $ AlonzoTxOut addr vl (Strict.SJust (hashData @StandardAlonzo plutusDataList))
+      Right $ AlonzoTxOut addr vl (Strict.SJust (hashData @AlonzoEra plutusDataList))
 
 mkDCertTx ::
-  [ShelleyTxCert StandardAlonzo] ->
+  [ShelleyTxCert AlonzoEra] ->
   Withdrawals StandardCrypto ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkDCertTx certs wdrl = Right $ mkSimpleTx True $ consCertTxBody certs wdrl
 
 mkSimpleDCertTx ::
-  [(StakeIndex, StakeCredential StandardCrypto -> ShelleyTxCert StandardAlonzo)] ->
+  [(StakeIndex, StakeCredential -> ShelleyTxCert AlonzoEra)] ->
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkSimpleDCertTx consDert st = do
   dcerts <- forM consDert $ \(stakeIndex, mkDCert) -> do
     cred <- resolveStakeCreds stakeIndex st
@@ -290,11 +290,11 @@ mkSimpleDCertTx consDert st = do
 mkDCertPoolTx ::
   [ ( [StakeIndex]
     , PoolIndex
-    , [StakeCredential StandardCrypto] -> KeyHash 'StakePool StandardCrypto -> ShelleyTxCert StandardAlonzo
+    , [StakeCredential] -> KeyHash 'StakePool -> ShelleyTxCert AlonzoEra
     )
   ] ->
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkDCertPoolTx consDert st = do
   dcerts <- forM consDert $ \(stakeIxs, poolIx, mkDCert) -> do
     stakeCreds <- forM stakeIxs $ \stix -> resolveStakeCreds stix st
@@ -303,10 +303,10 @@ mkDCertPoolTx consDert st = do
   mkDCertTx dcerts (Withdrawals mempty)
 
 mkScriptDCertTx ::
-  [(StakeIndex, Bool, StakeCredential StandardCrypto -> ShelleyTxCert StandardAlonzo)] ->
+  [(StakeIndex, Bool, StakeCredential -> ShelleyTxCert AlonzoEra)] ->
   Bool ->
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkScriptDCertTx consDert valid st = do
   dcerts <- forM consDert $ \(stakeIndex, _, mkDCert) -> do
     cred <- resolveStakeCreds stakeIndex st
@@ -329,7 +329,7 @@ mkDepositTxPools ::
   AlonzoUTxOIndex ->
   Integer ->
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkDepositTxPools inputIndex deposit sta = do
   (inputPair, _) <- resolveUTxOIndex inputIndex sta
 
@@ -340,10 +340,10 @@ mkDepositTxPools inputIndex deposit sta = do
 
 mkDCertTxPools ::
   AlonzoLedgerState ->
-  Either ForgingError (AlonzoTx StandardAlonzo)
+  Either ForgingError (AlonzoTx AlonzoEra)
 mkDCertTxPools sta = Right $ mkSimpleTx True $ consCertTxBody (allPoolStakeCert sta) (Withdrawals mempty)
 
-mkSimpleTx :: Bool -> AlonzoTxBody StandardAlonzo -> AlonzoTx StandardAlonzo
+mkSimpleTx :: Bool -> AlonzoTxBody AlonzoEra -> AlonzoTx AlonzoEra
 mkSimpleTx valid txBody =
   AlonzoTx
     { body = txBody
@@ -353,9 +353,9 @@ mkSimpleTx valid txBody =
     }
 
 consPoolParamsTwoOwners ::
-  [StakeCredential StandardCrypto] ->
-  KeyHash 'StakePool StandardCrypto ->
-  ShelleyTxCert StandardAlonzo
+  [StakeCredential] ->
+  KeyHash 'StakePool ->
+  ShelleyTxCert AlonzoEra
 consPoolParamsTwoOwners [rwCred, KeyHashObj owner0, KeyHashObj owner1] poolId =
   ShelleyTxCertPool $ RegPool $ consPoolParams poolId rwCred [owner0, owner1]
 consPoolParamsTwoOwners _ _ = panic "expected 2 pool owners"
@@ -417,7 +417,7 @@ mkUTxOAlonzo tx =
     transId = txIdTx tx
     outputsL = Core.bodyTxL . Core.outputsTxBodyL
 
-emptyTxBody :: AlonzoTxBody StandardAlonzo
+emptyTxBody :: AlonzoTxBody AlonzoEra
 emptyTxBody =
   AlonzoTxBody
     mempty
@@ -434,7 +434,7 @@ emptyTxBody =
     Strict.SNothing
     (Strict.SJust Testnet)
 
-emptyTx :: AlonzoTx StandardAlonzo
+emptyTx :: AlonzoTx AlonzoEra
 emptyTx =
   AlonzoTx
     { body = emptyTxBody