From 24b74685768fec375468a3b6892ee64884bb5b98 Mon Sep 17 00:00:00 2001
From: Jordan Millar <jordan.millar@iohk.io>
Date: Wed, 12 Jan 2022 10:38:42 -0400
Subject: [PATCH] Update leadership-schedule command accordingly

---
 .../src/Cardano/CLI/Shelley/Run/Query.hs      | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
index da74eb2e5f8..371b8a9ee1a 100644
--- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
+++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
@@ -902,23 +902,34 @@ runQueryLeadershipSchedule (AnyConsensusModeParams cModeParams) network
           & hoistMaybe (ShelleyQueryCmdEraConsensusModeMismatch (AnyConsensusMode cMode) anyE)
 
       let pparamsQuery = QueryInEra eInMode $ QueryInShelleyBasedEra sbe QueryProtocolParameters
-          serDebugLedgerStateQuery = QueryInEra eInMode . QueryInShelleyBasedEra sbe $ QueryDebugLedgerState
           ptclStateQuery = QueryInEra eInMode . QueryInShelleyBasedEra sbe $ QueryProtocolState
           eraHistoryQuery = QueryEraHistory CardanoModeIsMultiEra
 
       pparams <- executeQuery era cModeParams localNodeConnInfo pparamsQuery
-      serDebugLedState <- executeQuery era cModeParams localNodeConnInfo serDebugLedgerStateQuery
       ptclState <- executeQuery era cModeParams localNodeConnInfo ptclStateQuery
       eraHistory <- firstExceptT ShelleyQueryCmdAcquireFailure . newExceptT $ queryNodeLocalState localNodeConnInfo Nothing eraHistoryQuery
       let eInfo = toEpochInfo eraHistory
 
       schedule :: Set SlotNo
         <- case whichSchedule of
-             CurrentEpoch ->
+             CurrentEpoch -> do
+               let currentEpochStateQuery = QueryInEra eInMode $ QueryInShelleyBasedEra sbe QueryCurrentEpochState
+                   currentEpochQuery = QueryInEra eInMode $ QueryInShelleyBasedEra sbe QueryEpoch
+               serCurrentEpochState <- executeQuery era cModeParams localNodeConnInfo currentEpochStateQuery
+               curentEpoch <- executeQuery era cModeParams localNodeConnInfo currentEpochQuery
+
                firstExceptT ShelleyQueryCmdLeaderShipError $ hoistEither
                  $ eligibleLeaderSlotsConstaints sbe
-                 $ currentEpochEligibleLeadershipSlots sbe shelleyGenesis eInfo
-                                           pparams serDebugLedState ptclState poolid vrkSkey
+                 $ currentEpochEligibleLeadershipSlots
+                     sbe
+                     shelleyGenesis
+                     eInfo
+                     pparams
+                     ptclState
+                     poolid
+                     vrkSkey
+                     serCurrentEpochState
+                     curentEpoch
 
              NextEpoch -> do
                let currentEpochStateQuery = QueryInEra eInMode $ QueryInShelleyBasedEra sbe QueryCurrentEpochState
@@ -932,7 +943,7 @@ runQueryLeadershipSchedule (AnyConsensusModeParams cModeParams) network
                  $ eligibleLeaderSlotsConstaints sbe
                  $ nextEpochEligibleLeadershipSlots sbe shelleyGenesis
                      serCurrentEpochState ptclState poolid vrkSkey pparams
-                     (tip, curentEpoch)
+                     eInfo (tip, curentEpoch)
 
       liftIO $ printLeadershipSchedule schedule eInfo (SystemStart $ sgSystemStart shelleyGenesis)
     mode -> left . ShelleyQueryCmdUnsupportedMode $ AnyConsensusMode mode