cardano-api: 8.47 -> 8.48

cardano-scaling · Jul 11, 2024 · 8658e13 · 8658e13
1 parent 3cd8856
commit 8658e13
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/cardano-api-classy/cardano-api-classy.cabal b/cardano-api-classy/cardano-api-classy.cabal
@@ -54,7 +54,7 @@ library
   -- dependencies on cardano-ledger* follow.
   build-depends:
     , base                   >=4.16
-    , cardano-api            ^>=8.47
+    , cardano-api            ^>=8.48
     , cardano-ledger-alonzo
     , cardano-ledger-conway
     , cardano-ledger-core
diff --git a/hydra-cardano-api/hydra-cardano-api.cabal b/hydra-cardano-api/hydra-cardano-api.cabal
@@ -82,7 +82,7 @@ library
     , base                    >=4.16
     , base16-bytestring
     , bytestring
-    , cardano-api             ^>=8.47
+    , cardano-api             ^>=8.48
     , cardano-api-classy
     , cardano-binary
     , cardano-crypto-class

diff --git a/hydra-node/hydra-node.cabal b/hydra-node/hydra-node.cabal
@@ -151,9 +151,9 @@ library
     , optparse-applicative
     , ouroboros-consensus
     , ouroboros-consensus-cardano
-    , ouroboros-network-api                                     ^>=0.7.1
+    , ouroboros-network-api                                     >=0.7.1
     , ouroboros-network-framework
-    , ouroboros-network-protocols                               ^>=0.8
+    , ouroboros-network-protocols                               >=0.8
     , plutus-core                                               >=1.21
     , plutus-ledger-api                                         >=1.21
     , prometheus

diff --git a/hydra-plutus-extras/src/Hydra/Plutus/Extras.hs b/hydra-plutus-extras/src/Hydra/Plutus/Extras.hs
@@ -19,12 +19,12 @@ import Cardano.Api.Shelley (PlutusScript (PlutusScriptSerialised))
 import PlutusLedgerApi.Common (SerialisedScript)
 import PlutusLedgerApi.V2 (ScriptHash (..))
 import PlutusTx (BuiltinData, UnsafeFromData (..))
-import PlutusTx.Prelude (check, toBuiltin)
+import PlutusTx.Prelude (BuiltinUnit, check, toBuiltin)
 
 -- * Vendored from plutus-ledger
 
 -- | Signature of an untyped validator script.
-type ValidatorType = BuiltinData -> BuiltinData -> BuiltinData -> ()
+type ValidatorType = BuiltinData -> BuiltinData -> BuiltinData -> BuiltinUnit
 
 -- | Wrap a typed validator to get the basic `ValidatorType` signature which can
 -- be passed to `PlutusTx.compile`.
@@ -42,7 +42,7 @@ wrapValidator f d r c =
 {-# INLINEABLE wrapValidator #-}
 
 -- | Signature of an untyped minting policy script.
-type MintingPolicyType = BuiltinData -> BuiltinData -> ()
+type MintingPolicyType = BuiltinData -> BuiltinData -> BuiltinUnit
 
 -- | Wrap a typed minting policy to get the basic `MintingPolicyType` signature
 -- which can be passed to `PlutusTx.compile`.

diff --git a/hydra-test-utils/src/Test/Plutus/Validator.hs b/hydra-test-utils/src/Test/Plutus/Validator.hs
@@ -1,3 +1,7 @@
+{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
+
+{-# HLINT ignore "Use <$>" #-}
+
 -- | A helper module mostly wrapping the Alonzo.Tools'
 -- 'evaluateTransactionExecutionUnits' with a much simpler API (just a plutus
 -- script).
@@ -56,6 +60,7 @@ import Hydra.Cardano.Api (
   pattern TxInsCollateral,
   pattern TxOut,
  )
+import Hydra.Cardano.Api.Prelude (ScriptExecutionError, ScriptWitnessIndex, TransactionValidityError)
 import PlutusLedgerApi.Common (SerialisedScript)
 import PlutusTx qualified as Plutus
 import Prelude qualified
@@ -76,14 +81,25 @@ evaluateScriptExecutionUnits validatorScript redeemer =
     Left e ->
       Left ("unexpected failure: " <> show e)
  where
+  result ::
+    Either
+      (TransactionValidityError UTxO.Era)
+      ( Map
+          ScriptWitnessIndex
+          ( Either
+              ScriptExecutionError
+              ExecutionUnits
+          )
+      )
   result =
-    evaluateTransactionExecutionUnits
-      cardanoEra
-      systemStart
-      (LedgerEpochInfo epochInfo)
-      (LedgerProtocolParameters pparams)
-      (UTxO.toApi utxo)
-      body
+    (fmap . fmap . fmap) snd $
+      evaluateTransactionExecutionUnits
+        cardanoEra
+        systemStart
+        (LedgerEpochInfo epochInfo)
+        (LedgerProtocolParameters pparams)
+        (UTxO.toApi utxo)
+        body
 
   (body, utxo) = transactionBodyFromScript validatorScript redeemer