Skip to content
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

Fixes to improve readability and gas usage #1

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixes to improve readability and gas usage #1

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc2d226
fix typo and use named struct params for initializing
kyriediculous May 31, 2022
22f4cca
use ownableupgradeable
kyriediculous May 31, 2022
7e58a41
rewrite deposit checker conditionals
kyriediculous May 31, 2022
f2e3ee0
no need to set exec to false when it's initted to false
kyriediculous May 31, 2022
b401fb1
remove else condition ,flip statement
kyriediculous May 31, 2022
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
60 changes: 26 additions & 34 deletions contracts/Resolver.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
pragma solidity 0.8.4;

import "./IResolver.sol";
import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";

abstract contract Resolver is IResolver, Initializable {
abstract contract Resolver is IResolver, OwnableUpgradeable {

struct Protocol {
string name;
Expand All @@ -15,41 +15,37 @@ abstract contract Resolver is IResolver, Initializable {
uint256 depositInterval;
uint256 depositThreshold;
uint256 lastDeposit;
uint256 rebaseInternval;
uint256 rebaseInterval;
uint256 rebaseThreshold;
uint256 lastRebase;
}

mapping(address => Protocol) protocols;
address gov;

modifier onlyGov() {
require(msg.sender == gov);
_;
}

function initialize() external initializer {
gov = msg.sender;
__Context_init_unchained();
__Ownable_init_unchained();
}

function depositChecker(address _tenderizer)
external
override
returns (bool canExec, bytes memory execPayload){
Protocol storage protocol = protocols[_tenderizer];

if (protocol.lastDeposit + protocol.depositInterval < block.timestamp) {
return (canExec, execPayload);
}

uint256 tenderizerSteakBal = protocol.steak.balanceOf(_tenderizer);
uint256 blockTimestamp = block.timestamp;

if(tenderizerSteakBal > protocol.depositThreshold
&& (protocol.lastDeposit == 0
|| protocol.lastDeposit + protocol.depositInterval < blockTimestamp)) {
protocol.lastDeposit = blockTimestamp;
if (tenderizerSteakBal >= protocol.depositThreshold) {
canExec = true;
execPayload = abi.encode(tenderizerSteakBal);
} else {
canExec = false;
execPayload = abi.encode();
}

protocol.lastDeposit = block.timestamp;
}

function rebaseChecker(address _tenderizer)
Expand All @@ -66,23 +62,19 @@ abstract contract Resolver is IResolver, Initializable {
address _stakingContract,
uint256 _depositInterval,
uint256 _depositThreshold,
uint256 _rebaseInternval,
uint256 _rebaseInterval,
uint256 _rebaseThreshold
) onlyGov external override {
protocols[_tenderizer] = Protocol(
_name,
_steak,
_stakingContract,
_depositInterval,
_depositThreshold,
0,
_rebaseInternval,
_rebaseThreshold,
0
);
}

function setGov(address _gov) onlyGov external override {
gov = _gov;
) onlyOwner external override {
protocols[_tenderizer] = Protocol({
name: _name,
steak: _steak,
stakingContract: _stakingContract,
depositInterval: _depositInterval,
depositThreshold: _depositThreshold,
lastDeposit: block.timestamp - _depositInterval, // initialize checkpoint
rebaseInterval: _rebaseInterval,
rebaseThreshold: _rebaseThreshold,
lastRebase: block.timestamp - _rebaseInterval // initialize checkpoint
});
}
}