Remove allowScriptStakeCredsToEarnRewards hardfork switch

since it was verified that removing it creates the same ledger state, proving the switch unnecessary.
IntersectMBO · Nov 28, 2022 · fcd476b · fcd476b
1 parent 40f427f
commit fcd476b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/HardForks.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/HardForks.hs
@@ -6,7 +6,6 @@ module Cardano.Ledger.Shelley.HardForks
   ( aggregatedRewards,
     allowMIRTransfer,
     validatePoolRewardAccountNetID,
-    allowScriptStakeCredsToEarnRewards,
     missingScriptsSymmetricDifference,
     forgoRewardPrefilter,
     allowOutsideForecastTTL,
@@ -43,14 +42,6 @@ validatePoolRewardAccountNetID ::
   Bool
 validatePoolRewardAccountNetID pp = pvMajor (getField @"_protocolVersion" pp) > natVersion @4
 
--- | Starting with protocol version 5, Stake Credentials bound by scripts
--- will be eligibile for staking rewards.
-allowScriptStakeCredsToEarnRewards ::
-  (HasField "_protocolVersion" pp ProtVer) =>
-  pp ->
-  Bool
-allowScriptStakeCredsToEarnRewards pp = pvMajor (getField @"_protocolVersion" pp) > natVersion @4
-
 -- | Starting with protocol version 7, the UTXO rule predicate failure
 -- MissingScriptWitnessesUTXOW will not be used for extraneous scripts
 missingScriptsSymmetricDifference ::

diff --git a/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rewards.hs b/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rewards.hs
@@ -220,14 +220,12 @@ instance CC.Crypto c => FromCBOR (PoolRewardInfo c) where
       )
 
 notPoolOwner ::
-  HasField "_protocolVersion" pp ProtVer =>
-  pp ->
   PoolParams c ->
   Credential 'Staking c ->
   Bool
-notPoolOwner pp pps = \case
+notPoolOwner pps = \case
   KeyHashObj hk -> hk `Set.notMember` ppOwners pps
-  ScriptHashObj _ -> HardForks.allowScriptStakeCredsToEarnRewards pp
+  ScriptHashObj _ -> True
 
 -- | The stake pool member reward calculation
 rewardOnePoolMember ::
@@ -257,7 +255,7 @@ rewardOnePoolMember
   rewardInfo
   hk
   (Coin c) =
-    if prefilter && notPoolOwner pp (poolPs rewardInfo) hk && r /= Coin 0
+    if prefilter && notPoolOwner (poolPs rewardInfo) hk && r /= Coin 0
       then Just r
       else Nothing
     where

diff --git a/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Rewards.hs b/eras/shelley/test-suite/src/Test/Cardano/Ledger/Shelley/Rewards.hs
@@ -438,7 +438,7 @@ rewardOnePool
               notPoolOwner hk
           ]
       notPoolOwner (KeyHashObj hk) = hk `Set.notMember` ppOwners pool
-      notPoolOwner (ScriptHashObj _) = HardForks.allowScriptStakeCredsToEarnRewards pp
+      notPoolOwner (ScriptHashObj _) = True
       lReward =
         leaderRew
           poolR