more efficient claiming compoundv2

reserve-protocol · Oct 30, 2023 · 8aa6a50 · 8aa6a50
1 parent 6a8fae6
commit 8aa6a50
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/contracts/plugins/assets/compoundv2/CTokenWrapper.sol b/contracts/plugins/assets/compoundv2/CTokenWrapper.sol
@@ -35,9 +35,11 @@ contract CTokenWrapper is RewardableERC20Wrapper {
     // === Overrides ===
 
     function _claimAssetRewards() internal virtual override {
+        address[] memory holders = new address[](1);
         address[] memory cTokens = new address[](1);
+        holders[0] = address(this);
         cTokens[0] = address(underlying);
-        comptroller.claimComp(address(this), cTokens);
+        comptroller.claimComp(holders, cTokens, false, true);
     }
 
     // No overrides of _deposit()/_withdraw() necessary: no staking required

diff --git a/contracts/plugins/assets/compoundv2/ICToken.sol b/contracts/plugins/assets/compoundv2/ICToken.sol
@@ -35,7 +35,12 @@ interface ICToken is IERC20Metadata {
 
 interface IComptroller {
     /// Claim comp for an account, to an account
-    function claimComp(address account, address[] memory cTokens) external;
+    function claimComp(
+        address[] memory holders,
+        address[] memory cTokens,
+        bool borrowers,
+        bool suppliers
+    ) external;
 
     /// @return The address for COMP token
     function getCompAddress() external view returns (address);

diff --git a/contracts/plugins/mocks/CTokenWrapperMock.sol b/contracts/plugins/mocks/CTokenWrapperMock.sol
@@ -42,9 +42,11 @@ contract CTokenWrapperMock is ERC20Mock, IRewardable {
             revert("reverting claim rewards");
         }
         uint256 oldBal = comp.balanceOf(msg.sender);
+        address[] memory holders = new address[](1);
         address[] memory cTokens = new address[](1);
+        holders[0] = msg.sender;
         cTokens[0] = address(underlying);
-        comptroller.claimComp(msg.sender, cTokens);
+        comptroller.claimComp(holders, cTokens, false, true);
         emit RewardsClaimed(IERC20(address(comp)), comp.balanceOf(msg.sender) - oldBal);
     }
 

diff --git a/contracts/plugins/mocks/ComptrollerMock.sol b/contracts/plugins/mocks/ComptrollerMock.sol
@@ -19,8 +19,14 @@ contract ComptrollerMock is IComptroller {
         compBalances[recipient] = amount;
     }
 
-    function claimComp(address holder, address[] memory) external {
+    function claimComp(
+        address[] memory holders,
+        address[] memory,
+        bool,
+        bool
+    ) external {
         // Mint amount and update internal balances
+        address holder = holders[0];
         if (address(compToken) != address(0)) {
             uint256 amount = compBalances[holder];
             compBalances[holder] = 0;