Merge #4199

4199: Expose AcquireFailure and SystemStart from Cardano.Api.Shelley r=Jimbo4350 a=Jimbo4350 Co-authored-by: Jordan Millar <jordan.millar@iohk.io>
IntersectMBO · Jul 20, 2022 · 621311f · 621311f
2 parents d04af00 + 227fb14
commit 621311f
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 48 deletions.
diff --git a/cardano-api/src/Cardano/Api/Shelley.hs b/cardano-api/src/Cardano/Api/Shelley.hs
@@ -211,6 +211,9 @@ module Cardano.Api.Shelley
     SerialisedPoolState(..),
     decodePoolState,
     UTxO(..),
+    AcquireFailure(..),
+    SystemStart(..),
+
 
     -- ** Various calculations
     LeadershipError(..),
@@ -232,8 +235,8 @@ import           Cardano.Api.Address
 import           Cardano.Api.Block
 import           Cardano.Api.Certificate
 import           Cardano.Api.Eras
-import           Cardano.Api.InMode
 import           Cardano.Api.IPC
+import           Cardano.Api.InMode
 import           Cardano.Api.KeysByron
 import           Cardano.Api.KeysPraos
 import           Cardano.Api.KeysShelley

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs b/cardano-cli/src/Cardano/CLI/Shelley/Commands.hs
@@ -51,8 +51,6 @@ import           Cardano.Api.Shelley
 
 import           Data.Text (Text)
 
-import           Ouroboros.Consensus.BlockchainTime (SystemStart (..))
-
 import           Cardano.CLI.Shelley.Key (PaymentVerifier, StakeVerifier, VerificationKeyOrFile,
                    VerificationKeyOrHashOrFile, VerificationKeyTextOrFile)
 import           Cardano.CLI.Types

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Output.hs b/cardano-cli/src/Cardano/CLI/Shelley/Output.hs
@@ -15,7 +15,6 @@ import           Prelude
 
 import           Cardano.Api
 import           Cardano.Api.Shelley
-import           Cardano.Slotting.Time (SystemStart (..))
 import           Data.Aeson
 import qualified Data.Aeson.Key as Aeson
 import qualified Data.List as List

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
@@ -44,7 +44,6 @@ import qualified Text.Parsec.Token as Parsec
 
 import qualified Cardano.Ledger.BaseTypes as Shelley
 import qualified Cardano.Ledger.Shelley.TxBody as Shelley
-import           Ouroboros.Consensus.BlockchainTime (SystemStart (..))
 
 import           Cardano.Api
 import           Cardano.Api.Shelley

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs
@@ -23,7 +23,7 @@ module Cardano.CLI.Shelley.Run.Genesis
   ) where
 
 import           Cardano.Prelude hiding (unlines)
-import           Prelude (id, unlines, zip3, error)
+import           Prelude (error, id, unlines, zip3)
 
 import           Data.Aeson hiding (Key)
 import qualified Data.Aeson as Aeson
@@ -42,14 +42,15 @@ import qualified Data.Sequence.Strict as Seq
 import           Data.String (fromString)
 import qualified Data.Text as Text
 import qualified Data.Text.IO as Text
-import           Data.Time.Clock (NominalDiffTime, UTCTime, addUTCTime, getCurrentTime, secondsToNominalDiffTime)
+import           Data.Time.Clock (NominalDiffTime, UTCTime, addUTCTime, getCurrentTime,
+                   secondsToNominalDiffTime)
 
-import           Cardano.Binary (ToCBOR (..), Annotated(Annotated))
+import           Cardano.Binary (Annotated (Annotated), ToCBOR (..))
 
+import qualified Cardano.Crypto as CC
 import           Cardano.Crypto.Hash (HashAlgorithm)
 import qualified Cardano.Crypto.Hash as Hash
 import qualified Cardano.Crypto.Random as Crypto
-import qualified Cardano.Crypto as CC
 import           Crypto.Random as Crypto
 
 import           System.Directory (createDirectoryIfMissing, listDirectory)
@@ -62,10 +63,10 @@ import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT
 import qualified Cardano.Crypto.Hash as Crypto
 
 import           Cardano.Api
-import           Cardano.Api.Byron (toByronRequiresNetworkMagic, toByronProtocolMagicId, toByronLovelace)
+import           Cardano.Api.Byron (toByronLovelace, toByronProtocolMagicId,
+                   toByronRequiresNetworkMagic)
 import           Cardano.Api.Shelley
 
-import           Ouroboros.Consensus.BlockchainTime (SystemStart (..))
 import           Ouroboros.Consensus.Shelley.Eras (StandardShelley)
 import           Ouroboros.Consensus.Shelley.Node (ShelleyGenesisStaking (..))
 
@@ -92,29 +93,30 @@ import           Cardano.CLI.Shelley.Run.StakeAddress (ShelleyStakeAddressCmdErr
 import           Cardano.CLI.Types
 
 import           Cardano.CLI.Byron.Delegation
+import           Cardano.CLI.Byron.Genesis as Byron
 import qualified Cardano.CLI.Byron.Key as Byron
+import qualified Cardano.Chain.Common as Byron (KeyHash, mkKnownLovelace, rationalToLovelacePortion)
+import           Cardano.Chain.Genesis (FakeAvvmOptions (..), TestnetBalanceOptions (..),
+                   gdProtocolParameters, gsDlgIssuersSecrets, gsPoorSecrets, gsRichSecrets)
 import qualified Cardano.Crypto.Signing as Byron
-import           Cardano.CLI.Byron.Genesis as Byron
-import           Cardano.Chain.Genesis (FakeAvvmOptions (..), TestnetBalanceOptions (..), gsDlgIssuersSecrets, gsRichSecrets, gsPoorSecrets, gdProtocolParameters)
-import qualified Cardano.Chain.Common as Byron (rationalToLovelacePortion, mkKnownLovelace, KeyHash)
 
-import           Cardano.Chain.Common (BlockCount(unBlockCount))
-import qualified Cardano.Chain.Genesis as Genesis
-import           Cardano.Chain.Delegation (delegateVK)
 import           Cardano.Api.SerialiseTextEnvelope (textEnvelopeToJSON)
+import           Cardano.Chain.Common (BlockCount (unBlockCount))
+import           Cardano.Chain.Delegation (delegateVK)
 import qualified Cardano.Chain.Delegation as Dlg
-import           Cardano.Slotting.Slot (EpochSize(EpochSize))
+import qualified Cardano.Chain.Genesis as Genesis
 import           Cardano.Chain.Update
-import           Data.Fixed (Fixed(MkFixed))
+import           Cardano.Slotting.Slot (EpochSize (EpochSize))
+import           Data.Fixed (Fixed (MkFixed))
 import qualified Data.Yaml as Yaml
 import           Text.JSON.Canonical (parseCanonicalJSON, renderCanonicalJSON)
 
-import           Data.ListMap (ListMap(..))
+import           Data.ListMap (ListMap (..))
 
 import qualified Cardano.CLI.IO.Lazy as Lazy
 
+import           System.Random (StdGen)
 import qualified System.Random as Random
-import System.Random (StdGen)
 
 data ShelleyGenesisCmdError
   = ShelleyGenesisCmdAesonDecodeError !FilePath !Text
@@ -917,7 +919,7 @@ writeBulkPoolCredentials dir bulkIx poolIxs = do
        Aeson.eitherDecodeStrict' content
 
 -- | This function should only be used for testing purposes.
--- Keys returned by this function are not cryptographically secure.  
+-- Keys returned by this function are not cryptographically secure.
 computeInsecureDelegation
   :: StdGen
   -> NetworkId

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
@@ -19,6 +19,7 @@ module Cardano.CLI.Shelley.Run.Query
   , renderShelleyQueryCmdError
   , renderLocalStateQueryError
   , runQueryCmd
+  , determineEra
   , mergeDelegsAndRewards
   , percentage
   , executeQuery
@@ -32,6 +33,30 @@ import qualified Cardano.Api as Api
 import           Cardano.Api.Byron
 import           Cardano.Api.Orphans ()
 import           Cardano.Api.Shelley
+
+import           Control.Monad.Trans.Except (except)
+import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither,
+                   hoistMaybe, left, newExceptT)
+import           Data.Aeson.Encode.Pretty (encodePretty)
+import           Data.Aeson.Types as Aeson
+import qualified Data.ByteString.Lazy.Char8 as LBS
+import           Data.Coerce (coerce)
+import           Data.List (nub)
+import qualified Data.Map.Strict as Map
+import qualified Data.Set as Set
+import           Data.Sharing (Interns, Share)
+import qualified Data.Text as Text
+import qualified Data.Text.Encoding as Text
+import qualified Data.Text.IO as T
+import qualified Data.Text.IO as Text
+import           Data.Text.Lazy.Builder (toLazyText)
+import           Data.Time.Clock
+import qualified Data.VMap as VMap
+import qualified Data.Vector as Vector
+import           Formatting.Buildable (build)
+import           Numeric (showEFloat)
+import           Text.Printf (printf)
+
 import           Cardano.Binary (DecoderError)
 import           Cardano.CLI.Environment (EnvSocketError, readEnvSocketPath, renderEnvSocketError)
 import           Cardano.CLI.Helpers (HelpersError (..), hushM, pPrintCBOR, renderHelpersError)
@@ -64,36 +89,13 @@ import qualified Cardano.Ledger.Shelley.LedgerState as SL
 import qualified Cardano.Ledger.Shelley.PParams as Shelley
 import           Cardano.Ledger.Shelley.Scripts ()
 import           Cardano.Slotting.EpochInfo (EpochInfo (..), epochInfoSlotToUTCTime, hoistEpochInfo)
-import           Control.Monad.Trans.Except (except)
-import           Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither,
-                   hoistMaybe, left, newExceptT)
-import           Data.Aeson.Encode.Pretty (encodePretty)
-import           Data.Aeson.Types as Aeson
-import           Data.Coerce (coerce)
-import           Data.List (nub)
-import           Data.Sharing (Interns, Share)
-import           Data.Text.Lazy.Builder (toLazyText)
-import           Data.Time.Clock
 
 import           Ouroboros.Consensus.BlockchainTime.WallClock.Types (RelativeTime (..),
-                   SystemStart (..), toRelativeTime)
+                   toRelativeTime)
 import           Ouroboros.Consensus.Cardano.Block as Consensus (EraMismatch (..))
 import           Ouroboros.Consensus.Protocol.TPraos
 import           Ouroboros.Network.Block (Serialised (..))
-import           Ouroboros.Network.Protocol.LocalStateQuery.Type (AcquireFailure (..))
-import           Text.Printf (printf)
 
-import qualified Data.ByteString.Lazy.Char8 as LBS
-import qualified Data.Map.Strict as Map
-import qualified Data.Set as Set
-import qualified Data.Text as Text
-import qualified Data.Text.Encoding as Text
-import qualified Data.Text.IO as T
-import qualified Data.Text.IO as Text
-import qualified Data.Vector as Vector
-import qualified Data.VMap as VMap
-import           Formatting.Buildable (build)
-import           Numeric (showEFloat)
 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

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
@@ -9,9 +9,10 @@
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
 module Cardano.CLI.Shelley.Run.Transaction
-  ( ShelleyTxCmdError
+  ( ShelleyTxCmdError(..)
   , renderShelleyTxCmdError
   , runTransactionCmd
+  , readFileTx
   ) where
 
 import           Cardano.Prelude hiding (All, Any)
@@ -60,7 +61,6 @@ import           Ouroboros.Consensus.Cardano.Block (EraMismatch (..))
 import           Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr)
 import qualified Ouroboros.Consensus.Protocol.TPraos as TPraos
 import           Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock)
-import           Ouroboros.Network.Protocol.LocalStateQuery.Type (AcquireFailure (..))
 import qualified Ouroboros.Network.Protocol.LocalTxSubmission.Client as Net.Tx
 
 import qualified System.IO as IO