diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 802725067..c92064613 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -233,11 +233,6 @@ library network, network-uri, optparse-applicative-fork, - ouroboros-consensus ^>=0.21, - ouroboros-consensus-cardano ^>=0.20, - ouroboros-consensus-protocol ^>=0.9.0.2, - ouroboros-network-api ^>=0.10, - ouroboros-network-protocols, parsec, prettyprinter, prettyprinter-ansi-terminal, diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs index 006087663..eeba6ff75 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs @@ -25,16 +25,15 @@ where import Cardano.Api import qualified Cardano.Api.Byron as Byron +import Cardano.Api.Consensus (ByronBlock, EraMismatch (..), GenTx (..)) +import qualified Cardano.Api.Consensus as Byron import qualified Cardano.Api.Ledger as L +import qualified Cardano.Api.Network as Net.Tx import qualified Cardano.Binary as Binary import Cardano.CLI.Byron.Key (byronWitnessToVerKey) import Cardano.CLI.Types.Common (TxFile) import qualified Cardano.Crypto.Signing as Crypto -import Ouroboros.Consensus.Byron.Ledger (ByronBlock, GenTx (..)) -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 Data.Bifunctor (Bifunctor (..)) import Data.ByteString (ByteString) diff --git a/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs b/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs index cc874b277..e8460df40 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/UpdateProposal.hs @@ -15,14 +15,13 @@ import Cardano.Api import Cardano.Api.Byron (AsType (AsByronUpdateProposal), ByronProtocolParametersUpdate, ByronUpdateProposal, makeByronUpdateProposal, toByronLedgerUpdateProposal) import qualified Cardano.Api.Byron as Byron +import Cardano.Api.Consensus (condense, txId) import Cardano.CLI.Byron.Genesis (ByronGenesisError) import Cardano.CLI.Byron.Key (ByronKeyFailure, readByronSigningKey) import Cardano.CLI.Byron.Tx (ByronTxError, nodeSubmitTx) import Cardano.CLI.Helpers (HelpersError, ensureNewFileLBS, renderHelpersError) import Cardano.CLI.Types.Common -import Ouroboros.Consensus.Ledger.SupportsMempool (txId) -import Ouroboros.Consensus.Util.Condense (condense) import Control.Exception (Exception (..)) import Control.Tracer (stdoutTracer, traceWith) diff --git a/cardano-cli/src/Cardano/CLI/Byron/Vote.hs b/cardano-cli/src/Cardano/CLI/Byron/Vote.hs index e83bfc4ca..3f0ed4252 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Vote.hs @@ -12,6 +12,7 @@ module Cardano.CLI.Byron.Vote where import Cardano.Api.Byron +import Cardano.Api.Consensus (condense, txId) import qualified Cardano.Binary as Binary import Cardano.CLI.Byron.Genesis (ByronGenesisError) @@ -21,8 +22,6 @@ import Cardano.CLI.Byron.UpdateProposal (ByronUpdateProposalError, readByronUpdateProposal) import Cardano.CLI.Helpers (HelpersError, ensureNewFileLBS) import Cardano.CLI.Types.Common -import Ouroboros.Consensus.Ledger.SupportsMempool (txId) -import Ouroboros.Consensus.Util.Condense (condense) import Control.Tracer (stdoutTracer, traceWith) import Data.Bifunctor (first) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs index 6f83f18f3..74945dd81 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs @@ -31,11 +31,11 @@ module Cardano.CLI.EraBased.Commands.Query ) where +import qualified Cardano.Api.Network as Consensus import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) import Cardano.CLI.Types.Common import Cardano.CLI.Types.Key -import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus import Data.Set (Set) import Data.Text (Text) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 433840263..8f5a50be6 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -14,6 +14,7 @@ module Cardano.CLI.EraBased.Options.Common where import Cardano.Api import qualified Cardano.Api.Ledger as L +import qualified Cardano.Api.Network as Consensus import Cardano.Api.Shelley import Cardano.CLI.Environment (EnvCli (..), envCliAnyEon) @@ -23,7 +24,6 @@ import Cardano.CLI.Types.Common import Cardano.CLI.Types.Governance import Cardano.CLI.Types.Key import Cardano.CLI.Types.Key.VerificationKey -import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus import Control.Monad (void, when) import qualified Data.Aeson as Aeson diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs index 87cdab28f..71e75ec8d 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs @@ -31,6 +31,7 @@ import Cardano.Api import Cardano.Api.Byron (toByronLovelace, toByronProtocolMagicId, toByronRequiresNetworkMagic) import qualified Cardano.Api.Byron as Byron hiding (GenesisParameters, SigningKey) +import Cardano.Api.Consensus (ShelleyGenesisStaking (..)) import qualified Cardano.Api.Ledger as L import Cardano.Api.Shelley @@ -55,7 +56,6 @@ import qualified Cardano.Crypto.Hash as Crypto import qualified Cardano.Crypto.Signing as Byron import Cardano.Prelude (canonicalEncodePretty) import Cardano.Slotting.Slot (EpochSize (EpochSize)) -import Ouroboros.Consensus.Shelley.Node (ShelleyGenesisStaking (..)) import Control.DeepSeq (NFData, force) import Control.Exception (evaluate) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs index d225efee1..f294acc58 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs @@ -22,6 +22,7 @@ module Cardano.CLI.EraBased.Run.Genesis.CreateTestnetData where import Cardano.Api hiding (ConwayEra) +import Cardano.Api.Consensus (ShelleyGenesisStaking (..)) import Cardano.Api.Ledger (StrictMaybe (SNothing)) import qualified Cardano.Api.Ledger as L import Cardano.Api.Shelley (Hash (..), KESPeriod (KESPeriod), @@ -49,7 +50,6 @@ import Cardano.CLI.Types.Errors.GenesisCmdError import Cardano.CLI.Types.Errors.NodeCmdError import Cardano.CLI.Types.Errors.StakePoolCmdError import Cardano.CLI.Types.Key -import Ouroboros.Consensus.Shelley.Node (ShelleyGenesisStaking (..)) import Control.DeepSeq (NFData, deepseq) import Control.Monad (forM, forM_, unless, void, when) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs index 5039ea285..20b593297 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs @@ -39,8 +39,11 @@ where import Cardano.Api hiding (QueryInShelleyBasedEra (..)) import qualified Cardano.Api as Api -import Cardano.Api.Ledger (strictMaybeToMaybe) +import qualified Cardano.Api.Consensus as Consensus +import Cardano.Api.Ledger (StandardCrypto, strictMaybeToMaybe) import qualified Cardano.Api.Ledger as L +import Cardano.Api.Network (Serialised (..)) +import qualified Cardano.Api.Network as Consensus import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) import qualified Cardano.CLI.EraBased.Commands.Query as Cmd @@ -56,15 +59,7 @@ import qualified Cardano.CLI.Types.Output as O import Cardano.Crypto.Hash (hashToBytesAsHex) import qualified Cardano.Crypto.Hash.Blake2b as Blake2b import Cardano.Slotting.EpochInfo (EpochInfo (..), epochInfoSlotToUTCTime, hoistEpochInfo) -import Ouroboros.Consensus.BlockchainTime.WallClock.Types (RelativeTime (..), - toRelativeTime) -import qualified Ouroboros.Consensus.Cardano.Block as Consensus -import qualified Ouroboros.Consensus.HardFork.History as Consensus -import qualified Ouroboros.Consensus.Protocol.Abstract as Consensus -import qualified Ouroboros.Consensus.Protocol.Praos.Common as Consensus -import Ouroboros.Consensus.Protocol.TPraos (StandardCrypto) -import Ouroboros.Network.Block (Serialised (..)) -import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus +import Cardano.Slotting.Time (RelativeTime (..), toRelativeTime) import Control.Monad (forM, forM_, join) import Data.Aeson as Aeson diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs index 894d8c9ae..3a4ad4334 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs @@ -39,6 +39,8 @@ import Cardano.Api import qualified Cardano.Api.Byron as Byron import qualified Cardano.Api.Experimental as Exp import qualified Cardano.Api.Ledger as L +import qualified Cardano.Api.Network as Consensus +import qualified Cardano.Api.Network as Net.Tx import Cardano.Api.Shelley import qualified Cardano.Binary as CBOR @@ -55,8 +57,6 @@ import Cardano.CLI.Types.Errors.TxCmdError import Cardano.CLI.Types.Errors.TxValidationError import Cardano.CLI.Types.Output (renderScriptCosts) import Cardano.CLI.Types.TxFeature -import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as Consensus -import qualified Ouroboros.Network.Protocol.LocalTxSubmission.Client as Net.Tx import Control.Monad (forM) import Data.Aeson ((.=)) diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs index b762a95dc..f455fa0aa 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceQueryError.hs @@ -3,10 +3,9 @@ module Cardano.CLI.Types.Errors.GovernanceQueryError where import Cardano.Api +import Cardano.Api.Consensus (EraMismatch) import Cardano.Api.Shelley -import Ouroboros.Consensus.Cardano.Block (EraMismatch) - data GovernanceQueryError = GovernanceQueryWriteFileError !(FileError ()) | GovernanceQueryAcqireFailureError !AcquiringFailure diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs index f2879d56d..c271d5385 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs @@ -15,14 +15,13 @@ module Cardano.CLI.Types.Errors.QueryCmdError where import Cardano.Api hiding (QueryInShelleyBasedEra (..)) +import Cardano.Api.Consensus as Consensus (EraMismatch (..), PastHorizonException) import Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..)) import Cardano.Binary (DecoderError) import Cardano.CLI.Helpers (HelpersError (..), renderHelpersError) import Cardano.CLI.Types.Errors.GenesisCmdError import Cardano.CLI.Types.Errors.QueryCmdLocalStateQueryError -import Ouroboros.Consensus.Cardano.Block as Consensus (EraMismatch (..)) -import qualified Ouroboros.Consensus.HardFork.History.Qry as Qry import qualified Data.ByteString.Lazy.Char8 as LBS import Data.Text.Lazy.Builder (toLazyText) @@ -39,7 +38,7 @@ data QueryCmdError | QueryCmdAcquireFailure !AcquiringFailure | QueryCmdByronEra | QueryCmdEraMismatch !EraMismatch - | QueryCmdPastHorizon !Qry.PastHorizonException + | QueryCmdPastHorizon !Consensus.PastHorizonException | QueryCmdSystemStartUnavailable | QueryCmdGenesisReadError !GenesisCmdError | QueryCmdLeaderShipError !LeadershipError diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs index 6b9a5f804..f9f700577 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs @@ -8,9 +8,9 @@ module Cardano.CLI.Types.Errors.QueryCmdLocalStateQueryError where import Cardano.Api +import Cardano.Api.Consensus (EraMismatch (..)) import Cardano.CLI.Types.Errors.NodeEraMismatchError -import Ouroboros.Consensus.Cardano.Block (EraMismatch (..)) -- | An error that can occur while querying a node's local state. newtype QueryCmdLocalStateQueryError diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs index 352f2a38d..510ebf619 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs @@ -15,6 +15,7 @@ module Cardano.CLI.Types.Errors.TxCmdError where import Cardano.Api +import Cardano.Api.Consensus (EraMismatch (..)) import qualified Cardano.Api.Ledger as L import Cardano.Api.Shelley @@ -29,7 +30,6 @@ import Cardano.CLI.Types.Errors.TxValidationError import Cardano.CLI.Types.Output import Cardano.CLI.Types.TxFeature import qualified Cardano.Prelude as List -import Ouroboros.Consensus.Cardano.Block (EraMismatch (..)) import Data.Text (Text)