Merge pull request #99 from GenerationSoftware/gen-1169-prizepoolgetv…

…aultportion-fails-if-only-donations-were-given Fixed issue when only donations were given
GenerationSoftware · Mar 1, 2024 · 3344d3c · 3344d3c
2 parents 9b7605e + 8c073ae
commit 3344d3c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/PrizePool.sol b/src/PrizePool.sol
@@ -1019,7 +1019,11 @@ contract PrizePool is TieredLiquidityDistributor {
 
     uint256 totalDonated = DrawAccumulatorLib.getDisbursedBetween(_vaultAccumulator[DONATOR], _startDrawIdInclusive, _endDrawIdInclusive);
 
-    // vaultContributed / totalContributed
+    uint256 total = totalContributed - totalDonated;
+
+    if (total == 0) {
+      return sd(0);
+    }
     return
       totalContributed != 0
         ? sd(
@@ -1030,7 +1034,7 @@ contract PrizePool is TieredLiquidityDistributor {
               _endDrawIdInclusive
             )
           )
-        ).div(sd(SafeCast.toInt256(totalContributed - totalDonated)))
+        ).div(sd(SafeCast.toInt256(total)))
         : sd(0);
   }
 

diff --git a/test/PrizePool.t.sol b/test/PrizePool.t.sol
@@ -550,6 +550,14 @@ contract PrizePoolTest is Test {
     assertEq(prizePool.getVaultPortion(address(vault2), 1, 1).unwrap(), 0.5e18);
   }
 
+  function testGetVaultPortion_handlesOnlyDonation() public {
+    prizeToken.mint(address(this), 100);
+    prizeToken.approve(address(prizePool), 100);
+    prizePool.donatePrizeTokens(100);
+
+    assertEq(prizePool.getVaultPortion(address(vault2), 1, 1).unwrap(), 0);
+  }
+
   function testGetOpenDrawId() public {
     uint256 openDrawId = prizePool.getOpenDrawId();
     assertEq(openDrawId, 1);