Skip to content

cleanup checkmint and checkpor #141

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

Open
sosaucily wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

cleanup checkmint and checkpor #141

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
39 changes: 8 additions & 31 deletions contracts/DLCManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,40 +289,15 @@ contract DLCManager is
}

/**
* @notice Checks mint eligibility.
* @dev Checks if the amount is non-zero.
* @dev If PoR is disabled, returns true.
* @dev If PoR is enabled, checks if the new total value minted is within bounds.
* @dev If the PoR check fails, reverts with an error.
* @param amount dlcBTC to mint.
* @param currentTotalMinted total minted value in all vaults on this chain.
* @return bool whether a call to _mint should happen.
*/
function _checkMint(
uint256 amount,
uint256 currentTotalMinted
) internal view returns (bool) {
if (amount == 0) {
return false;
}

uint256 proposedTotalValueMinted = currentTotalMinted + amount;
return _checkPoR(proposedTotalValueMinted);
}

/**
* @notice Checks Proof of Reserves (PoR) eligibility.
* @notice Checks Proof of Reserves (PoR) eligibility, raise if not eligible.
* @dev If PoR is disabled, returns true.
* @dev If PoR is enabled, checks if the proposed total value minted is within bounds.
* @dev If the PoR check fails, reverts with an error.
* @param proposedTotalValueMinted proposed total minted value in all vaults on this chain.
* @return bool whether the proposed total value minted is within bounds.
*/
function _checkPoR(
uint256 proposedTotalValueMinted
) internal view returns (bool) {
function _checkPoR(uint256 proposedTotalValueMinted) internal view {
if (!porEnabled) {
return true;
return;
}

(, int256 porValue, , , ) = dlcBTCPoRFeed.latestRoundData();
Expand All @@ -331,7 +306,6 @@ contract DLCManager is
if (porValueUint < proposedTotalValueMinted) {
revert NotEnoughReserves(porValueUint, proposedTotalValueMinted);
}
return true;
}

function _mintTokens(address to, uint256 amount) internal {
Expand Down Expand Up @@ -435,8 +409,11 @@ contract DLCManager is
dlc.valueLocked = newValueLocked;
dlc.valueMinted = newValueLocked;

if (_checkMint(amountToMint, totalValueMinted)) {
totalValueMinted = totalValueMinted + amountToMint;
if (amountToMint > 0) {
uint256 proposedTotalValueMinted = totalValueMinted + amountToMint;
_checkPoR(proposedTotalValueMinted); // reverts if not eligible

totalValueMinted = proposedTotalValueMinted;
_mintTokens(dlc.creator, amountToMint);
}

Expand Down