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

Jump to bottom

test(hardhat): revert to old tests #463

Merged
merged 4 commits into from
Sep 15, 2023
Merged

test(hardhat): revert to old tests #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c31fb33
test(hardhat): revert to old tests
Rubilmax Sep 1, 2023
1f73940
test(hardhat): fix block mining
Rubilmax Sep 1, 2023
4877d5f
test(hardhat): forward timestamp between each interaction
Rubilmax Sep 1, 2023
65423ed
test(hardhat): allow same block timestamps
Rubilmax Sep 1, 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
8 changes: 2 additions & 6 deletions hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,9 @@ const config: HardhatUserConfig = {
chainId: 1,
gasPrice: 0,
initialBaseFeePerGas: 0,
allowBlocksWithSameTimestamp: true,
accounts: {
count: 252,
},
mining: {
mempool: {
order: "fifo",
},
count: 202, // must be even
},
},
},
Expand Down
92 changes: 60 additions & 32 deletions test/hardhat/Morpho.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { SignerWithAddress } from "@nomicfoundation/hardhat-ethers/signers";
import { setNextBlockTimestamp } from "@nomicfoundation/hardhat-network-helpers/dist/src/helpers/time";
import { expect } from "chai";
import { AbiCoder, MaxUint256, keccak256, toBigInt } from "ethers";
import hre from "hardhat";
Expand Down Expand Up @@ -27,10 +28,22 @@ const identifier = (marketParams: MarketParamsStruct) => {
return Buffer.from(keccak256(encodedMarket).slice(2), "hex");
};

const logProgress = (name: string, i: number, max: number) => {
if (i % 10 == 0) console.log("[" + name + "]", Math.floor((100 * i) / max), "%");
};

const randomForwardTimestamp = async () => {
const block = await hre.ethers.provider.getBlock("latest");
const elapsed = random() < 1 / 2 ? 0 : (1 + Math.floor(random() * 100)) * 12; // 50% of the time, don't go forward in time.

await setNextBlockTimestamp(block!.timestamp + elapsed);
};

describe("Morpho", () => {
let signers: SignerWithAddress[];
let admin: SignerWithAddress;
let liquidator: SignerWithAddress;
let suppliers: SignerWithAddress[];
let borrowers: SignerWithAddress[];

let morpho: Morpho;
let borrowable: ERC20Mock;
Expand All @@ -42,8 +55,6 @@ describe("Morpho", () => {
let marketParams: MarketParamsStruct;
let id: Buffer;

let nbLiquidations: number;

const updateMarket = (newMarket: Partial<MarketParamsStruct>) => {
marketParams = { ...marketParams, ...newMarket };
id = identifier(marketParams);
Expand All @@ -52,10 +63,11 @@ describe("Morpho", () => {
beforeEach(async () => {
const allSigners = await hre.ethers.getSigners();

signers = allSigners.slice(0, -2);
[admin, liquidator] = allSigners.slice(-2);
const users = allSigners.slice(0, -2);

nbLiquidations = Math.floor((signers.length - 2) / 2);
[admin, liquidator] = allSigners.slice(-2);
suppliers = users.slice(0, users.length / 2);
borrowers = users.slice(users.length / 2);

const ERC20MockFactory = await hre.ethers.getContractFactory("ERC20Mock", admin);

Expand Down Expand Up @@ -90,11 +102,11 @@ describe("Morpho", () => {

const morphoAddress = await morpho.getAddress();

for (const signer of signers) {
await borrowable.setBalance(signer.address, initBalance);
await borrowable.connect(signer).approve(morphoAddress, MaxUint256);
await collateral.setBalance(signer.address, initBalance);
await collateral.connect(signer).approve(morphoAddress, MaxUint256);
for (const user of users) {
await borrowable.setBalance(user.address, initBalance);
await borrowable.connect(user).approve(morphoAddress, MaxUint256);
await collateral.setBalance(user.address, initBalance);
await collateral.connect(user).approve(morphoAddress, MaxUint256);
}

await borrowable.setBalance(admin.address, initBalance);
Expand All @@ -109,38 +121,54 @@ describe("Morpho", () => {
});

it("should simulate gas cost [main]", async () => {
for (let i = 0; i < signers.length; ++i) {
console.log("[main]", i, "/", signers.length);
for (let i = 0; i < suppliers.length; ++i) {
logProgress("main", i, suppliers.length);

const user = signers[i];
const supplier = suppliers[i];

let assets = BigInt.WAD * toBigInt(1 + Math.floor(random() * 100));

await morpho.connect(user).supply(marketParams, assets, 0, user.address, "0x");
await morpho.connect(user).withdraw(marketParams, assets / 2n, 0, user.address, user.address);
const totalSupplyAssets = (await morpho.market(id)).totalSupplyAssets;
const totalBorrowAssets = (await morpho.market(id)).totalBorrowAssets;
const liquidity = totalSupplyAssets - totalBorrowAssets;
await randomForwardTimestamp();

assets = BigInt.min(assets, liquidity / 2n);
await morpho.connect(supplier).supply(marketParams, assets, 0, supplier.address, "0x");

await morpho.connect(user).supplyCollateral(marketParams, assets, user.address, "0x");
await morpho.connect(user).borrow(marketParams, assets / 2n, 0, user.address, user.address);
await morpho.connect(user).repay(marketParams, assets / 4n, 0, user.address, "0x");
await morpho.connect(user).withdrawCollateral(marketParams, assets / 8n, user.address, user.address);
}
await randomForwardTimestamp();

await morpho.connect(supplier).withdraw(marketParams, assets / 2n, 0, supplier.address, supplier.address);

await hre.network.provider.send("evm_setAutomine", [true]);
const borrower = borrowers[i];

const market = await morpho.market(id);
const liquidity = market.totalSupplyAssets - market.totalBorrowAssets;

assets = assets.min(liquidity / 2n);

await randomForwardTimestamp();

await morpho.connect(borrower).supplyCollateral(marketParams, assets, borrower.address, "0x");

await randomForwardTimestamp();

await morpho.connect(borrower).borrow(marketParams, assets / 2n, 0, borrower.address, borrower.address);

await randomForwardTimestamp();

await morpho.connect(borrower).repay(marketParams, assets / 4n, 0, borrower.address, "0x");

await randomForwardTimestamp();

await morpho.connect(borrower).withdrawCollateral(marketParams, assets / 8n, borrower.address, borrower.address);
}
});

it("should simulate gas cost [liquidations]", async () => {
for (let i = 0; i < nbLiquidations; ++i) {
if (i % 20 == 0) console.log("[liquidations]", Math.floor((100 * i) / nbLiquidations), "%");
for (let i = 0; i < suppliers.length; ++i) {
logProgress("liquidations", i, suppliers.length);

const user = signers[i];
const borrower = signers[nbLiquidations + i];
const user = suppliers[i];
const borrower = borrowers[i];

const lltv = (BigInt.WAD * toBigInt(i + 1)) / toBigInt(nbLiquidations + 1);
const lltv = (BigInt.WAD * toBigInt(i + 1)) / toBigInt(suppliers.length + 1);
const assets = BigInt.WAD * toBigInt(1 + Math.floor(random() * 100));
const borrowedAmount = assets.wadMulDown(lltv - 1n);

Expand Down Expand Up @@ -177,7 +205,7 @@ describe("Morpho", () => {
});

it("should simuate gas cost [flashLoans]", async () => {
const user = signers[0];
const user = borrowers[0];
const assets = BigInt.WAD;

await morpho.connect(user).supply(marketParams, assets, 0, user.address, "0x");
Expand Down