Propagate ChainAccountState

Author: Jimbo4350

cardano-api/src/Cardano/Api/Ledger/Internal/Reexport.hs

@@ -112,7 +112,7 @@ module Cardano.Api.Ledger.Internal.Reexport
   , toPlainDecoder
   -- Shelley
   , secondsToNominalDiffTimeMicro
-  , AccountState (..)
+  , AccountState
   , NewEpochState (..)
   , ShelleyGenesisStaking (..)
   -- Babbage
@@ -266,7 +266,6 @@ import Cardano.Ledger.Binary
   , toPlainDecoder
   )
 import Cardano.Ledger.Binary.Plain (Decoder, serializeAsHexText)
-import Cardano.Ledger.CertState (DRepState (..), csCommitteeCredsL)
 import Cardano.Ledger.Coin (Coin (..), addDeltaCoin, toDeltaCoin)
 import Cardano.Ledger.Conway.Core
   ( DRepVotingThresholds (..)
@@ -293,6 +292,7 @@ import Cardano.Ledger.Conway.Governance
   )
 import Cardano.Ledger.Conway.PParams (UpgradeConwayPParams (..))
 import Cardano.Ledger.Conway.Scripts (ConwayPlutusPurpose (..))
+import Cardano.Ledger.Conway.State (DRepState (..), csCommitteeCredsL)
 import Cardano.Ledger.Conway.TxCert
   ( ConwayDelegCert (..)
   , ConwayEraTxCert (..)
@@ -336,7 +336,7 @@ import Cardano.Ledger.Plutus.Data (Data (..), unData)
 import Cardano.Ledger.Plutus.Language (Language, Plutus, languageToText, plutusBinary)
 import Cardano.Ledger.PoolParams (PoolMetadata (..), PoolParams (..), StakePoolRelay (..))
 import Cardano.Ledger.Shelley.API
-  ( AccountState (..)
+  ( AccountState
   , GenDelegPair (..)
   , NewEpochState (..)
   , StakeReference (..)

cardano-api/src/Cardano/Api/Query/Internal/Convenience.hs

@@ -36,11 +36,10 @@ import Cardano.Api.Query.Internal.Type.QueryInMode
 import Cardano.Api.Tx.Internal.Body
 import Cardano.Api.UTxO (UTxO (..))
 
-import Cardano.Ledger.CertState (DRepState (..))
 import Cardano.Ledger.Coin qualified as L
+import Cardano.Ledger.Conway.State (ChainAccountState (..), DRepState (..))
 import Cardano.Ledger.Credential qualified as L
 import Cardano.Ledger.Keys qualified as L
-import Cardano.Ledger.Shelley.LedgerState qualified as L
 import Ouroboros.Consensus.HardFork.Combinator.AcrossEras (EraMismatch (..))
 import Ouroboros.Network.Protocol.LocalStateQuery.Type (Target (..))
 
@@ -168,11 +167,11 @@ queryStateForBalancedTx era allTxIns certs = runExceptT $ do
     caseShelleyToBabbageOrConwayEraOnwards
       (const $ pure Nothing)
       ( \cOnwards -> do
-          L.AccountState{L.asTreasury} <-
+          chainAccountState <-
             lift (queryAccountState cOnwards)
               & onLeft (left . QceUnsupportedNtcVersion)
               & onLeft (left . QueryEraMismatch)
-          let txCurrentTreasuryValue = TxCurrentTreasuryValue asTreasury
+          let txCurrentTreasuryValue = TxCurrentTreasuryValue $ casTreasury chainAccountState
           return $ Just $ Featured cOnwards txCurrentTreasuryValue
       )
       sbe

cardano-api/src/Cardano/Api/Query/Internal/Expr.hs

@@ -59,12 +59,11 @@ import Cardano.Api.UTxO
 
 import Cardano.Ledger.Api qualified as L
 import Cardano.Ledger.Api.State.Query qualified as L
-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 L
 import Cardano.Ledger.Hashes hiding (Hash)
 import Cardano.Ledger.Keys qualified as L
-import Cardano.Ledger.Shelley.LedgerState qualified as L
 import Cardano.Slotting.Slot
 import Ouroboros.Consensus.Cardano.Block qualified as Consensus
 import Ouroboros.Consensus.HardFork.Combinator.AcrossEras as Consensus
@@ -484,7 +483,7 @@ queryAccountState
        QueryInMode
        r
        IO
-       (Either UnsupportedNtcVersionError (Either EraMismatch L.AccountState))
+       (Either UnsupportedNtcVersionError (Either EraMismatch L.ChainAccountState))
 queryAccountState eon = querySbe eon QueryAccountState
 
 queryProposals