Skip to content

fix: Rewards v2 audit fixes #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 3, 2025
Merged

fix: Rewards v2 audit fixes #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6bba1b
fix: using SafeERC20
0xrajath Jan 2, 2025
ff3d59d
docs: comment
0xrajath Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions src/ServiceManagerBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
pragma solidity ^0.8.12;

import {Initializable} from "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol";
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol";
import {IAVSDirectory} from "eigenlayer-contracts/src/contracts/interfaces/IAVSDirectory.sol";
import {IRewardsCoordinator} from "eigenlayer-contracts/src/contracts/interfaces/IRewardsCoordinator.sol";
Expand All @@ -18,6 +20,7 @@ import {BitmapUtils} from "./libraries/BitmapUtils.sol";
* @author Layr Labs, Inc.
*/
abstract contract ServiceManagerBase is ServiceManagerBaseStorage {
using SafeERC20 for IERC20;
using BitmapUtils for *;

/// @notice when applied to a function, only allows the RegistryCoordinator to call it
Expand Down Expand Up @@ -97,18 +100,14 @@ abstract contract ServiceManagerBase is ServiceManagerBaseStorage {
for (uint256 i = 0; i < rewardsSubmissions.length; ++i) {
// transfer token to ServiceManager and approve RewardsCoordinator to transfer again
// in createAVSRewardsSubmission() call
rewardsSubmissions[i].token.transferFrom(
rewardsSubmissions[i].token.safeTransferFrom(
msg.sender,
address(this),
rewardsSubmissions[i].amount
);
uint256 allowance = rewardsSubmissions[i].token.allowance(
address(this),
address(_rewardsCoordinator)
);
rewardsSubmissions[i].token.approve(
rewardsSubmissions[i].token.safeIncreaseAllowance(
address(_rewardsCoordinator),
rewardsSubmissions[i].amount + allowance
rewardsSubmissions[i].amount
);
}

Expand Down Expand Up @@ -152,18 +151,15 @@ abstract contract ServiceManagerBase is ServiceManagerBaseStorage {
}

// Transfer token to ServiceManager and approve RewardsCoordinator to transfer again
// in createAVSPerformanceRewardsSubmission() call
operatorDirectedRewardsSubmissions[i].token.transferFrom(
// in createOperatorDirectedAVSRewardsSubmission() call
operatorDirectedRewardsSubmissions[i].token.safeTransferFrom(
msg.sender,
address(this),
totalAmount
);
uint256 allowance = operatorDirectedRewardsSubmissions[i]
.token
.allowance(address(this), address(_rewardsCoordinator));
operatorDirectedRewardsSubmissions[i].token.approve(
operatorDirectedRewardsSubmissions[i].token.safeIncreaseAllowance(
address(_rewardsCoordinator),
totalAmount + allowance
totalAmount
);
}

Expand Down
23 changes: 10 additions & 13 deletions src/unaudited/ECDSAServiceManagerBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
pragma solidity ^0.8.12;

import {OwnableUpgradeable} from "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol";
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol";
import {IAVSDirectory} from "eigenlayer-contracts/src/contracts/interfaces/IAVSDirectory.sol";
import {IServiceManager} from "../interfaces/IServiceManager.sol";
Expand All @@ -17,6 +19,8 @@ abstract contract ECDSAServiceManagerBase is
IServiceManager,
OwnableUpgradeable
{
using SafeERC20 for IERC20;

/// @notice Address of the stake registry contract, which manages registration and stake recording.
address public immutable stakeRegistry;

Expand Down Expand Up @@ -198,18 +202,14 @@ abstract contract ECDSAServiceManagerBase is
IRewardsCoordinator.RewardsSubmission[] calldata rewardsSubmissions
) internal virtual {
for (uint256 i = 0; i < rewardsSubmissions.length; ++i) {
rewardsSubmissions[i].token.transferFrom(
rewardsSubmissions[i].token.safeTransferFrom(
msg.sender,
address(this),
rewardsSubmissions[i].amount
);
uint256 allowance = rewardsSubmissions[i].token.allowance(
address(this),
rewardsCoordinator
);
rewardsSubmissions[i].token.approve(
rewardsSubmissions[i].token.safeIncreaseAllowance(
rewardsCoordinator,
rewardsSubmissions[i].amount + allowance
rewardsSubmissions[i].amount
);
}

Expand Down Expand Up @@ -247,17 +247,14 @@ abstract contract ECDSAServiceManagerBase is

// Transfer token to ServiceManager and approve RewardsCoordinator to transfer again
// in createOperatorDirectedAVSRewardsSubmission() call
operatorDirectedRewardsSubmissions[i].token.transferFrom(
operatorDirectedRewardsSubmissions[i].token.safeTransferFrom(
msg.sender,
address(this),
totalAmount
);
uint256 allowance = operatorDirectedRewardsSubmissions[i]
.token
.allowance(address(this), rewardsCoordinator);
operatorDirectedRewardsSubmissions[i].token.approve(
operatorDirectedRewardsSubmissions[i].token.safeIncreaseAllowance(
rewardsCoordinator,
totalAmount + allowance
totalAmount
);
}

Expand Down
Loading