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

Repay/Withdraw max #123

Closed
wants to merge 12 commits into from
Closed

Repay/Withdraw max #123

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e1d53c6
feat: repay/withdraw all
MerlinEgalite Jul 12, 2023
d5036b7
test: re-add empty market tests
MerlinEgalite Jul 15, 2023
8264939
Merge branch 'refactor/morpho-utils' of github.com:morpho-labs/blue i…
Rubilmax Jul 19, 2023
24cdfb4
fix(repay/withdraw): edge case
Rubilmax Jul 19, 2023
ea73dd3
Update src/Blue.sol
Rubilmax Jul 19, 2023
ede9cee
Update src/Blue.sol
Rubilmax Jul 19, 2023
2e471cc
Merge pull request #149 from morpho-labs/refactor/repay-withdraw-all-…
Rubilmax Jul 20, 2023
2b8c672
Merge branch 'main' of github.com:morpho-labs/blue into feat/repay-wi…
Rubilmax Jul 21, 2023
1b98702
Merge branch 'main' of github.com:morpho-labs/blue into feat/repay-wi…
Rubilmax Jul 26, 2023
0b37029
Merge branch 'main' of github.com:morpho-labs/blue into feat/repay-wi…
Rubilmax Aug 1, 2023
783983a
test(blue): update repay/withdraw all tests
Rubilmax Aug 1, 2023
6c3f418
Merge branch 'main' of github.com:morpho-labs/blue into feat/repay-wi…
Rubilmax Aug 4, 2023
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
27 changes: 21 additions & 6 deletions src/Blue.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,22 @@ contract Blue {
function withdraw(Market calldata market, uint256 amount, address onBehalf) external {
makcandrov marked this conversation as resolved.
Show resolved Hide resolved
Id id = market.id();
require(lastUpdate[id] != 0, "unknown market");
require(amount != 0, "zero amount");
require(isSenderOrIsApproved(onBehalf), "not approved");

accrueInterests(market, id);

uint256 shares = amount.toSharesUp(totalSupply[id], totalSupplyShares[id]);
uint256 shares;
if (amount == type(uint256).max) {
amount = supplyShare[id][onBehalf].toAssetsDown(totalSupply[id], totalSupplyShares[id]);
shares = supplyShare[id][onBehalf];
} else {
shares = amount.toSharesUp(totalSupply[id], totalSupplyShares[id]);
}

require(amount != 0, "zero amount");
Rubilmax marked this conversation as resolved.
Show resolved Hide resolved

supplyShare[id][onBehalf] -= shares;
totalSupplyShares[id] -= shares;

totalSupply[id] -= amount;

require(totalBorrow[id] <= totalSupply[id], "not enough liquidity");
Expand Down Expand Up @@ -162,14 +169,21 @@ contract Blue {
function repay(Market calldata market, uint256 amount, address onBehalf) external {
Id id = market.id();
require(lastUpdate[id] != 0, "unknown market");
require(amount != 0, "zero amount");

accrueInterests(market, id);

uint256 shares = amount.toSharesDown(totalBorrow[id], totalBorrowShares[id]);
uint256 shares;
if (amount == type(uint256).max) {
amount = borrowShare[id][onBehalf].toAssetsUp(totalBorrow[id], totalBorrowShares[id]);
shares = borrowShare[id][onBehalf];
} else {
shares = amount.toSharesDown(totalBorrow[id], totalBorrowShares[id]);
}

require(amount != 0, "zero amount");

borrowShare[id][onBehalf] -= shares;
totalBorrowShares[id] -= shares;

totalBorrow[id] -= amount;

market.borrowableAsset.safeTransferFrom(msg.sender, address(this), amount);
Expand All @@ -193,6 +207,7 @@ contract Blue {
function withdrawCollateral(Market calldata market, uint256 amount, address onBehalf) external {
Id id = market.id();
require(lastUpdate[id] != 0, "unknown market");
if (amount == type(uint256).max) amount = collateral[id][msg.sender];
Rubilmax marked this conversation as resolved.
Show resolved Hide resolved
require(amount != 0, "zero amount");
require(isSenderOrIsApproved(onBehalf), "not approved");

Expand Down
43 changes: 43 additions & 0 deletions test/forge/Blue.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,20 @@ contract BlueTest is Test {
);
}

function testWithdrawAll(uint256 amountLent, uint256 amountBorrowed) public {
amountLent = bound(amountLent, 1, 2 ** 64);
amountBorrowed = bound(amountBorrowed, 1, 2 ** 64);
vm.assume(amountLent >= amountBorrowed);

borrowableAsset.setBalance(address(this), amountLent);
blue.supply(market, amountLent, address(this));
blue.withdraw(market, type(uint256).max, address(this));

assertEq(blue.supplyShare(id, address(this)), 0, "supply share");
assertEq(borrowableAsset.balanceOf(address(this)), amountLent, "this balance");
assertEq(borrowableAsset.balanceOf(address(blue)), 0, "blue balance");
}

function testCollateralRequirements(
uint256 amountCollateral,
uint256 amountBorrowed,
Expand Down Expand Up @@ -447,6 +461,23 @@ contract BlueTest is Test {
assertEq(borrowableAsset.balanceOf(address(blue)), amountLent - amountBorrowed + amountRepaid, "blue balance");
}

function testRepayAll(uint256 amountLent, uint256 amountBorrowed) public {
amountLent = bound(amountLent, 1, 2 ** 64);
amountBorrowed = bound(amountBorrowed, 1, amountLent);

borrowableAsset.setBalance(address(this), amountLent);
blue.supply(market, amountLent, address(this));

vm.startPrank(BORROWER);
blue.borrow(market, amountBorrowed, BORROWER);
blue.repay(market, type(uint256).max, BORROWER);
vm.stopPrank();

assertEq(blue.borrowShare(id, BORROWER), 0, "borrow share");
assertEq(borrowableAsset.balanceOf(BORROWER), 0, "BORROWER balance");
assertEq(borrowableAsset.balanceOf(address(blue)), amountLent, "blue balance");
}

function testSupplyCollateralOnBehalf(uint256 amount, address onBehalf) public {
vm.assume(onBehalf != address(blue));
amount = bound(amount, 1, 2 ** 64);
Expand Down Expand Up @@ -479,6 +510,18 @@ contract BlueTest is Test {
assertEq(collateralAsset.balanceOf(address(blue)), amountDeposited - amountWithdrawn, "blue balance");
}

function testWithdrawCollateralAll(uint256 amountDeposited) public {
amountDeposited = bound(amountDeposited, 1, 2 ** 64);

collateralAsset.setBalance(address(this), amountDeposited);
blue.supplyCollateral(market, amountDeposited, address(this));
blue.withdrawCollateral(market, type(uint256).max, address(this));

assertEq(blue.collateral(id, address(this)), 0, "this collateral");
assertEq(collateralAsset.balanceOf(address(this)), amountDeposited, "this balance");
assertEq(collateralAsset.balanceOf(address(blue)), 0, "blue balance");
}

function testLiquidate(uint256 amountLent) public {
borrowableOracle.setPrice(1e18);
amountLent = bound(amountLent, 1000, 2 ** 64);
Expand Down