Comparar texto

Encontre a diferença entre dois arquivos de texto

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Ferramentas

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

StratFeeManagerInitializable.sol

Created 8 months agoDiff never expires

The two files are identical

There is no difference to show between these two files

136 lines

// SPDX-License-Identifier: MIT

pragma solidity ^0.8.0;

import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";

import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";

import "../../interfaces/common/IFeeConfig.sol";

contract StratFeeManagerInitializable is OwnableUpgradeable, PausableUpgradeable {

struct CommonAddresses {

address vault;

address unirouter;

address keeper;

address strategist;

address beefyFeeRecipient;

address beefyFeeConfig;

}

// common addresses for the strategy

address public vault;

address public unirouter;

address public keeper;

address public strategist;

address public beefyFeeRecipient;

IFeeConfig public beefyFeeConfig;

uint256 constant DIVISOR = 1 ether;

uint256 constant public WITHDRAWAL_FEE_CAP = 50;

uint256 constant public WITHDRAWAL_MAX = 10000;

uint256 internal withdrawalFee;

event SetStratFeeId(uint256 feeId);

event SetWithdrawalFee(uint256 withdrawalFee);

event SetVault(address vault);

event SetUnirouter(address unirouter);

event SetKeeper(address keeper);

event SetStrategist(address strategist);

event SetBeefyFeeRecipient(address beefyFeeRecipient);

event SetBeefyFeeConfig(address beefyFeeConfig);

function __StratFeeManager_init(CommonAddresses calldata _commonAddresses) internal onlyInitializing {

__Ownable_init();

__Pausable_init();

vault = _commonAddresses.vault;

unirouter = _commonAddresses.unirouter;

keeper = _commonAddresses.keeper;

strategist = _commonAddresses.strategist;

beefyFeeRecipient = _commonAddresses.beefyFeeRecipient;

beefyFeeConfig = IFeeConfig(_commonAddresses.beefyFeeConfig);

withdrawalFee = 10;

}

// checks that caller is either owner or keeper.

modifier onlyManager() {

_checkManager();

}

function _checkManager() internal view {

require(msg.sender == owner() || msg.sender == keeper, "!manager");

}

// fetch fees from config contract

function getFees() internal view returns (IFeeConfig.FeeCategory memory) {

return beefyFeeConfig.getFees(address(this));

}

// fetch fees from config contract and dynamic deposit/withdraw fees

function getAllFees() external view returns (IFeeConfig.AllFees memory) {

return IFeeConfig.AllFees(getFees(), depositFee(), withdrawFee());

}

function getStratFeeId() external view returns (uint256) {

return beefyFeeConfig.stratFeeId(address(this));

}

function setStratFeeId(uint256 _feeId) external onlyManager {

beefyFeeConfig.setStratFeeId(_feeId);

emit SetStratFeeId(_feeId);

}

// adjust withdrawal fee

function setWithdrawalFee(uint256 _fee) public onlyManager {

require(_fee <= WITHDRAWAL_FEE_CAP, "!cap");

withdrawalFee = _fee;

emit SetWithdrawalFee(_fee);

}

// set new vault (only for strategy upgrades)

function setVault(address _vault) external onlyOwner {

vault = _vault;

emit SetVault(_vault);

}

// set new unirouter

function setUnirouter(address _unirouter) external onlyOwner {

unirouter = _unirouter;

emit SetUnirouter(_unirouter);

}

// set new keeper to manage strat

function setKeeper(address _keeper) external onlyManager {

keeper = _keeper;

emit SetKeeper(_keeper);

}

// set new strategist address to receive strat fees

function setStrategist(address _strategist) external {

require(msg.sender == strategist, "!strategist");

strategist = _strategist;

emit SetStrategist(_strategist);

}

// set new beefy fee address to receive beefy fees

function setBeefyFeeRecipient(address _beefyFeeRecipient) external onlyOwner {

beefyFeeRecipient = _beefyFeeRecipient;

emit SetBeefyFeeRecipient(_beefyFeeRecipient);

}

// set new fee config address to fetch fees

function setBeefyFeeConfig(address _beefyFeeConfig) external onlyOwner {

beefyFeeConfig = IFeeConfig(_beefyFeeConfig);

emit SetBeefyFeeConfig(_beefyFeeConfig);

}

function depositFee() public virtual view returns (uint256) {

return 0;

}

function withdrawFee() public virtual view returns (uint256) {

return paused() ? 0 : withdrawalFee;

}

function beforeDeposit() external virtual {}

}

Diffs salvos

Texto original

Abrir arquivo

// SPDX-License-Identifier: MIT

pragma solidity ^0.8.0;

import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
import "../../interfaces/common/IFeeConfig.sol";

contract StratFeeManagerInitializable is OwnableUpgradeable, PausableUpgradeable {

struct CommonAddresses {
        address vault;
        address unirouter;
        address keeper;
        address strategist;
        address beefyFeeRecipient;
        address beefyFeeConfig;
    }

// common addresses for the strategy
    address public vault;
    address public unirouter;
    address public keeper;
    address public strategist;
    address public beefyFeeRecipient;
    IFeeConfig public beefyFeeConfig;

uint256 constant DIVISOR = 1 ether;
    uint256 constant public WITHDRAWAL_FEE_CAP = 50;
    uint256 constant public WITHDRAWAL_MAX = 10000;
    uint256 internal withdrawalFee;

event SetStratFeeId(uint256 feeId);
    event SetWithdrawalFee(uint256 withdrawalFee);
    event SetVault(address vault);
    event SetUnirouter(address unirouter);
    event SetKeeper(address keeper);
    event SetStrategist(address strategist);
    event SetBeefyFeeRecipient(address beefyFeeRecipient);
    event SetBeefyFeeConfig(address beefyFeeConfig);

function __StratFeeManager_init(CommonAddresses calldata _commonAddresses) internal onlyInitializing {
        __Ownable_init();
        __Pausable_init();
        vault = _commonAddresses.vault;
        unirouter = _commonAddresses.unirouter;
        keeper = _commonAddresses.keeper;
        strategist = _commonAddresses.strategist;
        beefyFeeRecipient = _commonAddresses.beefyFeeRecipient;
        beefyFeeConfig = IFeeConfig(_commonAddresses.beefyFeeConfig);
        withdrawalFee = 10;
    }

// checks that caller is either owner or keeper.
    modifier onlyManager() {
        _checkManager();
        _;
    }

function _checkManager() internal view {
        require(msg.sender == owner() || msg.sender == keeper, "!manager");
    }

// fetch fees from config contract
    function getFees() internal view returns (IFeeConfig.FeeCategory memory) {
        return beefyFeeConfig.getFees(address(this));
    }

// fetch fees from config contract and dynamic deposit/withdraw fees
    function getAllFees() external view returns (IFeeConfig.AllFees memory) {
        return IFeeConfig.AllFees(getFees(), depositFee(), withdrawFee());
    }

function getStratFeeId() external view returns (uint256) {
        return beefyFeeConfig.stratFeeId(address(this));
    }

function setStratFeeId(uint256 _feeId) external onlyManager {
        beefyFeeConfig.setStratFeeId(_feeId);
        emit SetStratFeeId(_feeId);
    }

// adjust withdrawal fee
    function setWithdrawalFee(uint256 _fee) public onlyManager {
        require(_fee <= WITHDRAWAL_FEE_CAP, "!cap");
        withdrawalFee = _fee;
        emit SetWithdrawalFee(_fee);
    }

// set new vault (only for strategy upgrades)
    function setVault(address _vault) external onlyOwner {
        vault = _vault;
        emit SetVault(_vault);
    }

// set new unirouter
    function setUnirouter(address _unirouter) external onlyOwner {
        unirouter = _unirouter;
        emit SetUnirouter(_unirouter);
    }

// set new keeper to manage strat
    function setKeeper(address _keeper) external onlyManager {
        keeper = _keeper;
        emit SetKeeper(_keeper);
    }

// set new strategist address to receive strat fees
    function setStrategist(address _strategist) external {
        require(msg.sender == strategist, "!strategist");
        strategist = _strategist;
        emit SetStrategist(_strategist);
    }

// set new beefy fee address to receive beefy fees
    function setBeefyFeeRecipient(address _beefyFeeRecipient) external onlyOwner {
        beefyFeeRecipient = _beefyFeeRecipient;
        emit SetBeefyFeeRecipient(_beefyFeeRecipient);
    }

// set new fee config address to fetch fees
    function setBeefyFeeConfig(address _beefyFeeConfig) external onlyOwner {
        beefyFeeConfig = IFeeConfig(_beefyFeeConfig);
        emit SetBeefyFeeConfig(_beefyFeeConfig);
    }

function depositFee() public virtual view returns (uint256) {
        return 0;
    }

function withdrawFee() public virtual view returns (uint256) {
        return paused() ? 0 : withdrawalFee;
    }

function beforeDeposit() external virtual {}
}

Texto alterado