chore: self.distribution_time from rewards handler (#36)

* refactor: change contracts * feat: add viewer to rh * test: fix, shorter integration * chore: remove comments
curvefi · Oct 16, 2024 · 43421b3 · 43421b3
1 parent 309e317
commit 43421b3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/contracts/RewardsHandler.vy b/contracts/RewardsHandler.vy
@@ -123,10 +123,6 @@ scaling_factor: public(uint256)
 # the minimum amount of rewards requested to the FeeSplitter.
 minimum_weight: public(uint256)
 
-# the time over which rewards will be distributed mirror of the private
-# `profit_max_unlock_time` variable from yearn vaults.
-distribution_time: public(uint256)
-
 
 ################################################################
 #                          CONSTRUCTOR                         #
@@ -210,7 +206,7 @@ def process_rewards():
     # prevent the rewards from being distributed untill the distribution rate
     # has been set
     assert (
-        self.distribution_time != 0
+        staticcall vault.profitMaxUnlockTime() != 0
     ), "rewards should be distributed over time"
 
     # any crvUSD sent to this contract (usually through the fee splitter, but
@@ -302,17 +298,23 @@ def set_distribution_time(new_distribution_time: uint256):
     """
     access_control._check_role(RATE_MANAGER, msg.sender)
 
-    # we mirror the value of new_profit_max_unlock_time from the yearn vault
-    # since it's not exposed publicly.
-    self.distribution_time = new_distribution_time
-
     # change the distribution time of the rewards in the vault
     extcall vault.setProfitMaxUnlockTime(new_distribution_time)
 
     # enact the changes
     extcall vault.process_report(vault.address)
 
 
+@view
+@external
+def distribution_time() -> uint256:
+    """
+    @notice Getter for the distribution time of the rewards.
+    @return uint256 The time over which vault rewards will be distributed.
+    """
+    return staticcall vault.profitMaxUnlockTime()
+
+
 @external
 def set_minimum_weight(new_minimum_weight: uint256):
     """

diff --git a/contracts/interfaces/IVault.vyi b/contracts/interfaces/IVault.vyi
@@ -15,3 +15,9 @@ def process_report(strategy: address) -> (uint256, uint256):
 @external
 def totalAssets() -> uint256:
     ...
+
+
+@view
+@external
+def profitMaxUnlockTime() -> uint256:
+    ...
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -113,10 +113,6 @@ def rewards_handler(vault, minimum_weight):
     )
     vault.set_role(rh, 2**11 | 2**5, sender=ab.dao_agent)
 
-    # TODO how to enforce this in prod?
-    time = vault.profitMaxUnlockTime()
-    rh.eval(f"self.distribution_time = {time}")
-
     return rh
 
 

diff --git a/tests/integration/curve_pools/test_stableswap.py b/tests/integration/curve_pools/test_stableswap.py
@@ -4,7 +4,7 @@
 import address_book as ab
 
 
-N_COMBINATIONS = 5  # num of combinations in stableswap tests (>=36 => all combinations)
+N_COMBINATIONS = 3  # num of combinations in stableswap tests (>=36 => all combinations)
 
 # produce tokens for stableswap to pair against crvusd
 paired_token_combinations = generate_list_combinations(ab.all_stables, [1, 2], randomize=True)