🩹 market: round up fixed borrow fee

exactly · May 25, 2024 · 20c0bfb · 20c0bfb
1 parent 5d1a282
commit 20c0bfb
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 147 deletions.
diff --git a/.changeset/soft-toys-breathe.md b/.changeset/soft-toys-breathe.md
@@ -0,0 +1,5 @@
+---
+"@exactly/protocol": patch
+---
+
+🩹 market: round up fixed borrow fee
diff --git a/.gas-snapshot b/.gas-snapshot
diff --git a/contracts/Market.sol b/contracts/Market.sol
@@ -319,7 +319,7 @@ contract Market is Initializable, AccessControlUpgradeable, PausableUpgradeable,
         floatingUtilization(memFloatingAssetsAverage, memFloatingDebt),
         globalUtilization(memFloatingAssetsAverage, memFloatingDebt, floatingBackupBorrowed)
       );
-      fee = assets.mulWadDown(fixedRate.mulDivDown(maturity - block.timestamp, 365 days));
+      fee = assets.mulWadUp(fixedRate.mulDivDown(maturity - block.timestamp, 365 days));
     }
     assetsOwed = assets + fee;
 

diff --git a/contracts/periphery/Previewer.sol b/contracts/periphery/Previewer.sol
@@ -256,7 +256,7 @@ contract Previewer {
         : pool.unassignedEarnings
     );
 
-    uint256 fees = assets.mulWadDown(
+    uint256 fees = assets.mulWadUp(
       market.interestRateModel().fixedBorrowRate(
         maturity,
         assets,

diff --git a/test/Market.t.sol b/test/Market.t.sol
@@ -878,7 +878,7 @@ contract MarketTest is Test {
     // ATTACKER deposits just 1 at maturity, claiming all the unassigned earnings
     // by only providing 1 principal
     uint256 positionAssets = market.depositAtMaturity(maturity, 1, 0, attacker);
-    assertEq(positionAssets, 1);
+    assertEq(positionAssets, 2);
   }
 
   function testBorrowFromFreeLunchShouldNotRevertWithFloatingFullUtilization() external {
@@ -1862,7 +1862,7 @@ contract MarketTest is Test {
 
     vm.warp(2000);
     market.deposit(100 ether, address(this));
-    market.borrowAtMaturity(FixedLib.INTERVAL, 1, 1, address(this), address(this));
+    market.borrowAtMaturity(FixedLib.INTERVAL, 1, 2, address(this), address(this));
     assertApproxEqRel(market.floatingAssetsAverage(), initialBalance, 1e15);
     assertEq(market.floatingAssets(), 100 ether + initialBalance);
   }
@@ -1876,7 +1876,7 @@ contract MarketTest is Test {
     uint256 lastFloatingAssetsAverage = market.floatingAssetsAverage();
 
     vm.warp(250);
-    market.borrowAtMaturity(FixedLib.INTERVAL, 1, 1, address(this), address(this));
+    market.borrowAtMaturity(FixedLib.INTERVAL, 1, 2, address(this), address(this));
     uint256 supplyAverageFactor = uint256(1e18 - FixedPointMathLib.expWad(-int256(market.dampSpeedUp() * (250 - 218))));
     assertEq(
       market.previewFloatingAssetsAverage(),
@@ -1886,7 +1886,7 @@ contract MarketTest is Test {
     assertEq(market.previewFloatingAssetsAverage(), 20.521498717652997528 ether);
 
     vm.warp(9541);
-    market.borrowAtMaturity(FixedLib.INTERVAL, 1, 1, address(this), address(this));
+    market.borrowAtMaturity(FixedLib.INTERVAL, 1, 2, address(this), address(this));
     assertEq(market.previewFloatingAssetsAverage(), market.floatingAssets());
   }
 
@@ -1917,7 +1917,7 @@ contract MarketTest is Test {
 
     vm.warp(2000);
     market.withdraw(5 ether, address(this), address(this));
-    market.borrowAtMaturity(FixedLib.INTERVAL, 1, 1, address(this), address(this));
+    market.borrowAtMaturity(FixedLib.INTERVAL, 1, 2, address(this), address(this));
     assertApproxEqRel(market.previewFloatingAssetsAverage(), initialBalance, 1e15);
     assertEq(market.floatingAssets(), initialBalance - 5 ether);
   }
@@ -2584,7 +2584,7 @@ contract MarketTest is Test {
 
     // contract can cover all debt by repaying less than initial amount borrowed (93 < 100)
     (uint256 principal, uint256 fee) = market.fixedBorrowPositions(FixedLib.INTERVAL, address(this));
-    market.repayAtMaturity(FixedLib.INTERVAL, principal + fee, 93, address(this));
+    market.repayAtMaturity(FixedLib.INTERVAL, principal + fee, 94, address(this));
   }
 
   function testClearMaturity() external {

diff --git a/test/Previewer.t.sol b/test/Previewer.t.sol
@@ -294,15 +294,15 @@ contract PreviewerTest is Test {
     vm.warp(100 seconds);
     market.deposit(5 ether, address(this));
     Previewer.FixedPreview memory preview = previewer.previewBorrowAtMaturity(market, FixedLib.INTERVAL, 1);
-    assertEq(preview.assets, 1);
+    assertEq(preview.assets, 2);
   }
 
   function testPreviewBorrowAtMaturityWithFiveUnits() external {
     market.deposit(5 ether, address(this));
     vm.warp(100 seconds);
     market.deposit(5 ether, address(this));
     Previewer.FixedPreview memory preview = previewer.previewBorrowAtMaturity(market, FixedLib.INTERVAL, 5);
-    assertEq(preview.assets, 5);
+    assertEq(preview.assets, 6);
   }
 
   function testPreviewBorrowAtMaturityReturningAccurateAmountWithIntermediateOperations() external {

diff --git a/test/hardhat/1_auditor.ts b/test/hardhat/1_auditor.ts
@@ -70,7 +70,7 @@ describe("Auditor from Account Space", function () {
     await auditor.enterMarket(marketDAI.target);
     await priceFeedDAI.setPrice(0);
     await expect(
-      marketDAI.borrowAtMaturity(pools[0], 1, 1, account.address, account.address),
+      marketDAI.borrowAtMaturity(pools[0], 1, 2, account.address, account.address),
     ).to.be.revertedWithCustomError(auditor, "InvalidPrice");
   });