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

🔴 Allow setting CCR to 0 #6

Merged
merged 1 commit into from
Apr 29, 2024
Merged

🔴 Allow setting CCR to 0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions contracts/AdminContract.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ contract AdminContract is IAdminContract, UUPSUpgradeable, OwnableUpgradeable, A
uint256 private constant DEFAULT_DECIMALS = 18;

uint256 public constant BORROWING_FEE_DEFAULT = 0.005 ether; // 0.5%
uint256 public constant CCR_DEFAULT = 1.5 ether; // 150%
uint256 public constant CCR_DEFAULT = 0; // 0%
uint256 public constant MCR_DEFAULT = 1.1 ether; // 110%
uint256 public constant MIN_NET_DEBT_DEFAULT = 2_000 ether;
uint256 public constant MINT_CAP_DEFAULT = 1_000_000 ether; // 1 million TRI
Expand Down Expand Up @@ -178,7 +178,7 @@ contract AdminContract is IAdminContract, UUPSUpgradeable, OwnableUpgradeable, A
public
override
onlyTimelock
safeCheck("CCR", _collateral, newCCR, 1 ether, 10 ether) // 100% - 1,000%
safeCheck("CCR", _collateral, newCCR, 0, 10 ether) // 100% - 1,000%
{
CollateralParams storage collParams = collateralParams[_collateral];
uint256 oldCCR = collParams.ccr;
Expand Down
5 changes: 2 additions & 3 deletions test/trinity/AdminContractTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ contract("AdminContract", async accounts => {
const MCR_SAFETY_MIN = toBN((1.01e18).toString())

const CCR_SAFETY_MAX = toBN(dec(10, 18))
const CCR_SAFETY_MIN = toBN(dec(1, 18))
const CCR_SAFETY_MIN = toBN(dec(0, 18))

const PERCENT_DIVISOR_SAFETY_MAX = toBN(200)
const PERCENT_DIVISOR_SAFETY_MIN = toBN(2)
Expand Down Expand Up @@ -86,7 +86,7 @@ contract("AdminContract", async accounts => {

it("Formula Checks: Call every function with default value, Should match default values", async () => {
await adminContract.setBorrowingFee(ZERO_ADDRESS, (0.005e18).toString())
await adminContract.setCCR(ZERO_ADDRESS, "1500000000000000000")
await adminContract.setCCR(ZERO_ADDRESS, "0")
await adminContract.setMCR(ZERO_ADDRESS, "1100000000000000000")
await adminContract.setMinNetDebt(ZERO_ADDRESS, dec(2_000, 18))
await adminContract.setMintCap(ZERO_ADDRESS, dec(1_000_000, 18))
Expand Down Expand Up @@ -138,7 +138,6 @@ contract("AdminContract", async accounts => {
})

it("setCCR: Owner change parameter - Failing SafeCheck", async () => {
await assertRevert(adminContract.setCCR(ZERO_ADDRESS, CCR_SAFETY_MIN.sub(toBN(1))))
await assertRevert(adminContract.setCCR(ZERO_ADDRESS, CCR_SAFETY_MAX.add(toBN(1))))
})

Expand Down
Loading