Update cardano-cli

carbolymer · carbolymer · commit 50e72b40d6bd · 2025-03-24T17:52:32.000+01:00
diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal
@@ -82,7 +82,7 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>=10.8
+    , cardano-api             ^>=10.11
     , plutus-ledger-api       ^>=1.37
     , plutus-tx               ^>=1.37
     , plutus-tx-plugin        ^>=1.37
diff --git a/bench/tx-generator/src/Cardano/Benchmarking/OuroborosImports.hs b/bench/tx-generator/src/Cardano/Benchmarking/OuroborosImports.hs
@@ -22,8 +22,14 @@ module Cardano.Benchmarking.OuroborosImports
   , submitTxToNodeLocal
   ) where
 
-import           Prelude
+import           Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlots (..),
+                   LocalNodeConnectInfo (..), NetworkId (..), PaymentKey, SigningKey, SocketPath,
+                   TxInMode, TxValidationErrorInCardanoMode, protocolInfo, submitTxToNodeLocal)
 
+import           Cardano.CLI.Type.Common (SigningKeyFile)
+import           Cardano.Ledger.Shelley.Genesis (ShelleyGenesis)
+import           Cardano.Node.Configuration.Logging (LoggingLayer)
+import           Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
 import           Ouroboros.Consensus.Block.Abstract
 import qualified Ouroboros.Consensus.Cardano as Consensus
 import           Ouroboros.Consensus.Config (TopLevelConfig, configBlock, configCodec)
@@ -32,15 +38,7 @@ import           Ouroboros.Consensus.Node (ProtocolInfo (..))
 import           Ouroboros.Consensus.Shelley.Eras (StandardCrypto, StandardShelley)
 import           Ouroboros.Network.Protocol.LocalTxSubmission.Type (SubmitResult (..))
 
-import           Cardano.Node.Configuration.Logging (LoggingLayer)
-import           Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
-
-import           Cardano.CLI.Types.Common (SigningKeyFile)
-
-import           Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlots (..),
-                   LocalNodeConnectInfo (..), NetworkId (..), PaymentKey, SigningKey, SocketPath,
-                   TxInMode, TxValidationErrorInCardanoMode, protocolInfo, submitTxToNodeLocal)
-import           Cardano.Ledger.Shelley.Genesis (ShelleyGenesis)
+import           Prelude
 
 type CardanoBlock = Consensus.CardanoBlock StandardCrypto
 
diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Setup/NixService.hs b/bench/tx-generator/src/Cardano/TxGenerator/Setup/NixService.hs
@@ -23,7 +23,7 @@ module Cardano.TxGenerator.Setup.NixService
 
 import           Cardano.Api (AnyCardanoEra, mapFile)
 
-import           Cardano.CLI.Types.Common (FileDirection (..), SigningKeyFile)
+import           Cardano.CLI.Type.Common (FileDirection (..), SigningKeyFile)
 import qualified Cardano.Ledger.Coin as L
 import           Cardano.Node.Configuration.NodeAddress (NodeAddress' (..),
                    NodeHostIPv4Address (..), NodeIPv4Address)
diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Setup/SigningKey.hs b/bench/tx-generator/src/Cardano/TxGenerator/Setup/SigningKey.hs
@@ -11,15 +11,15 @@ module Cardano.TxGenerator.Setup.SigningKey
        )
        where
 
-import           Data.Bifunctor (first)
-import qualified Data.ByteString as BS (ByteString)
-import           Data.ByteString.Base16 as Base16 (decode)
-
 import           Cardano.Api
-import           Cardano.CLI.Types.Common (SigningKeyFile)
 
+import           Cardano.CLI.Type.Common (SigningKeyFile)
 import           Cardano.TxGenerator.Types (TxGenError (..))
 
+import           Data.Bifunctor (first)
+import qualified Data.ByteString as BS (ByteString)
+import           Data.ByteString.Base16 as Base16 (decode)
+
 
 parseSigningKeyTE :: TextEnvelope -> Either TxGenError (SigningKey PaymentKey)
 parseSigningKeyTE
diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -107,7 +107,7 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 10.8
+                      , cardano-api ^>= 10.11
                       , cardano-binary
                       , cardano-cli ^>= 10.4
                       , cardano-crypto-class
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -252,7 +252,7 @@ test-suite cardano-node-test
                       , bytestring
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
-                      , cardano-api:{cardano-api, internal}
+                      , cardano-api
                       , cardano-ledger-core
                       , cardano-node
                       , cardano-slotting
diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
@@ -39,7 +39,7 @@ library
                       , aeson
                       , async
                       , bytestring
-                      , cardano-api ^>= 10.8
+                      , cardano-api ^>= 10.11
                       , cardano-binary
                       , cardano-cli ^>= 10.4
                       , cardano-crypto-class ^>= 2.1.2
diff --git a/cardano-submit-api/src/Cardano/TxSubmit/CLI/Parsers.hs b/cardano-submit-api/src/Cardano/TxSubmit/CLI/Parsers.hs
@@ -10,7 +10,7 @@ module Cardano.TxSubmit.CLI.Parsers
 import           Cardano.Api (File (..), SocketPath)
 
 import           Cardano.CLI.Environment (EnvCli (..))
-import           Cardano.CLI.EraBased.Options.Common
+import           Cardano.CLI.EraBased.Common.Option
 import           Cardano.TxSubmit.CLI.Types (ConfigFile (..), TxSubmitNodeParams (..))
 import           Cardano.TxSubmit.Rest.Parsers (pWebserverConfig)
 
diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
@@ -35,7 +35,7 @@ library
                       , aeson-pretty
                       , ansi-terminal
                       , bytestring
-                      , cardano-api ^>= 10.8
+                      , cardano-api ^>= 10.11
                       , cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 10.4
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
@@ -222,7 +222,7 @@ test-suite cardano-testnet-test
                       , async
                       , base16-bytestring
                       , bytestring
-                      , cardano-api:{cardano-api, internal}
+                      , cardano-api
                       , cardano-cli:{cardano-cli, cardano-cli-test-lib}
                       , cardano-crypto-class
                       , cardano-ledger-conway
diff --git a/cardano-testnet/src/Parsers/Cardano.hs b/cardano-testnet/src/Parsers/Cardano.hs
@@ -7,7 +7,7 @@ module Parsers.Cardano
 import           Cardano.Api (AnyShelleyBasedEra (AnyShelleyBasedEra), EraInEon (..))
 
 import           Cardano.CLI.Environment
-import           Cardano.CLI.EraBased.Options.Common hiding (pNetworkId)
+import           Cardano.CLI.EraBased.Common.Option hiding (pNetworkId)
 
 import           Prelude
 
diff --git a/cardano-testnet/src/Parsers/Help.hs b/cardano-testnet/src/Parsers/Help.hs
@@ -5,7 +5,7 @@ module Parsers.Help
   , runHelpOptions
   ) where
 
-import           Cardano.CLI.EraBased.Options.Common
+import           Cardano.CLI.EraBased.Common.Option
 
 import           Control.Monad (forM_)
 import qualified Data.List as List
diff --git a/cardano-testnet/src/Parsers/Version.hs b/cardano-testnet/src/Parsers/Version.hs
@@ -6,7 +6,7 @@ module Parsers.Version
   , runVersionOptions
   ) where
 
-import           Cardano.CLI.EraBased.Options.Common
+import           Cardano.CLI.EraBased.Common.Option
 import           Cardano.Git.Rev (gitRev)
 
 import qualified Data.Text as T
diff --git a/cardano-testnet/src/Testnet/TestQueryCmds.hs b/cardano-testnet/src/Testnet/TestQueryCmds.hs
@@ -8,7 +8,7 @@ module Testnet.TestQueryCmds
   , forallQueryCommands
   ) where
 
-import           Cardano.CLI.EraBased.Commands.Query (QueryCmds (..))
+import           Cardano.CLI.EraBased.Query.Command (QueryCmds (..))
 
 import           Testnet.TestEnumGenerator (genAllConstructorsList, genTestType)
 
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/KesPeriodInfo.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/KesPeriodInfo.hs
@@ -13,7 +13,7 @@ module Cardano.Testnet.Test.Cli.KesPeriodInfo
 
 import           Cardano.Api as Api
 
-import           Cardano.CLI.Types.Output
+import           Cardano.CLI.Type.Output
 import           Cardano.Node.Configuration.Topology
 import           Cardano.Testnet
 import           Cardano.Testnet.Test.Misc
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs
@@ -13,17 +13,17 @@ module Cardano.Testnet.Test.Cli.Query
   ( hprop_cli_queries
   ) where
 
-import           Cardano.Api
+import           Cardano.Api as Api
 import           Cardano.Api.Experimental (Some (..))
-import qualified Cardano.Api.Genesis as Api
+import           Cardano.Api.Internal.Genesis as Api
 import           Cardano.Api.Ledger (Coin (Coin), EpochInterval (EpochInterval), StandardCrypto,
                    extractHash, unboundRational)
 import qualified Cardano.Api.Ledger as L
 import           Cardano.Api.Shelley (StakeCredential (StakeCredentialByKey), StakePoolKey)
 
-import           Cardano.CLI.Types.Key (VerificationKeyOrFile (VerificationKeyFilePath),
+import           Cardano.CLI.Type.Key (VerificationKeyOrFile (VerificationKeyFilePath),
                    readVerificationKeyOrFile)
-import           Cardano.CLI.Types.Output (QueryTipLocalStateOutput)
+import           Cardano.CLI.Type.Output (QueryTipLocalStateOutput)
 import           Cardano.Crypto.Hash (hashToStringAsHex)
 import qualified Cardano.Ledger.BaseTypes as L
 import           Cardano.Ledger.Core (valueTxOutL)
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction.hs
@@ -12,10 +12,9 @@ import           Cardano.Api
 import qualified Cardano.Api.Ledger as L
 import           Cardano.Api.Shelley
 
-import           Cardano.CLI.Types.Common
+import           Cardano.CLI.Type.Common
 import           Cardano.Crypto.Hash.Class (hashToStringAsHex)
 import qualified Cardano.Ledger.Core as L
-
 import           Cardano.Testnet
 
 import           Prelude
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/RegisterDeregisterStakeAddress.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/RegisterDeregisterStakeAddress.hs
@@ -9,9 +9,9 @@ module Cardano.Testnet.Test.Cli.Transaction.RegisterDeregisterStakeAddress
   ) where
 
 import           Cardano.Api as Api
-import           Cardano.Api.Address (StakeCredential (..), toShelleyStakeCredential)
+import           Cardano.Api.Internal.Address (StakeCredential (..), toShelleyStakeCredential)
 
-import           Cardano.CLI.Types.Key (SomeSigningKey (AStakeSigningKey))
+import           Cardano.CLI.Type.Key (SomeSigningKey (AStakeSigningKey))
 import qualified Cardano.Ledger.UMap as L
 import           Cardano.Testnet
 
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs
@@ -11,9 +11,9 @@ module Cardano.Testnet.Test.Gov.DRepActivity
   ) where
 
 import           Cardano.Api as Api
-import           Cardano.Api.Eon.ShelleyBasedEra (ShelleyLedgerEra)
 import           Cardano.Api.Experimental (Some (..))
 import           Cardano.Api.Ledger (EpochInterval (EpochInterval, unEpochInterval), drepExpiry)
+import           Cardano.Api.Shelley (ShelleyLedgerEra)
 
 import           Cardano.Ledger.Conway.Core (EraGov, curPParamsGovStateL)
 import           Cardano.Ledger.Conway.PParams (ConwayEraPParams, ppDRepActivityL)
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs
@@ -12,7 +12,7 @@ module Cardano.Testnet.Test.Gov.InfoAction
   ) where
 
 import           Cardano.Api as Api
-import           Cardano.Api.Error (displayError)
+import           Cardano.Api.Internal.Error
 import           Cardano.Api.Ledger (EpochInterval (EpochInterval))
 import           Cardano.Api.Shelley
 
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs
@@ -10,9 +10,9 @@ module Cardano.Testnet.Test.Gov.PredefinedAbstainDRep
   ) where
 
 import           Cardano.Api as Api
-import           Cardano.Api.Eon.ShelleyBasedEra (ShelleyLedgerEra)
 import           Cardano.Api.Experimental (Some (..))
 import           Cardano.Api.Ledger (EpochInterval (EpochInterval))
+import           Cardano.Api.Shelley (ShelleyLedgerEra)
 
 import           Cardano.Ledger.Conway.Core (ppNOptL)
 import           Cardano.Ledger.Conway.Governance (ConwayGovState, cgsCurPParamsL)
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryWithdrawal.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryWithdrawal.hs
@@ -14,9 +14,8 @@ module Cardano.Testnet.Test.Gov.TreasuryWithdrawal
   ) where
 
 import           Cardano.Api
-import           Cardano.Api.Ledger (EpochInterval (EpochInterval), KeyRole (Staking),
-                   StandardCrypto)
-import           Cardano.Api.ReexposeLedger (Coin, Credential)
+import           Cardano.Api.Ledger (Coin, Credential, EpochInterval (EpochInterval),
+                   KeyRole (Staking), StandardCrypto)
 
 import qualified Cardano.Ledger.BaseTypes as L
 import qualified Cardano.Ledger.Coin as L
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Misc.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Misc.hs
@@ -3,9 +3,9 @@ module Cardano.Testnet.Test.Misc where
 
 import           Cardano.Api (docToString)
 
-import           Cardano.CLI.EraBased.Run.Query (renderOpCertIntervalInformation)
-import           Cardano.CLI.Types.Common
-import           Cardano.CLI.Types.Output
+import           Cardano.CLI.EraBased.Query.Run (renderOpCertIntervalInformation)
+import           Cardano.CLI.Type.Common
+import           Cardano.CLI.Type.Output
 
 import           Prelude
 
diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/SanityCheck.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/SanityCheck.hs
@@ -9,7 +9,7 @@ module Cardano.Testnet.Test.SanityCheck
   ) where
 
 import           Cardano.Api
-import           Cardano.Api.Error
+import           Cardano.Api.Internal.Error
 import           Cardano.Api.Shelley
 
 import           Cardano.Testnet
