Fix cardano-node-emulator-test build errors

Author: sjoerdvisscher

cabal.project

@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 
 -- See CONTRIBUTING.adoc for how to update index-state
 index-state:
-  , hackage.haskell.org 2023-07-10T00:00:00Z
-  , cardano-haskell-packages 2023-07-10T00:00:00Z
+  , hackage.haskell.org 2023-08-23T00:00:00Z
+  , cardano-haskell-packages 2023-08-23T00:00:00Z
 
 packages: plutus-ledger
           plutus-script-utils
@@ -32,6 +32,9 @@ benchmarks: true
 -- 'tasty' output.
 test-show-details: direct
 
+package cardano-crypto-praos
+  flags: -external-libsodium-vrf
+
 allow-newer:
   -- cardano-ledger packages need aeson >2, the following packages have a
   -- too restictive upper bounds on aeson, so we relax them here. The hackage

cardano-node-emulator/cardano-node-emulator.cabal

@@ -55,12 +55,13 @@ library
   build-depends:
     , cardano-api:{cardano-api, gen}  ^>=8.2
     , cardano-crypto
+    , cardano-ledger-allegra
     , cardano-ledger-alonzo
     , cardano-ledger-api
     , cardano-ledger-babbage
     , cardano-ledger-core
+    , cardano-ledger-mary
     , cardano-ledger-shelley
-    , cardano-ledger-shelley-ma
     , cardano-slotting
     , ouroboros-consensus
     , plutus-core                     >=1.0.0
@@ -87,6 +88,7 @@ library
     , mtl
     , prettyprinter              >=1.1.0.1
     , QuickCheck
+    , quickcheck-contractmodel
     , quickcheck-dynamic
     , serialise
     , text
@@ -127,20 +129,19 @@ test-suite cardano-node-emulator-test
   ------------------------
   build-depends:
     , aeson
-    , base              >=4.9 && <5
+    , base                      >=4.9 && <5
     , bytestring
     , containers
     , data-default
     , hedgehog
     , lens
     , mtl
     , QuickCheck
+    , quickcheck-contractmodel
+    , quickcheck-dynamic
     , tasty
     , tasty-golden
     , tasty-hedgehog
     , tasty-hunit
     , tasty-quickcheck
     , text
-
--- , quickcheck-contractmodel
--- , quickcheck-dynamic

cardano-node-emulator/src/Cardano/Node/Emulator/Internal/Node/Params.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE RecordWildCards    #-}
 {-# LANGUAGE TemplateHaskell    #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
+{-# LANGUAGE TupleSections      #-}
 -- | The set of parameters, like protocol parameters and slot configuration.
 module Cardano.Node.Emulator.Internal.Node.Params (
   Params(..),
@@ -59,6 +60,7 @@ import GHC.Generics (Generic)
 import GHC.Natural (Natural)
 import Ledger.Test (testnet)
 import Ouroboros.Consensus.HardFork.History qualified as Ouroboros
+import Plutus.Script.Utils.Scripts (Language (PlutusV3))
 import PlutusCore.Evaluation.Machine.ExBudgetingDefaults (defaultCostModelParams)
 import PlutusLedgerApi.V1 (POSIXTime (POSIXTime))
 import Prettyprinter (Pretty (pretty), viaShow, vsep, (<+>))
@@ -173,7 +175,8 @@ instance Default C.ProtocolParameters where
     , protocolParamTreasuryCut = 1 % 5
     , protocolParamUTxOCostPerWord = Nothing -- Obsolete from babbage onwards
     , protocolParamCostModels =
-        let costModels = Map.fromList $ fromJust $ traverse (\l -> (,) l <$> (defaultCostModelParams >>= Alonzo.costModelFromMap l)) [minBound .. maxBound]
+        let costModel = fromJust $ defaultCostModelParams >>= Alonzo.costModelFromMap PlutusV3
+            costModels = Map.fromList $ map (, costModel) [minBound .. maxBound]
         in C.fromAlonzoCostModels $ Alonzo.CostModels costModels mempty mempty
     , protocolParamPrices = Just (C.ExecutionUnitPrices {priceExecutionSteps = 721 % 10000000, priceExecutionMemory = 577 % 10000})
     , protocolParamMaxTxExUnits = Just (C.ExecutionUnits {executionSteps = 10000000000, executionMemory = 14000000})

cardano-node-emulator/src/Cardano/Node/Emulator/Test.hs

@@ -31,7 +31,7 @@ import Cardano.Node.Emulator.API (EmulatorLogs, EmulatorM, EmulatorMsg (ChainEve
                                   emptyEmulatorStateWithInitialDist, esChainState, getParams)
 import Cardano.Node.Emulator.Generators (knownAddresses)
 import Cardano.Node.Emulator.Internal.Node qualified as E
-import Cardano.Node.Emulator.Internal.Node.Params (pNetworkId, pProtocolParams)
+import Cardano.Node.Emulator.Internal.Node.Params (pNetworkId)
 import Control.Lens (use, view, (^.))
 import Control.Monad.Except (runExceptT)
 import Control.Monad.RWS.Strict (evalRWS)
@@ -135,7 +135,7 @@ propRunActionsWithOptions initialDist params predicate actions =
     monadic runFinalPredicate monadicPredicate
     where
         finalState = stateAfter actions
-        ps = pProtocolParams params
+        ps = E.bundledProtocolParameters params
 
         monadicPredicate :: PropertyM (RunMonad EmulatorM) Property
         monadicPredicate = do

cardano-node-emulator/test/Cardano/Node/Emulator/GeneratorsSpec.hs

@@ -10,7 +10,7 @@ import Cardano.Node.Emulator.Generators qualified as Gen
 import Cardano.Node.Emulator.Internal.Node.TimeSlot (SlotConfig (scSlotLength))
 import Cardano.Node.Emulator.Internal.Node.TimeSlot qualified as TimeSlot
 import Data.Aeson qualified as JSON
-import Data.Aeson.Internal qualified as Aeson
+import Data.Aeson.Types qualified as Aeson
 import Data.String (fromString)
 import Hedgehog (Gen, Property, forAll, property)
 import Hedgehog qualified
@@ -93,8 +93,9 @@ ledgerBytesShowFromHexProp :: Property
 ledgerBytesShowFromHexProp = property $ do
     bts <- forAll $ Bytes.LedgerBytes . PlutusTx.toBuiltin <$> Gen.genSizedByteString 32
     let result = Bytes.fromHex $ fromString $ show bts
-
-    Hedgehog.assert $ result == Right bts
+    case result of
+        Left _    -> Hedgehog.failure
+        Right res -> Hedgehog.assert $ res == bts
 
 ledgerBytesToJSONProp :: Property
 ledgerBytesToJSONProp = property $ do

cardano-node-emulator/test/Plutus/Example/Game.hs

@@ -28,13 +28,13 @@ import Control.Monad (void)
 import Data.ByteString.Char8 qualified as C
 import Data.Map qualified as Map
 import GHC.Generics (Generic)
-import Ledger (CardanoAddress, POSIXTime, PaymentPrivateKey, UtxoIndex, getValidator)
+import Ledger (CardanoAddress, POSIXTime, PaymentPrivateKey, UtxoIndex, Validator, getValidator)
 import Ledger.Address (mkValidatorCardanoAddress)
 import Ledger.Tx.CardanoAPI qualified as C
 import Ledger.Typed.Scripts qualified as Scripts
 import Plutus.Script.Utils.Typed (ScriptContextV2, Versioned)
 import Plutus.Script.Utils.V2.Typed.Scripts qualified as V2
-import PlutusLedgerApi.V2 (Address, Validator)
+import PlutusLedgerApi.V2 (Address)
 import PlutusLedgerApi.V2.Contexts qualified as V2
 import PlutusTx (FromData, ToData)
 import PlutusTx qualified
@@ -126,7 +126,7 @@ data GuessArgs =
 mkLockTx :: LockArgs -> (C.CardanoBuildTx, UtxoIndex)
 mkLockTx LockArgs { lockArgsGameParam, lockArgsSecret, lockArgsValue } =
     let gameAddr = mkGameAddress lockArgsGameParam
-        datum = C.fromPlutusData $ PlutusTx.toData $ hashString lockArgsSecret
+        datum = C.unsafeHashableScriptData $ C.fromPlutusData $ PlutusTx.toData $ hashString lockArgsSecret
         txOut = C.TxOut
             gameAddr
             (C.toCardanoTxOutValue lockArgsValue)
@@ -144,7 +144,7 @@ mkGuessTx
     -> (C.CardanoBuildTx, UtxoIndex)
 mkGuessTx utxos GuessArgs { guessArgsGameParam, guessArgsSecret } =
     let witnessHeader = either (error . show) id $ C.toCardanoTxInScriptWitnessHeader (getValidator <$> mkGameValidator guessArgsGameParam)
-        redeemer = C.fromPlutusData $ PlutusTx.toData $ clearString guessArgsSecret
+        redeemer = C.unsafeHashableScriptData $ C.fromPlutusData $ PlutusTx.toData $ clearString guessArgsSecret
         witness = C.BuildTxWith $ C.ScriptWitness C.ScriptWitnessForSpending $
             witnessHeader C.InlineScriptDatum redeemer C.zeroExecutionUnits
         txIns = (, witness) <$> Map.keys (C.unUTxO utxos)