Merge branch 'develop' into VEN-1831

VenusProtocol · Jun 21, 2024 · 1173de8 · 1173de8
2 parents 5beeda7 + 8dbffd1
commit 1173de8
Show file tree

Hide file tree

Showing 154 changed files with 94,022 additions and 14,519 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/contracts/Lens/PoolLens.sol b/contracts/Lens/PoolLens.sol
@@ -67,7 +67,6 @@ contract PoolLens is ExponentialNoError, TimeManagerV8 {
         uint256 vTokenDecimals;
         uint256 underlyingDecimals;
         uint256 pausedActions;
-        bool isTimeBased;
     }
 
     /**
@@ -414,8 +413,7 @@ contract PoolLens is ExponentialNoError, TimeManagerV8 {
                 underlyingAssetAddress: underlyingAssetAddress,
                 vTokenDecimals: vToken.decimals(),
                 underlyingDecimals: underlyingDecimals,
-                pausedActions: pausedActions,
-                isTimeBased: vToken.isTimeBased()
+                pausedActions: pausedActions
             });
     }
 
@@ -456,15 +454,12 @@ contract PoolLens is ExponentialNoError, TimeManagerV8 {
     ) internal view returns (PendingReward[] memory) {
         PendingReward[] memory pendingRewards = new PendingReward[](markets.length);
 
-        bool _isTimeBased = rewardsDistributor.isTimeBased();
-        require(_isTimeBased == isTimeBased, "Inconsistent Reward mode");
-
         for (uint256 i; i < markets.length; ++i) {
             // Market borrow and supply state we will modify update in-memory, in order to not modify storage
             RewardTokenState memory borrowState;
             RewardTokenState memory supplyState;
 
-            if (_isTimeBased) {
+            if (isTimeBased) {
                 (
                     borrowState.index,
                     borrowState.blockOrTimestamp,