From c767c8d9ed6a55a0b0829ec289e44148e34c1bbb Mon Sep 17 00:00:00 2001 From: John Ky Date: Sat, 6 Jan 2024 15:49:25 +1100 Subject: [PATCH] Upgrade to cardano-cli-8.17.0.0 and cardano-api-8.37.0.0 --- bench/locli/locli.cabal | 2 +- .../plutus-scripts-bench/plutus-scripts-bench.cabal | 2 +- bench/tx-generator/tx-generator.cabal | 4 ++-- cabal.project | 2 +- cardano-node-chairman/cardano-node-chairman.cabal | 4 ++-- cardano-node/cardano-node.cabal | 2 +- cardano-submit-api/cardano-submit-api.cabal | 4 ++-- cardano-testnet/cardano-testnet.cabal | 7 +++---- .../src/Testnet/Components/Configuration.hs | 2 +- .../Cardano/Testnet/Test/FoldBlocks.hs | 1 + .../Test/LedgerEvents/Gov/ProposeNewConstitution.hs | 12 +++++------- .../Cardano/Testnet/Test/LedgerEvents/SanityCheck.hs | 1 + 12 files changed, 21 insertions(+), 22 deletions(-) diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal index 90fa99abae1..fe039c8d294 100644 --- a/bench/locli/locli.cabal +++ b/bench/locli/locli.cabal @@ -175,7 +175,7 @@ test-suite test-locli build-depends: cardano-prelude , containers , hedgehog - , hedgehog-extras ^>= 0.4.7.0 + , hedgehog-extras ^>= 0.5.1.0 , locli , text diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal index 7bfb70cb8f6..51a6a6cd644 100644 --- a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal +++ b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal @@ -73,7 +73,7 @@ library -- IOG dependencies -------------------------- build-depends: - , cardano-api ^>= 8.36.0.1 + , cardano-api ^>= 8.37.0.0 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 , plutus-tx-plugin >=1.0.0 diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index f310d1ef5e0..3ea56ace2ad 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -98,9 +98,9 @@ library , attoparsec-aeson , base16-bytestring , bytestring - , cardano-api ^>= 8.36.0.1 + , cardano-api ^>= 8.37.0.0 , cardano-binary - , cardano-cli ^>= 8.17.0.0 + , cardano-cli ^>= 8.18.0.0 , cardano-crypto-class , cardano-crypto-wrapper , cardano-data diff --git a/cabal.project b/cabal.project index 227e60ee639..868f58fdd41 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2024-01-04T09:36:23Z - , cardano-haskell-packages 2023-12-15T14:50:31Z + , cardano-haskell-packages 2024-01-04T09:36:23Z packages: cardano-git-rev diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal index 2d11065d988..0a4f0040a4d 100644 --- a/cardano-node-chairman/cardano-node-chairman.cabal +++ b/cardano-node-chairman/cardano-node-chairman.cabal @@ -73,7 +73,7 @@ test-suite chairman-tests , cardano-crypto-class ^>= 2.1.2 , filepath , hedgehog - , hedgehog-extras ^>= 0.4.7.0 + , hedgehog-extras ^>= 0.5.1.0 , network , process , random @@ -89,5 +89,5 @@ test-suite chairman-tests ghc-options: -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T build-tool-depends: cardano-node:cardano-node - , cardano-cli:cardano-cli ^>= 8.17.0.0 + , cardano-cli:cardano-cli ^>= 8.18.0.0 , cardano-node-chairman:cardano-node-chairman diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index d505f31db59..2c0500da510 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -144,7 +144,7 @@ library , async , base16-bytestring , bytestring - , cardano-api ^>= 8.36.0.1 + , cardano-api ^>= 8.37.0.0 , cardano-crypto-class , cardano-crypto-wrapper , cardano-git-rev diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index aef9e22e075..4dc5ccd39ee 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -39,9 +39,9 @@ library , aeson , async , bytestring - , cardano-api ^>= 8.36.0.1 + , cardano-api ^>= 8.37.0.0 , cardano-binary - , cardano-cli ^>= 8.17.0.0 + , cardano-cli ^>= 8.18.0.0 , cardano-crypto-class ^>= 2.1.2 , cardano-ledger-byron ^>= 1.0 , formatting diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index e4473f12d67..3450bbc4025 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -34,8 +34,8 @@ library build-depends: aeson , ansi-terminal , bytestring - , cardano-api ^>= 8.36.0.1 - , cardano-cli ^>= 8.17.0.0 + , cardano-api ^>= 8.37.0.0 + , cardano-cli ^>= 8.18.0.0 , cardano-crypto-class , cardano-crypto-wrapper , cardano-ledger-alonzo @@ -55,7 +55,7 @@ library , exceptions , filepath , hedgehog - , hedgehog-extras ^>= 0.4.7.0 + , hedgehog-extras ^>= 0.5.1.0 , microlens , lens-aeson , mtl @@ -193,7 +193,6 @@ test-suite cardano-testnet-test , cardano-cli , cardano-crypto-class , cardano-ledger-conway - , cardano-ledger-core , cardano-testnet , containers , directory diff --git a/cardano-testnet/src/Testnet/Components/Configuration.hs b/cardano-testnet/src/Testnet/Components/Configuration.hs index 812e26c319d..3297e103394 100644 --- a/cardano-testnet/src/Testnet/Components/Configuration.hs +++ b/cardano-testnet/src/Testnet/Components/Configuration.hs @@ -38,7 +38,7 @@ import qualified Hedgehog.Extras.Test.Base as H import qualified Hedgehog.Extras.Test.File as H import qualified Data.Aeson.Lens as L -import Lens.Micro +import Lens.Micro ((&), (.~)) import Testnet.Defaults import Testnet.Filepath diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldBlocks.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldBlocks.hs index 40c508f8e80..69700ff15ec 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldBlocks.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldBlocks.hs @@ -5,6 +5,7 @@ module Cardano.Testnet.Test.FoldBlocks where import Cardano.Api hiding (cardanoEra) import qualified Cardano.Api as C +import Cardano.Api.Shelley import Cardano.Testnet as TN diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitution.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitution.hs index 54322dbda77..aa9bfb72868 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitution.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitution.hs @@ -16,9 +16,7 @@ import Cardano.Testnet import Prelude -import Cardano.Crypto.Hash.Class import qualified Cardano.Ledger.Conway.Governance as Ledger -import qualified Cardano.Ledger.SafeHash as Ledger import Control.Monad import Control.Monad.Trans.Except import Control.Monad.Trans.Except.Extra @@ -409,8 +407,8 @@ filterRatificationState c (EpochBoundaryRatificationState (AnyRatificationState in Text.pack c == renderSafeHashAsHex constitutionAnchorHash filterRatificationState _ _ = False --- TODO: Move to cardano-api and share with --- https://github.com/input-output-hk/cardano-cli/blob/694782210c6d73a1b5151400214ef691f6f3ecb0/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Hash.hs#L67 --- when doing so -renderSafeHashAsHex :: Ledger.SafeHash c tag -> Text.Text -renderSafeHashAsHex = hashToTextAsHex . Ledger.extractHash +-- -- TODO: Move to cardano-api and share with +-- -- https://github.com/input-output-hk/cardano-cli/blob/694782210c6d73a1b5151400214ef691f6f3ecb0/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Hash.hs#L67 +-- -- when doing so +-- renderSafeHashAsHex :: Ledger.SafeHash c tag -> Text.Text +-- renderSafeHashAsHex = hashToTextAsHex . Ledger.extractHash diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/SanityCheck.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/SanityCheck.hs index ae640ad3a8e..1d76901fcde 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/SanityCheck.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/SanityCheck.hs @@ -9,6 +9,7 @@ module Cardano.Testnet.Test.LedgerEvents.SanityCheck ) where import Cardano.Api +import Cardano.Api.Shelley import Cardano.Testnet