Use the new queryPoolState from ledger

Author: aniketd

cabal.project

@@ -59,8 +59,8 @@ allow-newer:
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-ledger
-  tag: 640fb66d27ac202764de0dda76621c6d57852ba9
-  --sha256: sha256-2vOUUvY19Emx5UpHNHZnIaWoqI5g3kPgjFQJGm9mVmk=
+  tag: f6f9e8927cbf3c9d604ca35814d533a0378034dc
+  --sha256: sha256-LMFLIGXus4NyOcJnZ60rwNgwDLdeXdblVUkjGbpn74c=
   subdir:
     eras/allegra/impl
     eras/alonzo/impl

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/PeerSelection.hs

@@ -7,6 +7,7 @@
 
 module Ouroboros.Consensus.Shelley.Ledger.PeerSelection () where
 
+import qualified Cardano.Ledger.Api.State.Query as SL
 import Cardano.Ledger.BaseTypes
 import qualified Cardano.Ledger.Keys as SL
 import qualified Cardano.Ledger.Shelley.API as SL
@@ -52,12 +53,13 @@ instance SL.EraCertState era => LedgerSupportsPeerSelection (ShelleyBlock proto
     (futurePoolParams, poolParams) =
       (SL.psFutureStakePoolParams pstate, SL.psStakePoolParams pstate)
      where
-      pstate :: SL.PState era
+      pstate :: SL.PState'
       pstate =
-        view SL.certPStateL
-          . SL.lsCertState
-          . SL.esLState
-          . SL.nesEs
+        SL.mkPState' id
+          $ view SL.certPStateL
+            . SL.lsCertState
+            . SL.esLState
+            . SL.nesEs
           $ shelleyLedgerState
 
     relayToLedgerRelayAccessPoint :: SL.StakePoolRelay -> Maybe LedgerRelayAccessPoint

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/Query.hs

@@ -243,7 +243,7 @@ data instance BlockQuery (ShelleyBlock proto era) fp result where
     BlockQuery
       (ShelleyBlock proto era)
       QFNoTables
-      (SL.PState era)
+      SL.PState'
   GetStakeSnapshots ::
     Maybe (Set (SL.KeyHash 'SL.StakePool)) ->
     BlockQuery
@@ -425,22 +425,11 @@ instance
       GetStakePools ->
         SL.getPools st
       GetStakePoolParams poolids ->
-        SL.getPoolParameters st poolids
+        SL.psStakePoolParams $ SL.queryPoolState st $ Just poolids
       GetRewardInfoPools ->
         SL.getRewardInfoPools globals st
       GetPoolState mPoolIds ->
-        let certPState = view SL.certPStateL . SL.lsCertState . SL.esLState . SL.nesEs $ st
-         in case mPoolIds of
-              Just poolIds ->
-                SL.PState
-                  { SL.psStakePoolParams =
-                      Map.restrictKeys (SL.psStakePoolParams certPState) poolIds
-                  , SL.psFutureStakePoolParams =
-                      Map.restrictKeys (SL.psFutureStakePoolParams certPState) poolIds
-                  , SL.psRetiring = Map.restrictKeys (SL.psRetiring certPState) poolIds
-                  , SL.psDeposits = Map.restrictKeys (SL.psDeposits certPState) poolIds
-                  }
-              Nothing -> certPState
+        SL.queryPoolState st mPoolIds
       GetStakeSnapshots mPoolIds ->
         let SL.SnapShots
               { SL.ssStakeMark