Precompute tier odds

pooltogether · Jun 28, 2023 · 38df0bc · 38df0bc
1 parent 2b4cd6b
commit 38df0bc
Show file tree

Hide file tree

Showing 6 changed files with 492 additions and 32 deletions.
diff --git a/src/PrizePool.sol b/src/PrizePool.sol
@@ -325,9 +325,7 @@ contract PrizePool is TieredLiquidityDistributor {
     return
       uint16(
         TierCalculationLib.estimatePrizeFrequencyInDraws(
-          _tier,
-          numberOfTiers,
-          grandPrizePeriodDraws
+          TieredLiquidityDistributor._tierOdds(_tier, numberOfTiers)
         )
       );
   }
@@ -818,10 +816,8 @@ contract PrizePool is TieredLiquidityDistributor {
       revert InvalidTier(_tier, _numberOfTiers);
     }
 
-    tierOdds = TierCalculationLib.getTierOdds(_tier, _numberOfTiers, grandPrizePeriodDraws);
-    drawDuration = uint16(
-      TierCalculationLib.estimatePrizeFrequencyInDraws(_tier, _numberOfTiers, grandPrizePeriodDraws)
-    );
+    tierOdds = TieredLiquidityDistributor._tierOdds(_tier, numberOfTiers);
+    drawDuration = uint16(TierCalculationLib.estimatePrizeFrequencyInDraws(tierOdds));
     vaultPortion = _getVaultPortion(
       _vault,
       uint16(drawDuration > _lastCompletedDrawId ? 0 : _lastCompletedDrawId - drawDuration + 1),
@@ -844,9 +840,7 @@ contract PrizePool is TieredLiquidityDistributor {
     startTimestamp = uint64(
       endTimestamp -
         TierCalculationLib.estimatePrizeFrequencyInDraws(
-          _tier,
-          numberOfTiers,
-          grandPrizePeriodDraws
+          TieredLiquidityDistributor._tierOdds(_tier, numberOfTiers)
         ) *
         drawPeriodSeconds
     );