Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions deployments/bscmainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -23443,7 +23443,7 @@
]
},
"PoolLens": {
"address": "0x59a96A6f463d57dA20bcc15359e55310D1CAD8B0",
"address": "0x9459a33c0a4EAd7794497Da85867859CdB06aCc5",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -53743,7 +53743,7 @@
]
},
"Shortfall_Implementation": {
"address": "0x4F41EcAce160f6ef893102D64f84E8040c06d8B0",
"address": "0xb1a3D8673e22c5eb9466Da90C52D081652a83F9f",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -68600,7 +68600,7 @@
]
},
"VTokenImpl": {
"address": "0x228Ea224d62D14a2e2cb9B43083aE43954C39B67",
"address": "0x5303DE0aa502DE5816EEC465ee8563c461d1E5b6",
"abi": [
{
"inputs": [
Expand Down
34 changes: 17 additions & 17 deletions deployments/bscmainnet/PoolLens.json

Large diffs are not rendered by default.

162 changes: 81 additions & 81 deletions deployments/bscmainnet/Shortfall_Implementation.json

Large diffs are not rendered by default.

118 changes: 59 additions & 59 deletions deployments/bscmainnet/VTokenImpl.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions deployments/bscmainnet_addresses.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"JumpRateModelV2_base350bps_slope1000bps_jump30000bps_kink8000bps_bpy21024000": "0x141bEe7474E066aBCfAaE957579433e8C7b05Fb4",
"JumpRateModelV2_base350bps_slope1000bps_jump30000bps_kink8000bps_bpy42048000": "0xe9C8bfdE6ad997a0fBb57331ed15dA386284c12a",
"NativeTokenGateway_vWBNB_LiquidStakedBNB": "0x24896601A4bf1b6a27E51Cb3eff750Bd9FE00d08",
"PoolLens": "0x59a96A6f463d57dA20bcc15359e55310D1CAD8B0",
"PoolLens": "0x9459a33c0a4EAd7794497Da85867859CdB06aCc5",
"PoolLensR1": "0x25E215CcE40bD849B7c286912B85212F984Ff1e0",
"PoolLensR2": "0x0461c613433d42C06831C8e60Bf0C86FC9495072",
"PoolRegistry": "0x9F7b01A536aFA00EF10310A162877fd792cD0666",
Expand Down Expand Up @@ -137,7 +137,7 @@
"RewardsDistributor_Tron_3_Proxy": "0x08e4AFd80A5849FDBa4bBeea86ed470D697e4C54",
"SetCheckpointBscmainnet": "0xe17aB0c10be44c64d9B41385a2d3C2335f57701B",
"Shortfall": "0xf37530A8a810Fcb501AA0Ecd0B0699388F0F2209",
"Shortfall_Implementation": "0x4F41EcAce160f6ef893102D64f84E8040c06d8B0",
"Shortfall_Implementation": "0xb1a3D8673e22c5eb9466Da90C52D081652a83F9f",
"Shortfall_Proxy": "0xf37530A8a810Fcb501AA0Ecd0B0699388F0F2209",
"SwapRouter_BTC": "0x70D06f42a463f0f398eCBc6abfDFbbd726626346",
"SwapRouter_DeFi": "0x47bEe99BD8Cf5D8d7e815e2D2a3E2985CBCcC04b",
Expand All @@ -148,7 +148,7 @@
"SwapRouter_Stablecoins": "0xBBd8E2b5d69fcE9Aaa599c50F0f0960AA58B32aA",
"SwapRouter_Tron": "0xacD270Ed7DFd4466Bd931d84fe5B904080E28Bfc",
"VTokenBeacon": "0x2b8A1C539ABaC89CbF7E2Bc6987A0A38A5e660D4",
"VTokenImpl": "0x228Ea224d62D14a2e2cb9B43083aE43954C39B67",
"VTokenImpl": "0x5303DE0aa502DE5816EEC465ee8563c461d1E5b6",
"VToken_vALPACA_DeFi": "0x02c5Fb0F26761093D297165e902e96D08576D344",
"VToken_vANKR_DeFi": "0x19CE11C8817a1828D1d357DFBF62dCf5b0B2A362",
"VToken_vBNBx_LiquidStakedBNB": "0x5E21bF67a6af41c74C1773E4b473ca5ce8fd3791",
Expand Down
6 changes: 3 additions & 3 deletions deployments/bsctestnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -28480,7 +28480,7 @@
]
},
"PoolLens": {
"address": "0xa6cDad72854d338d75C40f1a863A0f9c488f4D7F",
"address": "0xD9142f79C3aDF8A5B86594Bd012d828e5B39bB78",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -62623,7 +62623,7 @@
]
},
"Shortfall_Implementation": {
"address": "0xdD939b73C40cE3fe540bE46cA378f74196Dc86b7",
"address": "0x84B09BC76ABA4c0FC45616AdD44017b678FBCA87",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -79180,7 +79180,7 @@
]
},
"VTokenImpl": {
"address": "0xaaCe28600A02E42198AfEe60A2cCDADC9FFe513B",
"address": "0xA8365BFC43cb814F4780127aaD44ecaa8651Fd71",
"abi": [
{
"inputs": [
Expand Down
32 changes: 16 additions & 16 deletions deployments/bsctestnet/PoolLens.json

Large diffs are not rendered by default.

154 changes: 77 additions & 77 deletions deployments/bsctestnet/Shortfall_Implementation.json

Large diffs are not rendered by default.

110 changes: 55 additions & 55 deletions deployments/bsctestnet/VTokenImpl.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions deployments/bsctestnet_addresses.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"MockweETH": "0x7df9372096c8ca2401f30B3dF931bEFF493f1FdC",
"MockwstETH": "0x4349016259FCd8eE452f696b2a7beeE31667D129",
"NativeTokenGateway_vWBNB_LiquidStakedBNB": "0xCf4C75398DaD73f16c762026144a1496f6869CD1",
"PoolLens": "0xa6cDad72854d338d75C40f1a863A0f9c488f4D7F",
"PoolLens": "0xD9142f79C3aDF8A5B86594Bd012d828e5B39bB78",
"PoolLensR1": "0x6492dF28A9478230205c940A245Ffb114EaEb9d1",
"PoolLensR2": "0x613d859Bf6CB3557179dC03B8F844E0c48FE9C07",
"PoolRegistry": "0xC85491616Fa949E048F3aAc39fbf5b0703800667",
Expand Down Expand Up @@ -159,7 +159,7 @@
"RewardsDistributor_Tron_3_Proxy": "0x1c50672f4752cc0Ae532D9b93b936C21121Ff08b",
"SetCheckpointBsctestnet": "0xE4dA2eBf828B0d111E76F289D52341a7E2667e7f",
"Shortfall": "0x503574a82fE2A9f968d355C8AAc1Ba0481859369",
"Shortfall_Implementation": "0xdD939b73C40cE3fe540bE46cA378f74196Dc86b7",
"Shortfall_Implementation": "0x84B09BC76ABA4c0FC45616AdD44017b678FBCA87",
"Shortfall_Proxy": "0x503574a82fE2A9f968d355C8AAc1Ba0481859369",
"SwapRouter_BTC": "0x98C108285E389A5a12EdDa585b70b30C786AFb86",
"SwapRouter_DeFi": "0x89Bc8dFe0Af08b60ec285071d133FCdfa9B3C08e",
Expand All @@ -171,7 +171,7 @@
"SwapRouter_Stablecoins": "0x8Ff3c0a74b4CBD4dFA3A35Cca756490bE351F936",
"SwapRouter_Tron": "0x1D8cA5AFB88F07489786A3d2E0FF50F3F9314d97",
"VTokenBeacon": "0xBF85A90673E61956f8c79b9150BAB7893b791bDd",
"VTokenImpl": "0xaaCe28600A02E42198AfEe60A2cCDADC9FFe513B",
"VTokenImpl": "0xA8365BFC43cb814F4780127aaD44ecaa8651Fd71",
"VToken_vALPACA_DeFi": "0xb7caC5Ef82cb7f9197ee184779bdc52c5490C02a",
"VToken_vANKR_DeFi": "0xb677e080148368EeeE70fA3865d07E92c6500174",
"VToken_vBNBx_LiquidStakedBNB": "0x644A149853E5507AdF3e682218b8AC86cdD62951",
Expand Down
4 changes: 2 additions & 2 deletions helpers/deploymentConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ export enum InterestRateModels {

const ANY_CONTRACT = ethers.constants.AddressZero;

export const DEFAULT_BLOCKS_PER_YEAR = 42_048_000; // assuming a block is mined every 0.75 seconds
export const BSC_BLOCKS_PER_YEAR = 42_048_000; // assuming a block is mined every 0.75 seconds
export const DEFAULT_BLOCKS_PER_YEAR = 70_080_000; // assuming a block is mined every 0.45 seconds
export const BSC_BLOCKS_PER_YEAR = 70_080_000; // assuming a block is mined every 0.45 seconds
export const ETH_BLOCKS_PER_YEAR = 2_628_000; // assuming a block is mined every 12 seconds
export const OPBNB_BLOCKS_PER_YEAR = 63_072_000; // assuming a block is mined every 0.5 seconds
export const SECONDS_PER_YEAR = 31_536_000; // seconds per year
Expand Down
12 changes: 6 additions & 6 deletions tests/hardhat/Prime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ describe("Prime Token", () => {

it("APR Estimation", async () => {
const apr = await prime.calculateAPR(vmatic.address, await user1.getAddress());
expect(apr.supplyAPR.toString()).to.be.equal("4672000000");
expect(apr.supplyAPR.toString()).to.be.equal("7786666666");
});

it("Hypothetical APR Estimation", async () => {
Expand All @@ -577,8 +577,8 @@ describe("Prime Token", () => {
bigNumber18.mul(100),
bigNumber18.mul(1000000),
);
expect(apr.supplyAPR.toString()).to.be.equal("2102400000");
expect(apr.borrowAPR.toString()).to.be.equal("2102400000");
expect(apr.supplyAPR.toString()).to.be.equal("3504000000");
expect(apr.borrowAPR.toString()).to.be.equal("3504000000");

apr = await prime.estimateAPR(
vmatic.address,
Expand All @@ -587,8 +587,8 @@ describe("Prime Token", () => {
bigNumber18.mul(50),
bigNumber18.mul(1000000),
);
expect(apr.supplyAPR.toString()).to.be.equal("2803200000");
expect(apr.borrowAPR.toString()).to.be.equal("2803200000");
expect(apr.supplyAPR.toString()).to.be.equal("4672000000");
expect(apr.borrowAPR.toString()).to.be.equal("4672000000");

apr = await prime.estimateAPR(
vmatic.address,
Expand All @@ -598,7 +598,7 @@ describe("Prime Token", () => {
bigNumber18.mul(1000000),
);
expect(apr.supplyAPR.toString()).to.be.equal("0");
expect(apr.borrowAPR.toString()).to.be.equal("4204800000");
expect(apr.borrowAPR.toString()).to.be.equal("7008000000");
});
});
});
4 changes: 2 additions & 2 deletions tests/integration/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ describe("Positive Cases", function () {
if (timeBasedIntegrationTests) {
await mine(700000000);
} else {
await mine(1200000000);
await mine(2000000000);
}

await BTCB.connect(acc1Signer).approve(vBTCB.address, convertToUnit(10, 18));
Expand Down Expand Up @@ -507,7 +507,7 @@ describe("Straight Cases For Single User Liquidation and healing", function () {

await Comptroller.setPriceOracle(dummyPriceOracle.address);

let repayAmount = 1000000000001783;
let repayAmount = 1000000000001070;

if (timeBasedIntegrationTests) repayAmount = 1000000000002377;
const param = {
Expand Down
Loading