cardano-api: 8.46 -> 8.47

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.46
+    , cardano-api            ^>=8.48
     , cardano-ledger-alonzo
     , cardano-ledger-conway
     , cardano-ledger-core

hydra-cardano-api/hydra-cardano-api.cabal

@@ -82,7 +82,7 @@ library
     , base                    >=4.16
     , base16-bytestring
     , bytestring
-    , cardano-api             ^>=8.46
+    , cardano-api             ^>=8.48
     , cardano-api-classy
     , cardano-binary
     , cardano-crypto-class

hydra-cardano-api/src/Hydra/Cardano/Api.hs

@@ -403,6 +403,8 @@ pattern TxBodyContent ::
   TxScriptValidity ->
   Maybe (Featured ConwayEraOnwards Era (TxProposalProcedures buidl Era)) ->
   Maybe (Featured ConwayEraOnwards Era (TxVotingProcedures buidl Era)) ->
+  Maybe (Featured ConwayEraOnwards Era Coin) ->
+  Maybe (Featured ConwayEraOnwards Era Coin) ->
   TxBodyContent buidl
 pattern TxBodyContent
   { txIns
@@ -425,6 +427,8 @@ pattern TxBodyContent
   , txScriptValidity
   , txProposalProcedures
   , txVotingProcedures
+  , txCurrentTreasuryValue
+  , txTreasuryDonation
   } <-
   Cardano.Api.TxBodyContent
     txIns
@@ -447,6 +451,8 @@ pattern TxBodyContent
     txScriptValidity
     txProposalProcedures
     txVotingProcedures
+    txCurrentTreasuryValue
+    txTreasuryDonation
   where
     TxBodyContent = Cardano.Api.TxBodyContent
 

hydra-cluster/hydra-cluster.cabal

@@ -87,6 +87,7 @@ library
     , async
     , base                  >=4.7 && <5
     , bytestring
+    , cardano-api
     , cardano-slotting
     , containers
     , contra-tracer

hydra-cluster/src/Hydra/Generator.hs

@@ -3,6 +3,7 @@ module Hydra.Generator where
 import Hydra.Cardano.Api
 import Hydra.Prelude hiding (size)
 
+import Cardano.Api.Ledger (PParams)
 import Cardano.Api.UTxO qualified as UTxO
 import CardanoClient (mkGenesisTx)
 import Control.Monad (foldM)
@@ -72,8 +73,8 @@ data ClientDataset = ClientDataset
   deriving stock (Show, Generic)
   deriving anyclass (ToJSON, FromJSON)
 
-defaultProtocolParameters :: ProtocolParameters
-defaultProtocolParameters = fromLedgerPParams ShelleyBasedEraShelley def
+defaultProtocolParameters :: PParams LedgerEra
+defaultProtocolParameters = def
 
 -- | Generate 'Dataset' which does not grow the per-client UTXO set over time.
 -- The sequence of transactions generated consist only of simple payments from

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

hydra-node/src/Hydra/API/HTTPServer.hs

@@ -14,8 +14,6 @@ import Hydra.API.APIServerLog (APIServerLog (..), Method (..), PathInfo (..))
 import Hydra.Cardano.Api (
   LedgerEra,
   Tx,
-  fromLedgerPParams,
-  shelleyBasedEra,
  )
 import Hydra.Chain (Chain (..), CommitBlueprintTx (..), IsChainState, PostTxError (..), draftCommitTx)
 import Hydra.Chain.Direct.State ()
@@ -148,8 +146,7 @@ httpApp tracer directChain pparams getInitializingHeadId getConfirmedUTxO reques
         >>= handleDraftCommitUtxo directChain getInitializingHeadId
         >>= respond
     ("GET", ["protocol-parameters"]) ->
-      respond . responseLBS status200 [] . Aeson.encode $
-        fromLedgerPParams shelleyBasedEra pparams
+      respond . responseLBS status200 [] . Aeson.encode $ pparams
     ("POST", ["cardano-transaction"]) ->
       consumeRequestBodyStrict request
         >>= handleSubmitUserTx directChain

hydra-node/src/Hydra/Chain/CardanoClient.hs

@@ -141,6 +141,8 @@ buildTransaction networkId socket changeAddress utxoToSpend collateral outs = do
       TxScriptValidityNone
       Nothing
       Nothing
+      Nothing
+      Nothing
 
 -- | Submit a (signed) transaction to the node.
 --

hydra-node/src/Hydra/Ledger/Cardano/Builder.hs

@@ -74,6 +74,8 @@ emptyTxBody =
     TxScriptValidityNone
     Nothing
     Nothing
+    Nothing
+    Nothing
 
 -- | Add new inputs to an ongoing builder.
 addInputs :: TxIns BuildTx -> TxBodyContent BuildTx -> TxBodyContent BuildTx

hydra-node/test/Hydra/API/HTTPServerSpec.hs

@@ -9,9 +9,7 @@ import Data.Aeson.Lens (key, nth)
 import Hydra.API.HTTPServer (DraftCommitTxRequest (..), DraftCommitTxResponse (..), SubmitTxRequest (..), TransactionSubmitted, httpApp)
 import Hydra.API.ServerSpec (dummyChainHandle)
 import Hydra.Cardano.Api (
-  fromLedgerPParams,
   serialiseToTextEnvelope,
-  shelleyBasedEra,
  )
 import Hydra.Chain (Chain (draftCommitTx), PostTxError (..))
 import Hydra.Chain.Direct.Fixture (defaultPParams)
@@ -103,7 +101,7 @@ apiServerSpec = do
         it "responds given parameters" $
           get "/protocol-parameters"
             `shouldRespondWith` 200
-              { matchBody = matchJSON $ fromLedgerPParams shelleyBasedEra defaultPParams
+              { matchBody = matchJSON defaultPParams
               }
 
     describe "GET /snapshot/utxo" $ do

hydra-node/test/Hydra/Ledger/CardanoSpec.hs

@@ -126,7 +126,7 @@ roundtripProtocolParameters pparams = do
       (expected === actual)
         & counterexample ("ledger: " <> show pparams)
  where
-  expected = fromLedgerPParams shelleyBasedEra pparams
+  expected = pparams
 
 roundtripTxId :: Tx -> Property
 roundtripTxId tx@(Tx body _) =

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`.

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