Upgrade to cardano-cli-8.17.0.0 and cardano-api-8.37.0.0

IntersectMBO · Jan 6, 2024 · c767c8d · c767c8d
1 parent 5353e38
commit c767c8d
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitution.hs b/...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
@@ -9,6 +9,7 @@ module Cardano.Testnet.Test.LedgerEvents.SanityCheck
   ) where
 
 import           Cardano.Api
+import           Cardano.Api.Shelley
 
 import           Cardano.Testnet