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

Use ink also for farm operations #14

Merged
merged 3 commits into from
Jan 8, 2024
+13 −16
Merged

Use ink also for farm operations #14

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf7e946
Use ink also for farm operations
oldchili Dec 31, 2023
07ac9f6
Use local var for ink before kick
oldchili Jan 8, 2024
cb17b79
Modify comment - correctly undelegate and unstake
oldchili Jan 8, 2024
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
29 changes: 13 additions & 16 deletions src/LockstakeEngine.sol
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,6 @@ interface NstJoinLike {
}

interface GemLike {
function balanceOf(address) external view returns (uint256);
function approve(address, uint256) external;
function transfer(address, uint256) external;
function transferFrom(address, address, uint256) external;
@@ -260,21 +259,18 @@ contract LockstakeEngine is Multicall {
require(farm == address(0) || farms[farm] == 1, "LockstakeEngine/non-existing-farm");
address prevFarm = urnFarms[urn];
require(prevFarm != farm, "LockstakeEngine/same-farm");
_selectFarm(urn, prevFarm, farm, ref);
(uint256 ink,) = vat.urns(ilk, urn);
_selectFarm(urn, ink, prevFarm, farm, ref);
emit SelectFarm(urn, farm, ref);
}

function _selectFarm(address urn, address prevFarm, address farm, uint16 ref) internal {
if (prevFarm != address(0)) {
uint256 balance = GemLike(prevFarm).balanceOf(address(urn));
if (balance > 0) {
LockstakeUrn(urn).withdraw(prevFarm, balance);
function _selectFarm(address urn, uint256 wad, address prevFarm, address farm, uint16 ref) internal {
if (wad > 0) {
if (prevFarm != address(0)) {
LockstakeUrn(urn).withdraw(prevFarm, wad);
}
}
if (farm != address(0)) {
uint256 balance = stkMkr.balanceOf(urn);
if (balance > 0) {
LockstakeUrn(urn).stake(farm, balance, ref);
if (farm != address(0)) {
LockstakeUrn(urn).stake(farm, wad, ref);
}
}
urnFarms[urn] = farm;
@@ -375,8 +371,9 @@ contract LockstakeEngine is Multicall {

function onKick(address urn, uint256 wad) external auth {
(uint256 ink,) = vat.urns(ilk, urn);
_selectDelegate(urn, ink + wad, urnDelegates[urn], address(0));
_selectFarm(urn, urnFarms[urn], address(0), 0);
uint256 inkBeforeKick = ink + wad;
_selectDelegate(urn, inkBeforeKick, urnDelegates[urn], address(0));
_selectFarm(urn, inkBeforeKick, urnFarms[urn], address(0), 0);
stkMkr.burn(urn, wad); // Burn the liquidated amount of staking token
// Urn confiscation happens in Dog contract where ilk vat.gem is sent to the LockstakeClipper
emit OnKick(urn, wad);
@@ -397,12 +394,12 @@ contract LockstakeEngine is Multicall {
}
mkr.burn(address(this), burn); // Burn MKR
if (left > 0) {
(uint256 ink,) = vat.urns(ilk, urn); // Get the ink value before adding the left to correctly undelegate
(uint256 ink,) = vat.urns(ilk, urn); // Get the ink value before adding the left to correctly undelegate and unstake
vat.slip(ilk, urn, int256(left));
vat.frob(ilk, urn, urn, address(0), int256(left), 0);
stkMkr.mint(urn, left);
_selectDelegate(urn, ink, urnDelegates[urn], address(0));
_selectFarm(urn, urnFarms[urn], address(0), 0);
_selectFarm(urn, ink, urnFarms[urn], address(0), 0);
}
emit OnTakeLeftovers(urn, tot, left, burn);
}