Include newest api changes

IntersectMBO · Aug 22, 2023 · 1ee1a2e · 1ee1a2e
1 parent 763b3e5
commit 1ee1a2e
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 14 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -137,7 +137,7 @@ library
                       , binary
                       , bytestring
                       , canonical-json
-                      , cardano-api ^>= 8.14
+                      , cardano-api ^>= 8.15
                       , cardano-binary
                       , cardano-crypto
                       , cardano-crypto-class ^>= 2.1.2
@@ -224,8 +224,8 @@ test-suite cardano-cli-test
                       , base16-bytestring
                       , bech32 >= 1.1.0
                       , bytestring
-                      , cardano-api:{cardano-api, internal} ^>= 8.14
-                      , cardano-api-gen ^>= 8.1.1.0
+                      , cardano-api:{cardano-api, internal} ^>= 8.15
+                      , cardano-api-gen ^>= 8.2.0.0
                       , cardano-cli
                       , cardano-cli:cardano-cli-test-lib
                       , cardano-slotting ^>= 0.1
@@ -268,7 +268,7 @@ test-suite cardano-cli-golden
   build-depends:        aeson >= 1.5.6.0
                       , base16-bytestring
                       , bytestring
-                      , cardano-api:{cardano-api, gen} ^>= 8.14
+                      , cardano-api:{cardano-api, gen} ^>= 8.15
                       , cardano-binary
                       , cardano-cli
                       , cardano-cli:cardano-cli-test-lib

diff --git a/cardano-cli/src/Cardano/CLI/Commands/Governance.hs b/cardano-cli/src/Cardano/CLI/Commands/Governance.hs
@@ -4,9 +4,9 @@
 
 module Cardano.CLI.Commands.Governance where
 
-import           Cardano.Api
+import           Cardano.Api hiding (Constitution)
 import qualified Cardano.Api.Ledger as Ledger
-import           Cardano.Api.Shelley
+import           Cardano.Api.Shelley hiding (Constitution)
 
 import           Cardano.Binary (DecoderError)
 import           Cardano.CLI.Legacy.Run.StakeAddress
@@ -15,6 +15,7 @@ import           Cardano.CLI.Types.Common
 import           Cardano.CLI.Types.Governance
 import           Cardano.CLI.Types.Key
 import           Cardano.Prelude (intercalate, toS)
+import           Ouroboros.Consensus.Cardano.Block (EraMismatch)
 
 import           Control.Monad.IO.Class
 import           Control.Monad.Trans.Except (ExceptT)
@@ -60,6 +61,10 @@ data GovernanceCmdError
   | GovernanceCmdDecoderError !DecoderError
   | GovernanceCmdVerifyPollError !GovernancePollError
   | GovernanceCmdWriteFileError !(FileError ())
+  | GovernanceCmdAcqireFailureError !AcquiringFailure
+  | GovernanceCmdEraConsensusModeMismatch !AnyConsensusMode !AnyCardanoEra
+  | GovernanceCmdUnsupportedNtcVersion !UnsupportedNtcVersionError
+  | GovernanceCmdEraMismatch !EraMismatch
   -- Legacy - remove me after cardano-cli transitions to new era based structure
   | GovernanceCmdMIRCertNotSupportedInConway
   | GovernanceCmdGenesisDelegationNotSupportedInConway

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs
@@ -13,9 +13,9 @@ module Cardano.CLI.EraBased.Commands.Governance.Actions
   , renderGovernanceActionCmds
   ) where
 
-import           Cardano.Api
+import           Cardano.Api hiding (Constitution)
 import qualified Cardano.Api.Ledger as Ledger
-import           Cardano.Api.Shelley
+import           Cardano.Api.Shelley hiding (Constitution)
 
 import           Cardano.CLI.Types.Common (Constitution, VerificationKeyFile)
 import           Cardano.CLI.Types.Key

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -11,9 +11,9 @@
 
 module Cardano.CLI.EraBased.Options.Common where
 
-import           Cardano.Api
+import           Cardano.Api hiding (Constitution)
 import qualified Cardano.Api.Ledger as Ledger
-import           Cardano.Api.Shelley
+import           Cardano.Api.Shelley hiding (Constitution)
 
 import           Cardano.CLI.Environment (EnvCli (..), envCliAnyShelleyBasedEra,
                    envCliAnyShelleyToBabbageEra)

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs
@@ -1,4 +1,9 @@
+{-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE GADTs #-}
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.CLI.EraBased.Run.Governance
   ( runGovernanceMIRCertificatePayStakeAddrs
@@ -15,10 +20,12 @@ import           Cardano.CLI.Types.Common
 import qualified Cardano.Ledger.Shelley.TxBody as Shelley
 
 import           Control.Monad
-
 import           Control.Monad.IO.Class (liftIO)
 import           Control.Monad.Trans.Except (ExceptT)
 import           Control.Monad.Trans.Except.Extra
+import           Data.Aeson.Encode.Pretty (encodePretty)
+import qualified Data.ByteString.Lazy.Char8 as LBS
+import           Data.Function
 import qualified Data.Map.Strict as Map
 
 runGovernanceMIRCertificatePayStakeAddrs
@@ -91,3 +98,31 @@ runGovernanceDRepKeyGen _w vkeyPath skeyPath = firstExceptT GovernanceCmdWriteFi
     skeyDesc = "Delegate Representative Signing Key"
     vkeyDesc :: TextEnvelopeDescr
     vkeyDesc = "Delegate Representative Verification Key"
+
+runGovernanceQueryGovState
+  :: ConwayEraOnwards era
+  -> SocketPath
+  -> AnyConsensusModeParams
+  -> NetworkId
+  -> Maybe (File () Out)
+  -> ExceptT GovernanceCmdError IO ()
+runGovernanceQueryGovState w socketPath (AnyConsensusModeParams cModeParams) network mFile = conwayEraOnwardsConstraints w $ do
+  let localNodeConnInfo = LocalNodeConnectInfo cModeParams network socketPath
+      sbe = conwayEraOnwardsToShelleyBasedEra w
+      cEra = conwayEraOnwardsToCardanoEra w
+      cMode = consensusModeOnly cModeParams
+
+  eraInMode <- toEraInMode cEra cMode
+    & hoistMaybe (GovernanceCmdEraConsensusModeMismatch (AnyConsensusMode cMode) (AnyCardanoEra cEra))
+
+  govState <- firstExceptT GovernanceCmdAcqireFailureError
+    ( newExceptT $ executeLocalStateQueryExpr localNodeConnInfo Nothing $ queryGovState eraInMode sbe)
+      & onLeft (left . GovernanceCmdUnsupportedNtcVersion)
+      & onLeft (left . GovernanceCmdEraMismatch)
+  let serializedGovState = encodePretty govState
+
+  case mFile of
+    Nothing -> liftIO $ LBS.putStrLn serializedGovState
+    Just (File f) ->
+      handleIOExceptT (WriteFileError . FileIOError f) $
+        LBS.writeFile f serializedGovState
diff --git a/cardano-cli/src/Cardano/CLI/Types/Common.hs b/cardano-cli/src/Cardano/CLI/Types/Common.hs
@@ -69,7 +69,7 @@ module Cardano.CLI.Types.Common
   , WitnessSigningData(..)
   ) where
 
-import           Cardano.Api
+import           Cardano.Api hiding (Constitution)
 import qualified Cardano.Api.Ledger as Ledger
 
 import qualified Cardano.Chain.Slotting as Byron

diff --git a/cardano-cli/src/Cardano/CLI/Types/Governance.hs b/cardano-cli/src/Cardano/CLI/Types/Governance.hs
@@ -3,9 +3,9 @@
 
 module Cardano.CLI.Types.Governance where
 
-import           Cardano.Api
+import           Cardano.Api hiding (Constitution)
 import qualified Cardano.Api.Ledger as Ledger
-import           Cardano.Api.Shelley
+import           Cardano.Api.Shelley hiding (Constitution)
 
 import           Cardano.CLI.Types.Common
 import           Cardano.CLI.Types.Key (VerificationKeyOrFile, VerificationKeyOrHashOrFile)