Skip to content

OIP-2 Dripper N-07 #1285

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 1 commit into from
Apr 17, 2023
Merged

OIP-2 Dripper N-07 #1285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions contracts/contracts/vault/VaultCore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ contract VaultCore is VaultStorage {
// Write dripper state
dripperReserve = _dripperReserve;
dripper = Dripper({
perBlock: uint128(_dripperReserve / _dripDuration),
perSecond: uint128(_dripperReserve / _dripDuration),
lastCollect: uint64(block.timestamp),
dripDuration: _dripper.dripDuration // must use stored value
});
Expand Down Expand Up @@ -478,7 +478,7 @@ contract VaultCore is VaultStorage {
returns (uint256)
{
uint256 elapsed = block.timestamp - _drip.lastCollect;
uint256 allowed = (elapsed * _drip.perBlock);
uint256 allowed = (elapsed * _drip.perSecond);
return (allowed > _reserve) ? _reserve : allowed;
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/vault/VaultStorage.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ contract VaultStorage is Initializable, Governable {
// Dripper config/state
struct Dripper {
uint64 lastCollect;
uint128 perBlock;
uint128 perSecond;
uint64 dripDuration;
}
Dripper public dripper;
Expand Down