Make incremental playerId daily rewards more random

PaintSwap · Jul 19, 2023 · 176a1d7 · 176a1d7
1 parent fb89f5a
commit 176a1d7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/contracts/World.sol b/contracts/World.sol
@@ -400,7 +400,7 @@ contract World is VRFConsumerBaseV2Upgradeable, UUPSUpgradeable, OwnableUpgradea
   }
 
   function _getRewardIndex(uint _playerId, uint _day, uint _length) private view returns (uint) {
-    return uint((thisWeeksRandomWordSegment >> (_day * 8)) ^ bytes32(_playerId)) % _length;
+    return uint(keccak256(abi.encodePacked(thisWeeksRandomWordSegment, _playerId)) >> (_day * 8)) % _length;
   }
 
   function _setAction(Action calldata _action) private {

diff --git a/test/Players/Rewards.ts b/test/Players/Rewards.ts
@@ -903,9 +903,6 @@ describe("Rewards", function () {
         const randomChanceFraction = randomChanceFractions[i];
         const expectedTotal = numRepeats * randomChanceFraction * numHours;
         // Have 2 queued actions so twice as much
-
-        console.log(itemTokenId, expectedTotal);
-
         expect(balanceMap.get(itemTokenId)).to.not.eq(expectedTotal * 2); // Very unlikely to be exact, but possible. This checks there is at least some randomness
         expect(balanceMap.get(itemTokenId)).to.be.gte(expectedTotal * 0.75 * 2); // Within 25% below
         expect(balanceMap.get(itemTokenId)).to.be.lte(expectedTotal * 1.25 * 2); // Within 25% above

diff --git a/test/World.ts b/test/World.ts
@@ -226,7 +226,7 @@ describe("World", function () {
       let dailyRewards1 = await world.getActiveDailyAndWeeklyRewards(1, playerId + 1);
       let dailyRewards2 = await world.getActiveDailyAndWeeklyRewards(1, playerId + 2);
 
-      // Check that the dailyRewards are different
+      // TODO: Check that incremental playerIds don't have rewards that have incremental indices in the reward pool tier
       expect(dailyRewards).to.not.eql(dailyRewards1);
       expect(dailyRewards).to.not.eql(dailyRewards2);
       expect(dailyRewards1).to.not.eql(dailyRewards2);