cardano-api: 8.46 -> 8.47

cardano-scaling · Jul 11, 2024 · c5b0464 · c5b0464
1 parent 7c2a6c4
commit c5b0464
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 11 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.46
+    , cardano-api            ^>=8.47
     , 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.46
+    , cardano-api             ^>=8.47
     , cardano-api-classy
     , cardano-binary
     , cardano-crypto-class

diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api.hs b/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
 

diff --git a/hydra-cluster/hydra-cluster.cabal b/hydra-cluster/hydra-cluster.cabal
@@ -87,6 +87,7 @@ library
     , async
     , base                  >=4.7 && <5
     , bytestring
+    , cardano-api
     , cardano-slotting
     , containers
     , contra-tracer

diff --git a/hydra-cluster/src/Hydra/Generator.hs b/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

diff --git a/hydra-node/src/Hydra/API/HTTPServer.hs b/hydra-node/src/Hydra/API/HTTPServer.hs
@@ -14,7 +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)
@@ -148,8 +147,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

diff --git a/hydra-node/src/Hydra/Chain/CardanoClient.hs b/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.
 --

diff --git a/hydra-node/src/Hydra/Ledger/Cardano/Builder.hs b/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

diff --git a/hydra-node/test/Hydra/API/HTTPServerSpec.hs b/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

diff --git a/hydra-node/test/Hydra/Ledger/CardanoSpec.hs b/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 _) =