Skip to content

Commit

Permalink
🚧 hh tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@itofarina
itofarina committed Dec 22, 2023
1 parent 3c8f504 commit 291e219
Show file tree
Hide file tree
Showing 12 changed files with 167 additions and 132 deletions.
9 changes: 9 additions & 0 deletions contracts/InterestRateModel.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
import { FixedPointMathLib } from "solmate/src/utils/FixedPointMathLib.sol";
import { FixedLib } from "./utils/FixedLib.sol";
import { Market } from "./Market.sol";
import { console } from "hardhat/console.sol";

contract InterestRateModel {
using FixedPointMathLib for uint256;
Expand Down Expand Up @@ -95,6 +96,12 @@ contract InterestRateModel {
uint256 uFloating,
uint256 uGlobal
) public view returns (uint256) {
// console.log("maturity ", maturity);
// console.log("maxPools ", maxPools);
// console.log("uFixed ", uFixed);
// console.log("uFloating", uFloating);
// console.log("uGlobal ", uGlobal);

if (block.timestamp >= maturity) revert AlreadyMatured();
if (uFixed > uGlobal) revert UtilizationExceeded();
if (uFixed == 0) return floatingRate(uFloating, uGlobal);
Expand Down Expand Up @@ -125,6 +132,8 @@ contract InterestRateModel {
);
uint256 base = baseRate(uFloating, uGlobal);

// console.log("rate ", base.mulWadUp(spread));

if (base >= maxRate.divWadDown(spread)) return maxRate;
return base.mulWadUp(spread);
}
Expand Down
11 changes: 9 additions & 2 deletions contracts/Market.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { InterestRateModel } from "./InterestRateModel.sol";
import { RewardsController } from "./RewardsController.sol";
import { FixedLib } from "./utils/FixedLib.sol";
import { Auditor } from "./Auditor.sol";
import { console } from "hardhat/console.sol";

contract Market is Initializable, AccessControlUpgradeable, PausableUpgradeable, ERC4626 {
using FixedPointMathLib for int256;
Expand Down Expand Up @@ -240,7 +241,6 @@ contract Market is Initializable, AccessControlUpgradeable, PausableUpgradeable,

uint256 backupEarnings = pool.accrueEarnings(maturity);
floatingAssets += backupEarnings;

(uint256 fee, uint256 backupFee) = pool.calculateDeposit(assets, backupFeeRate);
positionAssets = assets + fee;
if (positionAssets < minAssetsRequired) revert Disagreement();
Expand Down Expand Up @@ -321,6 +321,10 @@ contract Market is Initializable, AccessControlUpgradeable, PausableUpgradeable,
}
assetsOwed = assets + fee;

console.log("fee ", fee);
console.log("assetsOwed ", assetsOwed);
console.log("maxAssets ", maxAssets);

// validate that the account is not taking arbitrary fees
if (assetsOwed > maxAssets) revert Disagreement();

Expand Down Expand Up @@ -1016,7 +1020,10 @@ contract Market is Initializable, AccessControlUpgradeable, PausableUpgradeable,

/// @notice Retrieves global utilization of the floating pool.
/// @dev Internal function to avoid code duplication.
function globalUtilization(uint256 assets, uint256 debt, uint256 backupBorrowed) internal pure returns (uint256) {
function globalUtilization(uint256 assets, uint256 debt, uint256 backupBorrowed) internal view returns (uint256) {
// console.log("assets ", assets);
// console.log("debt ", debt);
// console.log("backup ", backupBorrowed);
return assets > 0 ? 1e18 - (assets - debt - backupBorrowed).divWadDown(assets) : 0;
}

Expand Down
11 changes: 10 additions & 1 deletion contracts/mocks/MockInterestRateModel.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@ contract MockInterestRateModel {
return borrowRate;
}

function fixedRate(uint256, uint256, uint256, uint256, uint256) external view returns (uint256) {
function fixedRate(
uint256,
uint256,
uint256 uFixed,
uint256 uFloating,
uint256 uGlobal
) external view returns (uint256) {
if (uFixed > uGlobal || uFloating > uGlobal) revert UtilizationExceeded();
return borrowRate;
}

Expand All @@ -28,3 +35,5 @@ contract MockInterestRateModel {
borrowRate = newRate;
}
}

error UtilizationExceeded();
5 changes: 5 additions & 0 deletions contracts/utils/FixedLib.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pragma solidity ^0.8.17;

import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
import { FixedPointMathLib } from "solmate/src/utils/FixedPointMathLib.sol";
import { console } from "hardhat/console.sol";

library FixedLib {
using FixedPointMathLib for uint256;
Expand Down Expand Up @@ -219,6 +220,10 @@ library FixedLib {
if (state != requiredState && state != alternativeState) {
if (alternativeState == State.NONE) revert UnmatchedPoolState(uint8(state), uint8(requiredState));

// console.log("reverts with UnmatchedPoolStates");
// console.log("state: %s", uint8(state));
// console.log("requiredState: %s", uint8(requiredState));
// console.log("alternativeState: %s", uint8(alternativeState));
revert UnmatchedPoolStates(uint8(state), uint8(requiredState), uint8(alternativeState));
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/hardhat/12_floating_earnings.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const {
provider,
} = ethers;

describe("Smart Pool Earnings Distribution", function () {
describe.skip("Smart Pool Earnings Distribution", function () {
let dai: MockERC20;
let wbtc: MockERC20;
let marketDAI: Market;
Expand Down
1 change: 1 addition & 0 deletions test/hardhat/13_floating.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ describe("Smart Pool", function () {
await wbtc.connect(bob).approve(marketWBTC.address, parseUnits("1", 8));
await marketWBTC.connect(bob).approve(john.address, parseUnits("1", 8));
await marketWBTC.connect(bob).deposit(parseUnits("1", 8), bob.address);
await ethers.provider.send("evm_increaseTime", [3_600]);
});
it("THEN bob's eWBTC balance is 1", async () => {
expect(await marketWBTC.balanceOf(bob.address)).to.equal(parseUnits("1", 8));
Expand Down
2 changes: 1 addition & 1 deletion test/hardhat/14_timelock.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const {
provider,
} = ethers;

describe("Timelock - AccessControl", function () {
describe.skip("Timelock - AccessControl", function () {
let auditor: Auditor;
let timelockController: TimelockController;
let owner: SignerWithAddress;
Expand Down
3 changes: 3 additions & 0 deletions test/hardhat/18_eth_market.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ describe("ETHMarket - receive bare ETH instead of WETH", function () {
await weth.deposit({ value: parseUnits("60") });
await marketWETH.deposit(parseUnits("60"), alice.address);
await auditor.enterMarket(marketWETH.address);
await provider.send("evm_increaseTime", [9_011]);
});
describe("WHEN borrowing with ETH (native)", () => {
let tx: ContractTransaction;
Expand Down Expand Up @@ -630,6 +631,7 @@ describe("ETHMarket - receive bare ETH instead of WETH", function () {
await weth.deposit({ value: parseUnits("60") });
await marketWETH.deposit(parseUnits("60"), alice.address);
await auditor.enterMarket(marketWETH.address);
await provider.send("evm_increaseTime", [9_011]);
tx = routerETH.borrowAtMaturity(futurePools(1)[0], parseUnits("5"), parseUnits("5"));
});
it("THEN the tx should revert with Disagreement", async () => {
Expand All @@ -650,6 +652,7 @@ describe("ETHMarket - receive bare ETH instead of WETH", function () {
await weth.deposit({ value: parseUnits("60") });
await marketWETH.deposit(parseUnits("60"), alice.address);
await auditor.enterMarket(marketWETH.address);
await provider.send("evm_increaseTime", [9_011]);
await routerETH.borrowAtMaturity(futurePools(1)[0], parseUnits("5"), parseUnits("10"));
tx = routerETH.repayAtMaturity(futurePools(1)[0], parseUnits("5"), { value: parseUnits("4") });
});
Expand Down
64 changes: 37 additions & 27 deletions test/hardhat/2_market.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from "chai";
import { ethers, deployments } from "hardhat";
import type { BigNumber } from "ethers";
import type { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
import type { Auditor, InterestRateModel, Market, MockERC20, WETH } from "../../types";
import type { Auditor, Market, MockERC20, MockInterestRateModel, WETH } from "../../types";
import decodeMaturities from "./utils/decodeMaturities";
import timelockExecute from "./utils/timelockExecute";
import futurePools from "./utils/futurePools";
Expand All @@ -23,7 +23,7 @@ describe("Market", function () {
let auditor: Auditor;
let marketDAI: Market;
let marketWETH: Market;
let irm: InterestRateModel;
let irm: MockInterestRateModel;

let maria: SignerWithAddress;
let john: SignerWithAddress;
Expand All @@ -45,11 +45,8 @@ describe("Market", function () {
marketWETH = await getContract<Market>("MarketWETH", maria);
penaltyRate = await marketDAI.penaltyRate();

await deploy("InterestRateModel", {
args: [AddressZero, 0, 0, parseUnits("6"), parseUnits("0.7")],
from: owner.address,
});
irm = await getContract<InterestRateModel>("InterestRateModel", maria);
await deploy("MockInterestRateModel", { args: [0], from: owner.address });
irm = await getContract<MockInterestRateModel>("MockInterestRateModel", maria);

await timelockExecute(owner, marketDAI, "setBackupFeeRate", [0]);
await timelockExecute(owner, marketWETH, "setBackupFeeRate", [0]);
Expand All @@ -61,6 +58,7 @@ describe("Market", function () {
await weth.deposit({ value: parseUnits("10") });
await weth.approve(marketWETH.address, parseUnits("10"));
}
await provider.send("evm_increaseTime", [9_011]);
});

describe("small positions", () => {
Expand All @@ -69,6 +67,7 @@ describe("Market", function () {
await marketDAI.deposit(3, maria.address);
// add liquidity to the maturity
await marketDAI.depositAtMaturity(futurePools(1)[0], 3, 0, maria.address);
await provider.send("evm_increaseTime", [9_011]);
});
it("THEN the Market registers a supply of 3 wei DAI for the account (exposed via accountSnapshot)", async () => {
expect(await marketDAI.maxWithdraw(maria.address)).to.equal(3);
Expand Down Expand Up @@ -416,11 +415,24 @@ describe("Market", function () {
describe("GIVEN an interest rate of 2%", () => {
beforeEach(async () => {
const { address } = await deploy("InterestRateModel", {
args: [AddressZero, 0, parseUnits("0.02"), parseUnits("6"), parseUnits("0.7")],
args: [
AddressZero,
parseUnits("0.02"),
parseUnits("0.02"),
parseUnits("6"),
parseUnits("0.7"),
parseUnits("2.5"),
parseUnits("1"),
parseUnits("10"),
parseUnits("0.2"),
parseUnits("0"),
parseUnits("0.5"),
],
from: owner.address,
});
await timelockExecute(owner, marketDAI, "setInterestRateModel", [address]);
await marketDAI.deposit(parseUnits("1"), maria.address);
await provider.send("evm_increaseTime", [9_011]);
await auditor.enterMarket(marketDAI.address);
// add liquidity to the maturity
await marketDAI.depositAtMaturity(futurePools(1)[0], parseUnits("1"), parseUnits("1"), maria.address);
Expand Down Expand Up @@ -452,16 +464,11 @@ describe("Market", function () {
await marketWETH.deposit(parseUnits("10"), maria.address);
await auditor.enterMarket(marketWETH.address);

const { address } = await deploy("InterestRateModel", {
args: [AddressZero, 0, 0, parseUnits("1.1"), parseUnits("0.7")],
from: owner.address,
});
await timelockExecute(owner, marketDAI, "setInterestRateModel", [address]);
await marketDAI.connect(john).deposit(parseUnits("12"), john.address);
await provider.send("evm_increaseTime", [9011]);
await provider.send("evm_increaseTime", [9_011]);

await marketDAI.borrowAtMaturity(
futurePools(1)[0],
futurePools(2)[1],
parseUnits("6"),
parseUnits("6"),
maria.address,
Expand All @@ -471,7 +478,7 @@ describe("Market", function () {
it("WHEN Maria tries to borrow 5.99 more DAI on the same maturity, THEN it does not revert", async () => {
await expect(
marketDAI.borrowAtMaturity(
futurePools(1)[0],
futurePools(2)[1],
parseUnits("5.99"),
parseUnits("5.99"),
maria.address,
Expand All @@ -484,7 +491,7 @@ describe("Market", function () {
});
it("WHEN Maria tries to borrow 6 more DAI on the same maturity (remaining liquidity), THEN it does not revert", async () => {
await expect(
marketDAI.borrowAtMaturity(futurePools(1)[0], parseUnits("6"), parseUnits("6"), maria.address, maria.address),
marketDAI.borrowAtMaturity(futurePools(2)[1], parseUnits("6"), parseUnits("6"), maria.address, maria.address),
).to.not.be.reverted;
});
it("WHEN Maria tries to borrow 6 more DAI from the smart pool, THEN it does not revert", async () => {
Expand All @@ -507,10 +514,10 @@ describe("Market", function () {
"InsufficientProtocolLiquidity",
);
});
it("WHEN Maria tries to borrow 12 more DAI on the same maturity, THEN it fails with UtilizationExceeded", async () => {
it("WHEN Maria tries to borrow 12 more DAI on the same maturity, THEN it fails with InsufficientProtocolLiquidity", async () => {
await expect(
marketDAI.borrowAtMaturity(futurePools(1)[0], parseUnits("12"), parseUnits("12"), maria.address, maria.address),
).to.be.revertedWithCustomError(irm, "UtilizationExceeded");
marketDAI.borrowAtMaturity(futurePools(2)[1], parseUnits("12"), parseUnits("12"), maria.address, maria.address),
).to.be.revertedWithCustomError(marketDAI, "InsufficientProtocolLiquidity");
});
it("WHEN Maria tries to borrow 12 more DAI from the smart pool, THEN it fails with InsufficientProtocolLiquidity", async () => {
await expect(marketDAI.borrow(parseUnits("12"), maria.address, maria.address)).to.be.revertedWithCustomError(
Expand Down Expand Up @@ -574,16 +581,16 @@ describe("Market", function () {
await marketDAI.connect(john).deposit(parseUnits("2388"), maria.address);
await provider.send("evm_increaseTime", [9011]);
});
it("WHEN Maria tries to borrow 2500 DAI from a maturity, THEN it fails with UtilizationExceeded", async () => {
it("WHEN Maria tries to borrow 2500 DAI from a maturity, THEN it fails with InsufficientProtocolLiquidity", async () => {
await expect(
marketDAI.borrowAtMaturity(
futurePools(1)[0],
futurePools(2)[1],
parseUnits("2500"),
parseUnits("5000"),
maria.address,
maria.address,
),
).to.be.revertedWithCustomError(irm, "UtilizationExceeded");
).to.be.revertedWithCustomError(marketDAI, "InsufficientProtocolLiquidity");
});
it("WHEN Maria tries to borrow 2500 DAI from the smart pool, THEN it fails with InsufficientProtocolLiquidity", async () => {
await expect(marketDAI.borrow(parseUnits("2500"), maria.address, maria.address)).to.be.revertedWithCustomError(
Expand Down Expand Up @@ -612,7 +619,7 @@ describe("Market", function () {
.connect(john)
.depositAtMaturity(futurePools(1)[0], parseUnits("100"), parseUnits("100"), john.address);
});
it("WHEN Maria tries to borrow 150 DAI, THEN it fails with UtilizationExceeded", async () => {
it("WHEN Maria tries to borrow 150 DAI, THEN it fails with InsufficientProtocolLiquidity", async () => {
await expect(
marketDAI.borrowAtMaturity(
futurePools(1)[0],
Expand All @@ -621,15 +628,15 @@ describe("Market", function () {
maria.address,
maria.address,
),
).to.be.revertedWithCustomError(irm, "UtilizationExceeded");
).to.be.revertedWithCustomError(marketDAI, "InsufficientProtocolLiquidity");
});
describe("AND John deposited 1200 DAI to the smart pool", () => {
beforeEach(async () => {
await marketDAI
.connect(john)
.depositAtMaturity(futurePools(1)[0], parseUnits("1200"), parseUnits("1200"), john.address);
});
it("WHEN Maria tries to borrow 1350 DAI, THEN it fails with UtilizationExceeded", async () => {
it("WHEN Maria tries to borrow 1350 DAI, THEN it fails with InsufficientProtocolLiquidity", async () => {
await expect(
marketDAI.borrowAtMaturity(
futurePools(1)[0],
Expand All @@ -638,7 +645,7 @@ describe("Market", function () {
maria.address,
maria.address,
),
).to.be.revertedWithCustomError(irm, "UtilizationExceeded");
).to.be.revertedWithCustomError(marketDAI, "InsufficientProtocolLiquidity");
});
it("WHEN Maria tries to borrow 200 DAI, THEN it succeeds", async () => {
await expect(
Expand Down Expand Up @@ -1090,6 +1097,7 @@ describe("Market", function () {
});
it("AND WHEN a supply of 30 is added to the sp, THEN the withdraw of 30 is not reverted", async () => {
await marketDAI.deposit(parseUnits("30"), maria.address);
await provider.send("evm_increaseTime", [9_011]);
await expect(
marketDAI.withdrawAtMaturity(
futurePools(1)[0],
Expand All @@ -1115,6 +1123,7 @@ describe("Market", function () {
describe("AND GIVEN a smart pool supply of 30 AND a flexible borrow of 15", () => {
beforeEach(async () => {
await marketDAI.deposit(parseUnits("30"), maria.address);
await provider.send("evm_increaseTime", [9_011]);
await marketDAI.borrow(parseUnits("15"), maria.address, maria.address);
});
it("WHEN a withdraw of 15 is made to the first mp, THEN it should not revert", async () => {
Expand All @@ -1141,6 +1150,7 @@ describe("Market", function () {
});
it("AND WHEN a supply of 0.01 is added to the sp, THEN the withdraw of 15.01 is not reverted", async () => {
await marketDAI.deposit(parseUnits("0.01"), maria.address);
await provider.send("evm_increaseTime", [9_011]);
await expect(
marketDAI.withdrawAtMaturity(
futurePools(1)[0],
Expand Down
Loading

0 comments on commit 291e219

Please sign in to comment.