From 25eb28ead6d84a01abc46fdb16d240a27175098c Mon Sep 17 00:00:00 2001 From: Pablo Lamela Date: Wed, 30 Oct 2024 13:16:04 +0100 Subject: [PATCH 1/5] Reexport requirements from `ouroboros-network-protocols` by `cardano-cli` --- cardano-api/internal/Cardano/Api/ReexposeNetwork.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cardano-api/internal/Cardano/Api/ReexposeNetwork.hs b/cardano-api/internal/Cardano/Api/ReexposeNetwork.hs index c957abaf80..d6de99b720 100644 --- a/cardano-api/internal/Cardano/Api/ReexposeNetwork.hs +++ b/cardano-api/internal/Cardano/Api/ReexposeNetwork.hs @@ -1,3 +1,4 @@ -module Cardano.Api.ReexposeNetwork (Target (..)) where +module Cardano.Api.ReexposeNetwork (Target (..), SubmitResult (..)) where import Ouroboros.Network.Protocol.LocalStateQuery.Type (Target (..)) +import Ouroboros.Network.Protocol.LocalTxSubmission.Type (SubmitResult (..)) From c4e5030b19f5d55228bf0276df3e8d88bf6b0ffe Mon Sep 17 00:00:00 2001 From: Pablo Lamela Date: Wed, 30 Oct 2024 13:36:52 +0100 Subject: [PATCH 2/5] Reexport requirements from `ouroboros-network-api` by `cardano-cli` --- cardano-api/internal/Cardano/Api/ReexposeNetwork.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cardano-api/internal/Cardano/Api/ReexposeNetwork.hs b/cardano-api/internal/Cardano/Api/ReexposeNetwork.hs index d6de99b720..d9ea8c0731 100644 --- a/cardano-api/internal/Cardano/Api/ReexposeNetwork.hs +++ b/cardano-api/internal/Cardano/Api/ReexposeNetwork.hs @@ -1,4 +1,5 @@ -module Cardano.Api.ReexposeNetwork (Target (..), SubmitResult (..)) where +module Cardano.Api.ReexposeNetwork (Target (..), Serialised (..), SubmitResult (..)) where +import Ouroboros.Network.Block (Serialised (..)) import Ouroboros.Network.Protocol.LocalStateQuery.Type (Target (..)) import Ouroboros.Network.Protocol.LocalTxSubmission.Type (SubmitResult (..)) From 7f33f4ca16697d592d4b2018fe6fc2e9d49f27c2 Mon Sep 17 00:00:00 2001 From: Pablo Lamela Date: Wed, 30 Oct 2024 14:22:35 +0100 Subject: [PATCH 3/5] Reexport requirements from `ouroboros-consensus-protocol` by `cardano-cli` --- cardano-api/cardano-api.cabal | 2 ++ cardano-api/internal/Cardano/Api/ReexposeConsensus.hs | 4 ++++ cardano-api/src/Cardano/Api/Consensus.hs | 6 ++++++ 3 files changed, 12 insertions(+) create mode 100644 cardano-api/internal/Cardano/Api/ReexposeConsensus.hs create mode 100644 cardano-api/src/Cardano/Api/Consensus.hs diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal index 74b12c4eb4..776691e9c0 100644 --- a/cardano-api/cardano-api.cabal +++ b/cardano-api/cardano-api.cabal @@ -129,6 +129,7 @@ library internal Cardano.Api.Query Cardano.Api.Query.Expr Cardano.Api.Query.Types + Cardano.Api.ReexposeConsensus Cardano.Api.ReexposeLedger Cardano.Api.ReexposeNetwork Cardano.Api.Rewards @@ -238,6 +239,7 @@ library Cardano.Api.ChainSync.Client Cardano.Api.ChainSync.ClientPipelined Cardano.Api.Compatible + Cardano.Api.Consensus Cardano.Api.Crypto.Ed25519Bip32 Cardano.Api.Experimental Cardano.Api.Ledger diff --git a/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs b/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs new file mode 100644 index 0000000000..e42b388530 --- /dev/null +++ b/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs @@ -0,0 +1,4 @@ +module Cardano.Api.ReexposeConsensus (PraosProtocolSupportsNode, PraosProtocolSupportsNodeCrypto, getOpCertCounters) where + +import Ouroboros.Consensus.Protocol.Praos.Common (PraosProtocolSupportsNode, + PraosProtocolSupportsNodeCrypto, getOpCertCounters) diff --git a/cardano-api/src/Cardano/Api/Consensus.hs b/cardano-api/src/Cardano/Api/Consensus.hs new file mode 100644 index 0000000000..06f1b29d13 --- /dev/null +++ b/cardano-api/src/Cardano/Api/Consensus.hs @@ -0,0 +1,6 @@ +module Cardano.Api.Consensus + ( module Cardano.Api.ReexposeConsensus + ) +where + +import Cardano.Api.ReexposeConsensus From 4cd040464ec17e5e3a5973e13ab7a80f354a6856 Mon Sep 17 00:00:00 2001 From: Pablo Lamela Date: Wed, 30 Oct 2024 15:42:25 +0100 Subject: [PATCH 4/5] Reexport requirements from `ouroboros-consensus-cardano` by `cardano-cli` --- .../internal/Cardano/Api/ReexposeConsensus.hs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs b/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs index e42b388530..03b393785e 100644 --- a/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs +++ b/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs @@ -1,4 +1,17 @@ -module Cardano.Api.ReexposeConsensus (PraosProtocolSupportsNode, PraosProtocolSupportsNodeCrypto, getOpCertCounters) where +module Cardano.Api.ReexposeConsensus + ( ByronBlock + , GenTx (..) + , EraMismatch (..) + , PraosProtocolSupportsNode + , PraosProtocolSupportsNodeCrypto + , ShelleyGenesisStaking (..) + , byronIdTx + , getOpCertCounters + ) +where +import Ouroboros.Consensus.Byron.Ledger (ByronBlock, GenTx (..), byronIdTx) +import Ouroboros.Consensus.Cardano.Block (EraMismatch (..)) import Ouroboros.Consensus.Protocol.Praos.Common (PraosProtocolSupportsNode, PraosProtocolSupportsNodeCrypto, getOpCertCounters) +import Ouroboros.Consensus.Shelley.Node (ShelleyGenesisStaking (..)) From 5882afe2f8a4d1aefe917b9f849d0a746494113f Mon Sep 17 00:00:00 2001 From: Pablo Lamela Date: Wed, 30 Oct 2024 16:16:15 +0100 Subject: [PATCH 5/5] Reexport requirements from `ouroboros-consensus` by `cardano-cli` --- .../internal/Cardano/Api/ReexposeConsensus.hs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs b/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs index 03b393785e..8f4c281ab5 100644 --- a/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs +++ b/cardano-api/internal/Cardano/Api/ReexposeConsensus.hs @@ -1,17 +1,29 @@ module Cardano.Api.ReexposeConsensus ( ByronBlock + , ChainDepState , GenTx (..) , EraMismatch (..) + , PastHorizonException , PraosProtocolSupportsNode , PraosProtocolSupportsNodeCrypto , ShelleyGenesisStaking (..) , byronIdTx + , condense , getOpCertCounters + , interpreterToEpochInfo + , unsafeExtendSafeZone + , txId ) where import Ouroboros.Consensus.Byron.Ledger (ByronBlock, GenTx (..), byronIdTx) import Ouroboros.Consensus.Cardano.Block (EraMismatch (..)) +import Ouroboros.Consensus.HardFork.History.EpochInfo (interpreterToEpochInfo) +import Ouroboros.Consensus.HardFork.History.Qry (PastHorizonException, + unsafeExtendSafeZone) +import Ouroboros.Consensus.Ledger.SupportsMempool (txId) +import Ouroboros.Consensus.Protocol.Abstract (ChainDepState) import Ouroboros.Consensus.Protocol.Praos.Common (PraosProtocolSupportsNode, PraosProtocolSupportsNodeCrypto, getOpCertCounters) import Ouroboros.Consensus.Shelley.Node (ShelleyGenesisStaking (..)) +import Ouroboros.Consensus.Util.Condense (condense)