Skip to content

Commit

Permalink
Merge pull request #208 from yieldprotocol/rc/rc6-fixes
Browse files Browse the repository at this point in the history
RC6 Fixes
  • Loading branch information
alcueca authored Jun 4, 2021
2 parents e489fcb + 58d4dc8 commit c2c5334
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 33 deletions.
32 changes: 0 additions & 32 deletions contracts/Ladle.sol
Original file line number Diff line number Diff line change
Expand Up @@ -441,38 +441,6 @@ contract Ladle is LadleStorage, AccessControl() {
return cauldron.roll(vaultId, newSeriesId, newDebt.i128() - balances.art.i128()); // Change the series and debt for the vault
}

/// @dev Remove liquidity in a pool and use proceedings to repay debt
/// The liquidity tokens need to be already in the pool, unaccounted for.
/// Only before maturity. TODO: After maturity
/* function _removeAndRepay(bytes12 vaultId, DataTypes.Vault memory vault, address to, uint128 minBaseOut, uint128 minFYTokenOut)
private
returns (DataTypes.Balances memory balances)
{
DataTypes.Series memory series = getSeries(vault.seriesId);
balances = cauldron.balances(vaultId);
IPool pool = getPool(vault.seriesId);
(, uint256 base, uint256 art) = pool.burn(address(this), minBaseOut, minFYTokenOut);
uint256 repayment;
// Update accounting
if (balances.art > 0) {
repayment = (art >= balances.art) ? balances.art : art;
balances = cauldron.pour(vaultId, 0, -(repayment.u128().i128()));
series.fyToken.burn(address(this), repayment);
}
// Return base
IERC20 baseToken = IERC20(cauldron.assets(series.baseId));
baseToken.safeTransfer(to, base);
// Return fyToken
if (art - repayment > 0) {
IERC20 fyToken = IERC20(address(series.fyToken));
fyToken.safeTransfer(to, art - repayment);
}
} */

// ---- Ladle as a token holder ----

/// @dev Use fyToken in the Ladle to repay debt.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@yield-protocol/vault-v2",
"version": "0.5.0-rc5",
"version": "0.6.0-rc0",
"description": "Yield Collateralized Debt Engine v2",
"author": "Yield Inc.",
"files": [
Expand Down

0 comments on commit c2c5334

Please sign in to comment.