Viable approach in the works. In process of removing UMap in favor of AccountStates

Simplify Transition and reuse it in shelley-test

Add mkTestAccountState and addAccountState

Author: lehins

eras/allegra/impl/cardano-ledger-allegra.cabal

@@ -46,6 +46,7 @@ library
     Cardano.Ledger.Allegra.Rules.Ppup
     Cardano.Ledger.Allegra.Rules.Utxo
     Cardano.Ledger.Allegra.Rules.Utxow
+    Cardano.Ledger.Allegra.State.Account
     Cardano.Ledger.Allegra.State.CertState
     Cardano.Ledger.Allegra.State.Stake
     Cardano.Ledger.Allegra.TxCert

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

@@ -2,6 +2,7 @@ module Cardano.Ledger.Allegra.State (
   module Cardano.Ledger.Shelley.State,
 ) where
 
+import Cardano.Ledger.Allegra.State.Account ()
 import Cardano.Ledger.Allegra.State.CertState ()
 import Cardano.Ledger.Allegra.State.Stake ()
 import Cardano.Ledger.Shelley.State

eras/allegra/impl/src/Cardano/Ledger/Allegra/State/Account.hs

@@ -0,0 +1,29 @@
+{-# LANGUAGE TypeFamilies #-}
+{-# OPTIONS_GHC -Wno-orphans #-}
+
+module Cardano.Ledger.Allegra.State.Account () where
+
+import Cardano.Ledger.Allegra.Era
+import Cardano.Ledger.BaseTypes
+import Cardano.Ledger.Shelley.State
+import Lens.Micro
+
+instance EraAccounts AllegraEra where
+  type AccountState AllegraEra = ShelleyAccountState AllegraEra
+  type Accounts AllegraEra = ShelleyAccounts AllegraEra
+
+  addAccountState = shelleyAddAccountState
+
+  accountsMapL = lens saStates $ \sas asMap -> sas {saStates = asMap}
+
+  balanceAccountStateL = lens sasBalance $ \sas b -> sas {sasBalance = b}
+
+  depositAccountStateL = lens sasDeposit $ \sas d -> sas {sasDeposit = d}
+
+  stakePoolDelegationAccountStateL =
+    lens (strictMaybeToMaybe . sasStakePoolDelegation) $ \sas d ->
+      sas {sasStakePoolDelegation = maybeToStrictMaybe d}
+
+  unregisterAccount = unregisterShelleyAccount
+
+instance ShelleyEraAccounts AllegraEra

eras/allegra/impl/src/Cardano/Ledger/Allegra/State/CertState.hs

@@ -5,6 +5,7 @@
 module Cardano.Ledger.Allegra.State.CertState () where
 
 import Cardano.Ledger.Allegra.Era (AllegraEra)
+import Cardano.Ledger.Allegra.State.Account ()
 import Cardano.Ledger.Shelley.State
 
 instance EraCertState AllegraEra where

eras/allegra/impl/src/Cardano/Ledger/Allegra/State/Stake.hs

@@ -5,6 +5,7 @@ module Cardano.Ledger.Allegra.State.Stake () where
 
 import Cardano.Ledger.Allegra.Core ()
 import Cardano.Ledger.Allegra.Era (AllegraEra)
+import Cardano.Ledger.Allegra.State.Account ()
 import Cardano.Ledger.Shelley.State (
   EraStake (..),
   ShelleyInstantStake,

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

@@ -22,7 +22,7 @@ instance EraTransition AllegraEra where
 
   mkTransitionConfig NoGenesis = AllegraTransitionConfig
 
-  injectIntoTestState = registerInitialFundsThenStaking
+  injectIntoTestState = shelleyRegisterInitialFundsThenStaking
 
   tcPreviousEraConfigL =
     lens atcShelleyTransitionConfig (\atc pc -> atc {atcShelleyTransitionConfig = pc})

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

@@ -127,8 +127,13 @@ instance TranslateEra AllegraEra UTxOState where
 instance TranslateEra AllegraEra ShelleyInstantStake where
   translateEra _ = pure . coerce
 
+instance TranslateEra AllegraEra ShelleyAccounts where
+  translateEra _ = pure . coerce
+
 instance TranslateEra AllegraEra DState where
-  translateEra _ DState {..} = pure DState {..}
+  translateEra ctx DState {dsAccounts = accountsShelley, ..} = do
+    dsAccounts <- translateEra ctx accountsShelley
+    pure DState {..}
 
 instance TranslateEra AllegraEra CommitteeState where
   translateEra _ CommitteeState {..} = pure CommitteeState {..}

eras/allegra/impl/testlib/Test/Cardano/Ledger/Allegra/Era.hs

@@ -22,7 +22,12 @@ class
   ) =>
   AllegraEraTest era
 
-instance EraTest AllegraEra
+instance EraTest AllegraEra where
+  mkTestAccountState = mkShelleyTestAccountState
+
+  accountsFromAccountsMap = shelleyAccountsFromAccountsMap
+
+  accountsToUMap = shelleyAccountsToUMap
 
 instance ShelleyEraTest AllegraEra
 

eras/alonzo/impl/cardano-ledger-alonzo.cabal

@@ -61,6 +61,7 @@ library
     Cardano.Ledger.Alonzo.Rules.Utxo
     Cardano.Ledger.Alonzo.Rules.Utxos
     Cardano.Ledger.Alonzo.Rules.Utxow
+    Cardano.Ledger.Alonzo.State.Account
     Cardano.Ledger.Alonzo.State.CertState
     Cardano.Ledger.Alonzo.State.Stake
     Cardano.Ledger.Alonzo.TxCert

eras/alonzo/impl/golden/pparams-update.json

@@ -18,11 +18,11 @@
     "maxCollateralInputs": 45,
     "maxTxSize": 881284740,
     "maxValueSize": 39,
-    "minPoolCost": 392044,
+    "minPoolCost": 855261,
     "monetaryExpansion": 0.7810966919969065,
     "poolPledgeInfluence": 8.319022570290014789e16,
     "poolRetireMaxEpoch": 1843493333,
-    "stakePoolDeposit": 855059,
+    "stakePoolDeposit": 275624,
     "stakePoolTargetNum": 10900,
     "treasuryCut": 0.234167131785253734
-}
+}