Merge pull request #4971 from IntersectMBO/lehins/rename-AccountState

Rename `AccountState` to `ChainAccountState`

Author: lehins

eras/allegra/impl/src/Cardano/Ledger/Allegra/Translation.hs

@@ -156,7 +156,7 @@ instance TranslateEra AllegraEra EpochState where
   translateEra ctxt es =
     return
       EpochState
-        { esAccountState = esAccountState es
+        { esChainAccountState = esChainAccountState es
         , esSnapshots = esSnapshots es
         , esLState = translateEra' ctxt $ esLState es
         , esNonMyopic = esNonMyopic es

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Translation.hs

@@ -94,7 +94,7 @@ instance TranslateEra AlonzoEra EpochState where
   translateEra ctxt es =
     return
       EpochState
-        { esAccountState = esAccountState es
+        { esChainAccountState = esChainAccountState es
         , esSnapshots = esSnapshots es
         , esLState = translateEra' ctxt $ esLState es
         , esNonMyopic = esNonMyopic es

eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/Trace.hs

@@ -75,7 +75,7 @@ instance
       <$> genEraPParams @era geConstants
       <*> genAccountState geConstants
 
-  sigGen genenv env state = genTx genenv env state
+  sigGen = genTx
 
   shrinkSignal _ = [] -- TODO add some kind of Shrinker?
 

eras/babbage/impl/src/Cardano/Ledger/Babbage/Translation.hs

@@ -94,7 +94,7 @@ instance TranslateEra BabbageEra EpochState where
   translateEra ctxt es =
     pure
       EpochState
-        { esAccountState = esAccountState es
+        { esChainAccountState = esChainAccountState es
         , esSnapshots = esSnapshots es
         , esLState = translateEra' ctxt $ esLState es
         , esNonMyopic = esNonMyopic es

eras/conway/impl/src/Cardano/Ledger/Conway/Governance.hs

@@ -218,7 +218,6 @@ import Cardano.Ledger.Shelley.LedgerState (
   NewEpochState (..),
   epochStateGovStateL,
   epochStatePoolParamsL,
-  epochStateTreasuryL,
   esLStateL,
   lsCertState,
   lsCertStateL,
@@ -504,7 +503,7 @@ setFreshDRepPulsingState epochNo stakePoolDistr epochState = do
                     , dpCommitteeState = vsCommitteeState vState
                     , dpEnactState =
                         mkEnactState govState
-                          & ensTreasuryL .~ epochState ^. epochStateTreasuryL
+                          & ensTreasuryL .~ epochState ^. treasuryL
                     , dpProposals = proposalsActions props
                     , dpProposalDeposits = proposalsDeposits props
                     , dpGlobals = globals

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Epoch.hs

@@ -67,10 +67,7 @@ import Cardano.Ledger.Shelley.LedgerState (
   EpochState (..),
   LedgerState (..),
   UTxOState (..),
-  asTreasuryL,
   curPParamsEpochStateL,
-  esAccountState,
-  esAccountStateL,
   esLStateL,
   esSnapshotsL,
   lsCertStateL,
@@ -228,23 +225,23 @@ updateNumDormantEpochs currentEpoch ps vState =
 --
 -- The utxo fees and donations are applied in the remaining body of EPOCH transition
 applyEnactedWithdrawals ::
-  AccountState ->
+  ChainAccountState ->
   DState era ->
   EnactState era ->
-  (AccountState, DState era, EnactState era)
-applyEnactedWithdrawals accountState dState enactedState =
+  (ChainAccountState, DState era, EnactState era)
+applyEnactedWithdrawals chainAccountState dState enactedState =
   let enactedWithdrawals = enactedState ^. ensWithdrawalsL
       rewardsUView = RewDepUView $ dState ^. dsUnifiedL
       successfulWithdrawls = rewardsUView ◁ enactedWithdrawals
-      accountState' =
-        accountState
+      chainAccountState' =
+        chainAccountState
           -- Subtract `successfulWithdrawals` from the treasury, and add them to the rewards UMap
           -- `unclaimed` withdrawals remain in the treasury.
           -- Compared to the spec, instead of adding `unclaimed` and subtracting `totWithdrawals`
           --   + unclaimed - totWithdrawals
           -- we just subtract the `refunds`
           --   - refunds
-          & asTreasuryL %~ (<-> fold successfulWithdrawls)
+          & casTreasuryL %~ (<-> fold successfulWithdrawls)
       -- The use of the partial function `compactCoinOrError` is justified here because
       -- 1. the decoder for coin at the proposal-submission boundary has already
       --    confirmed we have a compactible value
@@ -258,7 +255,7 @@ applyEnactedWithdrawals accountState dState enactedState =
         enactedState
           & ensWithdrawalsL .~ Map.empty
           & ensTreasuryL .~ mempty
-   in (accountState', dState', enactedState')
+   in (chainAccountState', dState', enactedState')
 
 epochTransition ::
   forall era.
@@ -291,14 +288,14 @@ epochTransition = do
   TRC
     ( ()
       , epochState0@EpochState
-          { esAccountState = accountState0
-          , esSnapshots = snapshots0
+          { esSnapshots = snapshots0
           , esLState = ledgerState0
           }
       , eNo
       ) <-
     judgmentContext
-  let govState0 = utxosGovState utxoState0
+  let chainAccountState0 = epochState0 ^. chainAccountStateL
+      govState0 = utxosGovState utxoState0
       curPParams = govState0 ^. curPParamsGovStateL
       utxoState0 = lsUTxOState ledgerState0
       certState0 = ledgerState0 ^. lsCertStateL
@@ -314,9 +311,9 @@ epochTransition = do
           { psStakePoolParams = newStakePoolParams
           , psFutureStakePoolParams = Map.empty
           }
-  PoolreapState utxoState1 accountState1 certState1 <-
+  PoolreapState utxoState1 chainAccountState1 certState1 <-
     trans @(EraRule "POOLREAP" era) $
-      TRC ((), PoolreapState utxoState0 accountState0 (certState0 & certPStateL .~ pState1), eNo)
+      TRC ((), PoolreapState utxoState0 chainAccountState0 (certState0 & certPStateL .~ pState1), eNo)
 
   let
     stakePoolDistr = ssStakeMarkPoolDistr snapshots1
@@ -325,8 +322,8 @@ epochTransition = do
     ratifyState@RatifyState {rsEnactState, rsEnacted, rsExpired} =
       extractDRepPulsingState pulsingState
 
-    (accountState2, dState2, EnactState {..}) =
-      applyEnactedWithdrawals accountState1 (certState1 ^. certDStateL) rsEnactState
+    (chainAccountState2, dState2, EnactState {..}) =
+      applyEnactedWithdrawals chainAccountState1 (certState1 ^. certDStateL) rsEnactState
 
     -- NOTE: It is important that we apply the results of ratification
     -- and enactment from the pulser to the working copy of proposals.
@@ -375,10 +372,10 @@ epochTransition = do
         )
         (certState1 ^. certPStateL)
         (dState2 & dsUnifiedL .~ newUMap)
-    accountState3 =
-      accountState2
+    chainAccountState3 =
+      chainAccountState2
         -- Move donations and unclaimed rewards from proposals to treasury:
-        & asTreasuryL <>~ (utxoState0 ^. utxosDonationL <> fold unclaimed)
+        & casTreasuryL <>~ (utxoState0 ^. utxosDonationL <> fold unclaimed)
     utxoState2 =
       utxoState1
         & utxosDepositedL .~ totalObligation certState2 govState1
@@ -391,7 +388,7 @@ epochTransition = do
         & lsUTxOStateL .~ utxoState2
     epochState1 =
       epochState0
-        & esAccountStateL .~ accountState3
+        & chainAccountStateL .~ chainAccountState3
         & esSnapshotsL .~ snapshots1
         & esLStateL .~ ledgerState1
   tellEvent $ EpochBoundaryRatifyState ratifyState

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Ledger.hs

@@ -83,16 +83,13 @@ import Cardano.Ledger.Conway.Rules.GovCert (ConwayGovCertPredFailure)
 import Cardano.Ledger.Conway.Rules.Utxo (ConwayUtxoPredFailure)
 import Cardano.Ledger.Conway.Rules.Utxos (ConwayUtxosPredFailure)
 import Cardano.Ledger.Conway.Rules.Utxow (ConwayUtxowPredFailure)
-import Cardano.Ledger.Conway.State (ConwayEraCertState)
+import Cardano.Ledger.Conway.State
 import Cardano.Ledger.Conway.UTxO (txNonDistinctRefScriptsSize)
 import Cardano.Ledger.Credential (Credential (..), credKeyHash)
 import qualified Cardano.Ledger.Shelley.HardForks as HF (bootstrapPhase)
 import Cardano.Ledger.Shelley.LedgerState (
   LedgerState (..),
   UTxOState (..),
-  asTreasuryL,
-  dsUnifiedL,
-  utxoL,
   utxosGovStateL,
  )
 import Cardano.Ledger.Shelley.Rules (
@@ -108,7 +105,6 @@ import Cardano.Ledger.Shelley.Rules (
   shelleyLedgerAssertions,
  )
 import Cardano.Ledger.Slot (epochFromSlot)
-import Cardano.Ledger.State (EraCertState (..), EraUTxO (..))
 import Cardano.Ledger.UMap (UView (..))
 import qualified Cardano.Ledger.UMap as UMap
 import Control.DeepSeq (NFData)
@@ -363,7 +359,7 @@ ledgerTransition ::
   TransitionRule (someLEDGER era)
 ledgerTransition = do
   TRC
-    ( LedgerEnv slot mbCurEpochNo _txIx pp account
+    ( LedgerEnv slot mbCurEpochNo _txIx pp chainAccountState
       , LedgerState utxoState certState
       , tx
       ) <-
@@ -375,7 +371,7 @@ ledgerTransition = do
     if tx ^. isValidTxL == IsValid True
       then do
         let txBody = tx ^. bodyTxL
-            actualTreasuryValue = account ^. asTreasuryL
+            actualTreasuryValue = chainAccountState ^. casTreasuryL
         case txBody ^. currentTreasuryValueTxBodyL of
           SNothing -> pure ()
           SJust submittedTreasuryValue ->

eras/conway/impl/src/Cardano/Ledger/Conway/Translation.hs

@@ -128,7 +128,7 @@ instance TranslateEra ConwayEra EpochState where
   translateEra ctxt es =
     pure $
       EpochState
-        { esAccountState = esAccountState es
+        { esChainAccountState = esChainAccountState es
         , esSnapshots = esSnapshots es
         , esLState = translateEra' ctxt $ esLState es
         , esNonMyopic = esNonMyopic es

eras/conway/impl/src/Cardano/Ledger/Conway/Tx.hs

@@ -105,7 +105,7 @@ getConwayMinFeeTx pp tx refScriptsSize =
         refScriptCostPerByte
         refScriptsSize
 
--- | Calculate the fee for reference scripts using an expoential growth of the price per
+-- | Calculate the fee for reference scripts using an exponential growth of the price per
 -- byte with linear increments
 tierRefScriptFee ::
   HasCallStack =>

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/BbodySpec.hs

@@ -21,6 +21,7 @@ import Cardano.Ledger.Conway.Rules (
   maxRefScriptSizePerBlock,
   maxRefScriptSizePerTx,
  )
+import Cardano.Ledger.Conway.State
 import Cardano.Ledger.Plutus (SLanguage (..))
 import Cardano.Ledger.Shelley.LedgerState
 import Cardano.Ledger.Shelley.Rules (
@@ -77,7 +78,6 @@ spec = describe "BBODY" $ do
     nes <- use impNESL
     let ls = nes ^. nesEsL . esLStateL
         pp = nes ^. nesEsL . curPParamsEpochStateL
-        account = nes ^. nesEsL . esAccountStateL
     kh <- freshKeyHash
     slotNo <- use impLastTickG
     let bhView =
@@ -90,7 +90,7 @@ spec = describe "BBODY" $ do
             }
     Left predFailures <-
       tryRunImpRule @"BBODY"
-        (BbodyEnv pp account)
+        (BbodyEnv pp (nes ^. chainAccountStateL))
         (BbodyState ls (BlocksMade Map.empty))
         (Block bhView txSeq)
     predFailures