Account for cardano-ledger changes

  * Update `index-state` and affected `cardano-ledger` version bounds:
    `cardano-ledger` requires `plutus-ledger-api ^>=1.26.0`,
    hence the `index-state` update

  * Use `StandardCrypto` in protocol info tests:
    `exampleConwayGenesis` was made monomorphic here:
    IntersectMBO/cardano-ledger#4252
    The `Crypto c` constraint was removed and now it uses
    `StandardCrypto`.

  * Add `plutusV3CostModel` to `Conway` genesis file

  * Update `SupportsTwoPhaseValidation` instance for `Conway`:
    `ConwayUtxowFailure` was fixed to get rid of the possibility
    of injecting `UtxoFailure` in two separate ways
    (as seen in the code removed by this commit)

Author: Lucsanszky

cabal.project

@@ -16,7 +16,7 @@ index-state:
   -- Bump this if you need newer packages from Hackage
   , hackage.haskell.org 2024-03-26T06:28:59Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2024-04-05T13:36:27Z
+  , cardano-haskell-packages 2024-04-24T00:00:00Z
 
 packages:
   ouroboros-consensus
@@ -26,6 +26,55 @@ packages:
   sop-extras
   strict-sop-core
 
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-ledger
+  tag: a6ee7925fa8070497658a2c8b3770dcd79017281
+  --sha256: sha256-rigDlJcsTYa56/qa+W9TGBu2IbHLndmrHqVzcHoPTBI=
+  subdir: eras/allegra/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/babbage/test-suite
+    eras/conway/impl
+    eras/conway/test-suite
+    eras/mary/impl
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/test-suite
+    libs/cardano-ledger-api
+    libs/cardano-ledger-core
+    libs/cardano-ledger-binary
+    libs/cardano-protocol-tpraos
+    libs/non-integral
+    libs/small-steps
+    libs/cardano-data
+    libs/set-algebra
+    libs/vector-map
+    eras/byron/chain/executable-spec
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/ledger/impl/test
+    eras/byron/crypto
+    eras/byron/crypto/test
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-network
+  tag: eb6ac9aa088aa3763e1163824a405fbb21303eb4
+  --sha256: sha256-KZAxb6Lf9++JtoOTkapvCMpQOwz97zkOO30Bu8Asuak=
+  subdir: cardano-ping
+          monoidal-synchronisation
+          network-mux
+          ouroboros-network
+          ouroboros-network-api
+          ouroboros-network-framework
+          ouroboros-network-mock
+          ouroboros-network-protocols
+          ouroboros-network-testing
+          ntp-client
+          cardano-client
+
 -- We want to always build the test-suites and benchmarks
 tests: true
 benchmarks: true

flake.lock

@@ -134,13 +134,13 @@ library
     cardano-crypto-class,
     cardano-crypto-wrapper,
     cardano-ledger-allegra ^>=1.4,
-    cardano-ledger-alonzo ^>=1.7,
+    cardano-ledger-alonzo ^>=1.8,
     cardano-ledger-api ^>=1.9,
-    cardano-ledger-babbage ^>=1.7,
+    cardano-ledger-babbage ^>=1.8,
     cardano-ledger-binary ^>=1.3,
     cardano-ledger-byron ^>=1.0,
-    cardano-ledger-conway ^>=1.13,
-    cardano-ledger-core ^>=1.11,
+    cardano-ledger-conway ^>=1.14,
+    cardano-ledger-core ^>=1.12,
     cardano-ledger-mary ^>=1.5,
     cardano-ledger-shelley ^>=1.10,
     cardano-prelude,

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

@@ -353,30 +353,13 @@ instance SupportsTwoPhaseValidation (BabbageEra c) where
 instance SupportsTwoPhaseValidation (ConwayEra c) where
   isIncorrectClaimedFlag _ = \case
     SL.ConwayUtxowFailure
-      ( Babbage.AlonzoInBabbageUtxowPredFailure
-          ( Alonzo.ShelleyInAlonzoUtxowPredFailure
-              ( SL.UtxoFailure
-                  ( Babbage.AlonzoInBabbageUtxoPredFailure
-                      ( Alonzo.UtxosFailure
-                          ( Conway.ValidationTagMismatch
-                              (Alonzo.IsValid _claimedFlag)
-                              _validationErrs
-                            )
-                        )
-                    )
-                )
-            )
-        ) -> True
-    SL.ConwayUtxowFailure
-      ( Babbage.UtxoFailure
-          ( Babbage.AlonzoInBabbageUtxoPredFailure
-              ( Alonzo.UtxosFailure
+      ( Conway.UtxoFailure
+              ( Conway.UtxosFailure
                   ( Conway.ValidationTagMismatch
                       (Alonzo.IsValid _claimedFlag)
                       _validationErrs
                   )
               )
-          )
       ) -> True
     _ -> False
 

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Eras.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE NamedFieldPuns      #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications    #-}
+{-# LANGUAGE TypeOperators       #-}
 
 -- | Utility functions to elaborate a Cardano 'ProtocolInfo' from certain parameters.
 module Test.Consensus.Cardano.ProtocolInfo (
@@ -23,6 +24,7 @@ module Test.Consensus.Cardano.ProtocolInfo (
 
 import qualified Cardano.Chain.Genesis as CC.Genesis
 import qualified Cardano.Chain.Update as CC.Update
+import           Cardano.Ledger.Api.Era (StandardCrypto)
 import qualified Cardano.Ledger.Api.Transition as L
 import qualified Cardano.Ledger.BaseTypes as SL
 import qualified Cardano.Protocol.TPraos.OCert as SL
@@ -177,7 +179,7 @@ hardForkInto Conway =
 --
 mkSimpleTestProtocolInfo ::
      forall c
-   . CardanoHardForkConstraints c
+   . (CardanoHardForkConstraints c, c ~ StandardCrypto)
   => Shelley.DecentralizationParam
   -- ^ Network decentralization parameter.
   -> SecurityParam
@@ -244,7 +246,7 @@ mkSimpleTestProtocolInfo
 --
 mkTestProtocolInfo ::
      forall m c
-   . (CardanoHardForkConstraints c, IOLike m)
+   . (CardanoHardForkConstraints c, IOLike m, c ~ StandardCrypto)
   => (CoreNodeId, Shelley.CoreNode c)
   -- ^ Id of the node for which the protocol info will be elaborated.
   -> ShelleyGenesis c

ouroboros-consensus-cardano/src/unstable-cardano-testlib/Test/Consensus/Cardano/ProtocolInfo.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE NamedFieldPuns      #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications    #-}
+{-# LANGUAGE TypeOperators       #-}
 
 module Test.ThreadNet.Cardano (tests) where
 
@@ -47,7 +48,6 @@ import           Ouroboros.Consensus.Protocol.Praos.Translate ()
 import           Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol ()
 import           Ouroboros.Consensus.Shelley.Node
 import           Ouroboros.Consensus.Util.IOLike (IOLike)
-import           Test.Consensus.Cardano.MockCrypto (MockCryptoCompatByron)
 import           Test.Consensus.Cardano.ProtocolInfo (HardForkSpec (..),
                      mkTestProtocolInfo)
 import           Test.QuickCheck
@@ -73,7 +73,7 @@ import           Test.Util.TestEnv
 
 -- | Use 'MockCryptoCompatByron' so that bootstrap addresses and
 -- bootstrap witnesses are supported.
-type Crypto = MockCryptoCompatByron
+type Crypto = StandardCrypto
 
 -- | The varying data of this test
 --
@@ -428,7 +428,7 @@ prop_simple_cardano_convergence TestSetup
         property $ maxRollbacks setupK >= finalIntersectionDepth
 
 mkProtocolCardanoAndHardForkTxs ::
-     forall c m. (IOLike m, CardanoHardForkConstraints c)
+     forall c m. (IOLike m, c ~ StandardCrypto)
      -- Byron
   => PBftParams
   -> CoreNodeId

ouroboros-consensus-cardano/test/cardano-test/Test/ThreadNet/Cardano.hs

@@ -25,6 +25,7 @@
   "dRepDeposit": 0,
   "dRepActivity": 0,
   "minFeeRefScriptCostPerByte": 0,
+  "plutusV3CostModel": [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,0,0],
   "constitution": {
     "anchor": {
       "url": "",