Update cardano-api-8.39.0.0

.github/workflows/haskell.yml

@@ -24,7 +24,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2024-02-12-2"
+      CABAL_CACHE_VERSION: "2024-02-22"
 
     concurrency:
       group: >

cabal.project

@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2024-02-14T11:32:54Z
-  , cardano-haskell-packages 2024-02-14T10:17:08Z
+  , hackage.haskell.org 2024-02-15T11:36:53Z
+  , cardano-haskell-packages 2024-02-21T14:57:01Z
 
 packages:
   cardano-cli

cardano-cli/cardano-cli.cabal

@@ -196,7 +196,7 @@ library
                       , binary
                       , bytestring
                       , canonical-json
-                      , cardano-api ^>= 8.38.0.2
+                      , cardano-api ^>= 8.39.0.0
                       , cardano-binary
                       , cardano-crypto
                       , cardano-crypto-class ^>= 2.1.2
@@ -275,7 +275,6 @@ library cardano-cli-test-lib
                       , hedgehog-extras ^>= 0.6.1.0
                       , process
                       , text
-                      , transformers
 
 test-suite cardano-cli-test
   import:               project-config
@@ -301,7 +300,6 @@ test-suite cardano-cli-test
                       , tasty-hedgehog
                       , text
                       , time
-                      , transformers
 
   build-tool-depends:   tasty-discover:tasty-discover
 

cardano-cli/src/Cardano/CLI/Byron/Delegation.hs

@@ -14,7 +14,6 @@ module Cardano.CLI.Byron.Delegation
 where
 
 import           Cardano.Api.Byron
-import           Cardano.Api.Pretty
 
 import qualified Cardano.Chain.Delegation as Dlg
 import           Cardano.Chain.Slotting (EpochNumber)
@@ -29,9 +28,6 @@ import           Prelude hiding ((.))
 
 import           Control.Category
 import           Control.Monad (unless)
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (left)
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Lazy as LB
 import           Data.Text (Text)

cardano-cli/src/Cardano/CLI/Byron/Genesis.hs

@@ -12,10 +12,9 @@ module Cardano.CLI.Byron.Genesis
   )
 where
 
-import           Cardano.Api (Key (..), NetworkId, writeSecrets)
+import           Cardano.Api (Doc, Key (..), NetworkId, pretty, pshow, writeSecrets)
 import           Cardano.Api.Byron (ByronKey, SerialiseAsRawBytes (..), SigningKey (..),
                    toByronRequiresNetworkMagic)
-import           Cardano.Api.Pretty
 
 import qualified Cardano.Chain.Common as Common
 import           Cardano.Chain.Delegation hiding (Map, epoch)

cardano-cli/src/Cardano/CLI/Byron/Key.hs

@@ -17,16 +17,12 @@ module Cardano.CLI.Byron.Key
 where
 
 import           Cardano.Api.Byron
-import           Cardano.Api.Pretty
 
 import qualified Cardano.Chain.Common as Common
 import           Cardano.CLI.Types.Common
 import qualified Cardano.Crypto.Signing as Crypto
 
 import           Control.Exception (Exception (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither, left,
-                   right)
 import qualified Data.ByteString as SB
 import qualified Data.ByteString.UTF8 as UTF8
 import           Data.String (IsString, fromString)

cardano-cli/src/Cardano/CLI/Byron/Parsers.hs

@@ -27,7 +27,6 @@ module Cardano.CLI.Byron.Parsers
 import           Cardano.Api hiding (GenesisParameters, UpdateProposal)
 import           Cardano.Api.Byron (Address (..), ByronProtocolParametersUpdate (..),
                    toByronLovelace)
-import           Cardano.Api.Pretty
 import           Cardano.Api.Shelley (ReferenceScript (ReferenceScriptNone))
 
 import           Cardano.Chain.Common (BlockCount (..), TxFeePolicy (..), TxSizeLinear (..),

cardano-cli/src/Cardano/CLI/Byron/Run.hs

@@ -24,17 +24,13 @@ import           Cardano.CLI.Types.Common
 import qualified Cardano.Crypto.Hashing as Crypto
 import qualified Cardano.Crypto.Signing as Crypto
 
-import           Control.Monad.IO.Class (MonadIO (liftIO))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither, left)
 import           Data.Bifunctor (Bifunctor (..))
 import qualified Data.ByteString.Char8 as BS
 import           Data.Text (Text)
 import qualified Data.Text.IO as Text
 import qualified Data.Text.Lazy.Builder as Builder
 import qualified Data.Text.Lazy.IO as TL
 import qualified Formatting as F
-import           Prettyprinter
 
 -- | Data type that encompasses all the possible errors of the
 -- Byron client.

cardano-cli/src/Cardano/CLI/Byron/Tx.hs

@@ -28,7 +28,6 @@ where
 import           Cardano.Api
 import           Cardano.Api.Byron
 import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Pretty
 
 import qualified Cardano.Binary as Binary
 import qualified Cardano.Chain.Common as Common
@@ -43,9 +42,6 @@ import qualified Ouroboros.Consensus.Byron.Ledger as Byron
 import           Ouroboros.Consensus.Cardano.Block (EraMismatch (..))
 import qualified Ouroboros.Network.Protocol.LocalTxSubmission.Client as Net.Tx
 
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (left)
 import           Data.Bifunctor (Bifunctor (..))
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as B

cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs

@@ -10,10 +10,9 @@ module Cardano.CLI.Byron.UpdateProposal
   , submitByronUpdateProposal
   ) where
 
-import           Cardano.Api (NetworkId, SerialiseAsRawBytes (..), SocketPath)
+import           Cardano.Api (Doc, NetworkId, SerialiseAsRawBytes (..), SocketPath, pshow)
 import           Cardano.Api.Byron (AsType (AsByronUpdateProposal), ByronProtocolParametersUpdate,
                    ByronUpdateProposal, makeByronUpdateProposal, toByronLedgerUpdateProposal)
-import           Cardano.Api.Pretty
 
 import           Cardano.Chain.Update (InstallerHash (..), ProtocolVersion (..),
                    SoftwareVersion (..), SystemTag (..))

cardano-cli/src/Cardano/CLI/Byron/Vote.hs

@@ -11,7 +11,6 @@ module Cardano.CLI.Byron.Vote
   ) where
 
 import           Cardano.Api.Byron
-import           Cardano.Api.Pretty
 
 import qualified Cardano.Binary as Binary
 import           Cardano.CLI.Byron.Genesis (ByronGenesisError)
@@ -24,9 +23,6 @@ import           Cardano.CLI.Types.Common
 import           Ouroboros.Consensus.Ledger.SupportsMempool (txId)
 import           Ouroboros.Consensus.Util.Condense (condense)
 
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither)
 import           Control.Tracer (stdoutTracer, traceWith)
 import           Data.Bifunctor (first)
 import qualified Data.ByteString as BS

cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs

@@ -28,9 +28,7 @@ import           Cardano.Api.Shelley
 import           Cardano.CLI.Types.Common
 import           Cardano.CLI.Types.Key
 import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
-import qualified Cardano.Ledger.BaseTypes as Ledger
 import qualified Cardano.Ledger.Crypto as Crypto
-import qualified Cardano.Ledger.SafeHash as Ledger
 
 import           Data.Text (Text)
 import           Data.Word

cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs

@@ -13,7 +13,6 @@ module Cardano.CLI.EraBased.Options.Common where
 
 import           Cardano.Api
 import qualified Cardano.Api.Ledger as Ledger
-import           Cardano.Api.Pretty
 import           Cardano.Api.Shelley
 
 import           Cardano.CLI.Environment (EnvCli (..), envCliAnyShelleyBasedEra,

cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs

@@ -13,7 +13,6 @@ import           Cardano.Api.Shelley
 import qualified Cardano.CLI.EraBased.Commands.Governance.Actions as Cmd
 import           Cardano.CLI.EraBased.Options.Common
 import           Cardano.CLI.Types.Common
-import           Cardano.Ledger.BaseTypes (NonNegativeInterval)
 import qualified Cardano.Ledger.BaseTypes as Ledger
 
 import           Data.Foldable

cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs

@@ -19,7 +19,7 @@ import           Data.Foldable
 import           Options.Applicative hiding (help, str)
 import qualified Options.Applicative as Opt
 import qualified Options.Applicative.Help as H
-import           Prettyprinter (line, pretty)
+import           Prettyprinter (line)
 
 {- HLINT ignore "Use <$>" -}
 {- HLINT ignore "Move brackets to avoid $" -}

cardano-cli/src/Cardano/CLI/EraBased/Run.hs

@@ -22,9 +22,7 @@ import           Cardano.CLI.EraBased.Run.TextView
 import           Cardano.CLI.EraBased.Run.Transaction
 import           Cardano.CLI.Types.Errors.CmdError
 
-import           Control.Monad.Trans.Except
-import           Control.Monad.Trans.Except.Extra (firstExceptT)
-import           Data.Function ((&))
+import           Data.Function
 
 runAnyEraCommand :: ()
   => AnyEraCommand

cardano-cli/src/Cardano/CLI/EraBased/Run/Address.hs

@@ -26,9 +26,6 @@ import           Cardano.CLI.Types.Key (PaymentVerifier (..), StakeIdentifier (.
                    StakeVerifier (..), VerificationKeyTextOrFile, generateKeyPair,
                    readVerificationKeyOrFile, readVerificationKeyTextOrFileAnyOf)
 
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, left, newExceptT)
 import qualified Data.ByteString.Char8 as BS
 import           Data.Function
 import qualified Data.Text.IO as Text

cardano-cli/src/Cardano/CLI/EraBased/Run/Address/Info.hs

@@ -9,9 +9,6 @@ import           Cardano.Api
 
 import           Cardano.CLI.Types.Errors.AddressInfoError
 
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (left)
 import           Data.Aeson (ToJSON (..), object, (.=))
 import           Data.Aeson.Encode.Pretty (encodePretty)
 import qualified Data.ByteString.Lazy.Char8 as LBS

cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs

@@ -59,11 +59,6 @@ import           Ouroboros.Consensus.Shelley.Node (ShelleyGenesisStaking (..))
 
 import           Control.DeepSeq (NFData, force)
 import           Control.Monad (forM, forM_, unless, void, when, zipWithM)
-import           Control.Monad.Except (MonadError (..), runExceptT)
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither,
-                   newExceptT)
 import qualified Data.Aeson as Aeson
 import           Data.Bifunctor (Bifunctor (..))
 import qualified Data.Binary.Get as Bin

cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs

@@ -85,11 +85,6 @@ import           Ouroboros.Consensus.Shelley.Node (ShelleyGenesisStaking (..))
 
 import           Control.DeepSeq (NFData, force)
 import           Control.Monad (forM, forM_, unless, when)
-import           Control.Monad.Except (MonadError (..))
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT, throwE, withExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither, left,
-                   newExceptT)
 import           Data.Aeson hiding (Key)
 import qualified Data.Aeson as Aeson
 import           Data.Aeson.Encode.Pretty (encodePretty)

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs

@@ -32,8 +32,6 @@ import           Cardano.CLI.Types.Errors.GovernanceCmdError
 import qualified Cardano.Ledger.Shelley.API as Shelley
 
 import           Control.Monad
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra
 import           Data.Function
 import qualified Data.Map.Strict as Map
 

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs

@@ -26,9 +26,6 @@ import           Cardano.CLI.Types.Key
 import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
 
 import           Control.Monad
-import           Control.Monad.Except (ExceptT)
-import           Control.Monad.Trans (MonadTrans (..))
-import           Control.Monad.Trans.Except.Extra
 import           Data.Function
 import qualified Data.Map.Strict as Map
 

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs

@@ -17,10 +17,6 @@ import           Cardano.CLI.Types.Errors.GovernanceCommitteeError
 import           Cardano.CLI.Types.Key
 import           Cardano.CLI.Types.Key.VerificationKey
 
-import           Control.Monad.Except (ExceptT)
-import           Control.Monad.IO.Class (liftIO)
-import           Control.Monad.Trans (lift)
-import           Control.Monad.Trans.Except.Extra
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BS
 import           Data.Function

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs

@@ -27,10 +27,6 @@ import           Cardano.CLI.Types.Errors.GovernanceCmdError
 import           Cardano.CLI.Types.Errors.RegistrationError
 import           Cardano.CLI.Types.Key
 
-import           Control.Monad.IO.Class
-import           Control.Monad.Trans.Class
-import           Control.Monad.Trans.Except
-import           Control.Monad.Trans.Except.Extra
 import           Data.Function
 import qualified Data.Text.Encoding as Text
 

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs

@@ -12,8 +12,6 @@ import           Cardano.Api.Shelley
 import           Cardano.CLI.Types.Errors.GovernanceCmdError
 import           Cardano.CLI.Types.Key
 
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra
 
 runGovernanceGenesisKeyDelegationCertificate
   :: ShelleyToBabbageEra era

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Hash.hs

@@ -27,8 +27,6 @@ import           Cardano.Ledger.Crypto
 import           Cardano.Ledger.SafeHash (extractHash)
 import qualified Cardano.Ledger.SafeHash as Ledger
 
-import           Control.Monad.Trans.Except
-import           Control.Monad.Trans.Except.Extra
 import qualified Data.ByteString as BS
 import           Data.Function
 import qualified Data.Text.Encoding as Text

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs

@@ -19,10 +19,6 @@ import           Cardano.CLI.Read
 import           Cardano.CLI.Types.Errors.GovernanceCmdError
 
 import           Control.Monad
-import           Control.Monad.IO.Class
-import           Control.Monad.Trans.Class (lift)
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra
 import qualified Data.ByteString.Char8 as BSC
 import           Data.Function ((&))
 import           Data.String (fromString)

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs

@@ -22,8 +22,6 @@ import           Cardano.CLI.Types.Errors.GovernanceVoteCmdError
 import           Cardano.CLI.Types.Governance
 import           Cardano.CLI.Types.Key
 
-import           Control.Monad.Trans.Except
-import           Control.Monad.Trans.Except.Extra
 import           Data.Aeson.Encode.Pretty
 import           Data.Function
 import qualified Data.Yaml.Pretty as Yaml

cardano-cli/src/Cardano/CLI/EraBased/Run/Key.hs

@@ -48,9 +48,6 @@ import qualified Cardano.Ledger.Keys as Shelley
 
 import qualified Codec.Binary.Bech32 as Bech32
 import qualified Control.Exception as Exception
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither, left, newExceptT)
 import           Data.Bifunctor (Bifunctor (..))
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString as BS

cardano-cli/src/Cardano/CLI/EraBased/Run/Node.hs

@@ -22,9 +22,6 @@ import           Cardano.CLI.Types.Common
 import           Cardano.CLI.Types.Errors.NodeCmdError
 import           Cardano.CLI.Types.Key
 
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither, newExceptT)
 import qualified Data.ByteString.Char8 as BS
 import           Data.String (fromString)
 import           Data.Word (Word64)

cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs

@@ -42,7 +42,6 @@ import qualified Cardano.Api as Api
 import           Cardano.Api.Byron hiding (QueryInShelleyBasedEra (..))
 import qualified Cardano.Api.Ledger as L
 import qualified Cardano.Api.Ledger as Ledger
-import           Cardano.Api.Pretty
 import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
 
 import qualified Cardano.CLI.EraBased.Commands.Query as Cmd
@@ -57,9 +56,7 @@ import           Cardano.CLI.Types.Key
 import qualified Cardano.CLI.Types.Output as O
 import           Cardano.Crypto.Hash (hashToBytesAsHex)
 import qualified Cardano.Crypto.Hash.Blake2b as Blake2b
-import qualified Cardano.Ledger.BaseTypes as L
 import qualified Cardano.Ledger.Core as Core
-import qualified Cardano.Ledger.Credential as L
 import qualified Cardano.Ledger.Crypto as Crypto
 import           Cardano.Ledger.Keys (KeyHash (..), KeyRole (..))
 import           Cardano.Ledger.SafeHash (SafeHash)
@@ -78,11 +75,6 @@ import           Ouroboros.Network.Block (Serialised (..))
 import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus
 
 import           Control.Monad (forM, forM_, join)
-import           Control.Monad.IO.Class (MonadIO)
-import           Control.Monad.IO.Unlift (MonadIO (..))
-import           Control.Monad.Trans.Class
-import           Control.Monad.Trans.Except
-import           Control.Monad.Trans.Except.Extra
 import           Data.Aeson as Aeson
 import qualified Data.Aeson as A
 import           Data.Aeson.Encode.Pretty (encodePretty)

cardano-cli/src/Cardano/CLI/EraBased/Run/StakeAddress.hs

@@ -31,11 +31,6 @@ import           Cardano.CLI.Types.Errors.StakeAddressRegistrationError
 import           Cardano.CLI.Types.Governance
 import           Cardano.CLI.Types.Key
 
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans (lift)
-import           Control.Monad.Trans.Except (ExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither, left, newExceptT,
-                   onLeft)
 import qualified Data.ByteString.Char8 as BS
 import           Data.Function ((&))
 import qualified Data.Text.IO as Text