Update QueryInShelleyBasedEra era result

- QueryAccountState returns `ChainAccountState` instead of
  `AccountState`
- Use updated consensus queries `GetStakeDistribution2` and  `GetPoolDistr2`

cardano-api/src/Cardano/Api/Block.hs

@@ -72,7 +72,6 @@ import Ouroboros.Consensus.Byron.Ledger qualified as Consensus
 import Ouroboros.Consensus.Cardano.Block qualified as Consensus
 import Ouroboros.Consensus.HardFork.Combinator qualified as Consensus
 import Ouroboros.Consensus.Shelley.Ledger qualified as Consensus
-import Ouroboros.Consensus.Shelley.Protocol.Abstract qualified as Consensus
 import Ouroboros.Network.Block qualified as Consensus
 
 import Data.Aeson (FromJSON (..), ToJSON (..), Value (..), object, withObject, (.:), (.=))
@@ -153,6 +152,12 @@ instance Show (Block era) where
       ( showString "ShelleyBlock ShelleyBasedEraConway "
           . showsPrec 11 block
       )
+  showsPrec p (ShelleyBlock ShelleyBasedEraDijkstra block) =
+    showParen
+      (p >= 11)
+      ( showString "ShelleyBlock ShelleyBasedEraDijkstra "
+          . showsPrec 11 block
+      )
 
 getBlockTxs :: forall era. Block era -> [Tx era]
 getBlockTxs = \case
@@ -167,7 +172,6 @@ getShelleyBlockTxs
   :: forall era ledgerera blockheader
    . ShelleyLedgerEra era ~ ledgerera
   => Consensus.ShelleyCompatible (ConsensusProtocol era) ledgerera
-  => Consensus.ShelleyProtocolHeader (ConsensusProtocol era) ~ blockheader
   => ShelleyBasedEra era
   -> Ledger.Block blockheader ledgerera
   -> [Tx era]
@@ -203,6 +207,7 @@ fromConsensusBlock = \case
   Consensus.BlockAlonzo b' -> BlockInMode cardanoEra $ ShelleyBlock ShelleyBasedEraAlonzo b'
   Consensus.BlockBabbage b' -> BlockInMode cardanoEra $ ShelleyBlock ShelleyBasedEraBabbage b'
   Consensus.BlockConway b' -> BlockInMode cardanoEra $ ShelleyBlock ShelleyBasedEraConway b'
+  Consensus.BlockDijkstra b' -> BlockInMode cardanoEra $ ShelleyBlock ShelleyBasedEraDijkstra b'
 
 toConsensusBlock
   :: ()
@@ -217,6 +222,7 @@ toConsensusBlock = \case
   BlockInMode _ (ShelleyBlock ShelleyBasedEraAlonzo b') -> Consensus.BlockAlonzo b'
   BlockInMode _ (ShelleyBlock ShelleyBasedEraBabbage b') -> Consensus.BlockBabbage b'
   BlockInMode _ (ShelleyBlock ShelleyBasedEraConway b') -> Consensus.BlockConway b'
+  BlockInMode _ (ShelleyBlock ShelleyBasedEraDijkstra b') -> Consensus.BlockDijkstra b'
 
 -- ----------------------------------------------------------------------------
 -- Block headers

cardano-api/src/Cardano/Api/Query/Internal/Type/QueryInMode.hs

@@ -72,6 +72,7 @@ import Cardano.Api.Certificate.Internal
 import Cardano.Api.Consensus.Internal.Mode
 import Cardano.Api.Era.Internal.Case
 import Cardano.Api.Era.Internal.Core
+import Cardano.Api.Era.Internal.Eon.ConwayEraOnwards
 import Cardano.Api.Era.Internal.Eon.ShelleyBasedEra
 import Cardano.Api.Genesis.Internal.Parameters
 import Cardano.Api.HasTypeProxy (HasTypeProxy (..), Proxy)
@@ -93,12 +94,11 @@ import Cardano.Ledger.Api qualified as L
 import Cardano.Ledger.Api.State.Query qualified as L
 import Cardano.Ledger.Binary
 import Cardano.Ledger.Binary.Plain qualified as Plain
-import Cardano.Ledger.CertState qualified as L
 import Cardano.Ledger.Coin qualified as L
+import Cardano.Ledger.Conway.State qualified as L
 import Cardano.Ledger.Credential qualified as Shelley
 import Cardano.Ledger.Shelley.API qualified as Shelley
 import Cardano.Ledger.Shelley.Core qualified as Core
-import Cardano.Ledger.Shelley.LedgerState qualified as L
 import Cardano.Slotting.EpochInfo (hoistEpochInfo)
 import Cardano.Slotting.Slot (WithOrigin (..))
 import Cardano.Slotting.Time (SystemStart (..))
@@ -116,9 +116,8 @@ import Ouroboros.Consensus.Ledger.Query qualified as Consensus
 import Ouroboros.Consensus.Protocol.Abstract qualified as Consensus
 import Ouroboros.Consensus.Shelley.Ledger qualified as Consensus
 import Ouroboros.Consensus.Shelley.Ledger.Query.Types qualified as Consensus
-import Ouroboros.Consensus.Shelley.Protocol.Abstract (ProtoCrypto)
 import Ouroboros.Network.Block (Serialised (..))
-import Ouroboros.Network.PeerSelection.LedgerPeers.Type (LedgerPeerSnapshot)
+import Ouroboros.Network.PeerSelection.LedgerPeers.Type
 import Ouroboros.Network.Protocol.LocalStateQuery.Client (Some (..))
 
 import Codec.Serialise qualified as CBOR
@@ -286,7 +285,7 @@ data QueryInShelleyBasedEra era result where
     :: Set StakeCredential
     -> QueryInShelleyBasedEra era (Map StakeCredential L.Coin)
   QueryAccountState
-    :: QueryInShelleyBasedEra era L.AccountState
+    :: QueryInShelleyBasedEra era L.ChainAccountState
   QueryConstitution
     :: QueryInShelleyBasedEra era (L.Constitution (ShelleyLedgerEra era))
   QueryGovState
@@ -406,7 +405,7 @@ decodePoolState (SerialisedPoolState (Serialised ls)) =
 
 newtype SerialisedPoolDistribution era
   = SerialisedPoolDistribution
-      (Serialised (Consensus.PoolDistr StandardCrypto))
+      (Serialised Shelley.PoolDistr)
 
 newtype PoolDistribution era = PoolDistribution
   { unPoolDistr :: Consensus.PoolDistr StandardCrypto
@@ -477,15 +476,15 @@ fromLedgerUTxO sbe (Shelley.UTxO utxo) =
     $ utxo
 
 fromShelleyPoolDistr
-  :: Consensus.PoolDistr StandardCrypto
+  :: Shelley.PoolDistr
   -> Map (Hash StakePoolKey) Rational
 fromShelleyPoolDistr =
   -- TODO: write an appropriate property to show it is safe to use
   -- Map.fromListAsc or to use Map.mapKeysMonotonic
   fromList
-    . map (bimap StakePoolKeyHash Consensus.individualPoolStake)
+    . map (bimap StakePoolKeyHash Shelley.individualPoolStake)
     . toList
-    . Consensus.unPoolDistr
+    . Shelley.unPoolDistr
 
 fromShelleyDelegations
   :: Map
@@ -564,7 +563,7 @@ toConsensusQueryShelleyBased sbe = \case
   QueryProtocolParameters ->
     Some (consensusQueryInEraInMode era Consensus.GetCurrentPParams)
   QueryStakeDistribution ->
-    Some (consensusQueryInEraInMode era Consensus.GetStakeDistribution)
+    Some (consensusQueryInEraInMode era Consensus.GetStakeDistribution2)
   QueryUTxO QueryUTxOWhole ->
     Some (consensusQueryInEraInMode era Consensus.GetUTxOWhole)
   QueryUTxO (QueryUTxOByAddress addrs) ->
@@ -613,7 +612,7 @@ toConsensusQueryShelleyBased sbe = \case
       )
   QueryPoolDistribution poolIds ->
     Some
-      (consensusQueryInEraInMode era (Consensus.GetCBOR (Consensus.GetPoolDistr (getPoolIds <$> poolIds))))
+      (consensusQueryInEraInMode era (Consensus.GetCBOR (Consensus.GetPoolDistr2 (getPoolIds <$> poolIds))))
    where
     getPoolIds :: Set PoolId -> Set (Shelley.KeyHash Shelley.StakePool)
     getPoolIds = Set.map (\(StakePoolKeyHash kh) -> kh)
@@ -640,7 +639,9 @@ toConsensusQueryShelleyBased sbe = \case
   QueryDRepState creds ->
     caseShelleyToBabbageOrConwayEraOnwards
       (const $ error "toConsensusQueryShelleyBased: QueryDRepState is only available in the Conway era")
-      (const $ Some (consensusQueryInEraInMode era (Consensus.GetDRepState creds)))
+      ( \w ->
+          Some (consensusQueryInEraInMode era (conwayEraOnwardsConstraints w $ Consensus.GetDRepState creds))
+      )
       sbe
   QueryDRepStakeDistr dreps ->
     caseShelleyToBabbageOrConwayEraOnwards
@@ -727,6 +728,7 @@ consensusQueryInEraInMode erainmode b =
       AlonzoEra -> Consensus.QueryIfCurrentAlonzo b
       BabbageEra -> Consensus.QueryIfCurrentBabbage b
       ConwayEra -> Consensus.QueryIfCurrentConway b
+      DijkstraEra -> Consensus.QueryIfCurrentDijkstra b
 
 -- ----------------------------------------------------------------------------
 -- Conversions of query results from the consensus types.
@@ -849,6 +851,18 @@ fromConsensusQueryResult (QueryInEra (QueryInShelleyBasedEra ShelleyBasedEraConw
         )
         r'
     _ -> fromConsensusQueryResultMismatch
+fromConsensusQueryResult (QueryInEra (QueryInShelleyBasedEra ShelleyBasedEraDijkstra q)) q' r' =
+  case q' of
+    Consensus.BlockQuery (Consensus.QueryIfCurrentDijkstra q'') ->
+      bimap
+        fromConsensusEraMismatch
+        ( fromConsensusQueryResultShelleyBased
+            ShelleyBasedEraDijkstra
+            q
+            q''
+        )
+        r'
+    _ -> fromConsensusQueryResultMismatch
 
 -- This function is written like this so that we have exhaustive pattern checking
 -- on the @QueryInShelleyBasedEra era result@ value. Don't change the top-level
@@ -858,7 +872,6 @@ fromConsensusQueryResultShelleyBased
    . HasCallStack
   => ShelleyLedgerEra era ~ ledgerera
   => ConsensusProtocol era ~ protocol
-  => ProtoCrypto protocol ~ StandardCrypto
   => ShelleyBasedEra era
   -> QueryInShelleyBasedEra era result
   -> Consensus.BlockQuery (Consensus.ShelleyBlock protocol ledgerera) fp result'
@@ -884,7 +897,7 @@ fromConsensusQueryResultShelleyBased sbe sbeQuery q' r' =
         _ -> fromConsensusQueryResultMismatch
     QueryStakeDistribution ->
       case q' of
-        Consensus.GetStakeDistribution -> fromShelleyPoolDistr r'
+        Consensus.GetStakeDistribution2 -> fromShelleyPoolDistr r'
         _ -> fromConsensusQueryResultMismatch
     QueryUTxO QueryUTxOWhole ->
       case q' of
@@ -939,7 +952,7 @@ fromConsensusQueryResultShelleyBased sbe sbeQuery q' r' =
         _ -> fromConsensusQueryResultMismatch
     QueryPoolDistribution{} ->
       case q' of
-        Consensus.GetCBOR Consensus.GetPoolDistr{} ->
+        Consensus.GetCBOR Consensus.GetPoolDistr2{} ->
           SerialisedPoolDistribution r'
         _ -> fromConsensusQueryResultMismatch
     QueryStakeSnapshot{} ->