-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fix: make too soon error more verbose
- Loading branch information
Showing
8 changed files
with
1,606 additions
and
650 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
204 changes: 151 additions & 53 deletions
204
packages/contracts/src/dollar/facets/UbiquityPoolFacet.sol
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,99 +1,197 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-or-later | ||
| pragma solidity 0.8.19; | ||
|
|
||
| // Modified from FraxPool.sol by Frax Finance | ||
| // https://github.com/FraxFinance/frax-solidity/blob/master/src/hardhat/contracts/Frax/Pools/FraxPool.sol | ||
|
|
||
| import {LibUbiquityPool} from "../libraries/LibUbiquityPool.sol"; | ||
| import {IUbiquityPool} from "../interfaces/IUbiquityPool.sol"; | ||
| import {Modifiers} from "../libraries/LibAppStorage.sol"; | ||
| import {IMetaPool} from "../interfaces/IMetaPool.sol"; | ||
| import "../interfaces/IUbiquityPool.sol"; | ||
| import {LibUbiquityPool} from "../libraries/LibUbiquityPool.sol"; | ||
|
|
||
| /** | ||
| * @notice Ubiquity pool facet | ||
| * @notice Allows users to: | ||
| * - deposit collateral in exchange for Ubiquity Dollars | ||
| * - redeem Ubiquity Dollars in exchange for the earlier provided collateral | ||
| */ | ||
| contract UbiquityPoolFacet is Modifiers, IUbiquityPool { | ||
| contract UbiquityPoolFacet is IUbiquityPool, Modifiers { | ||
| //===================== | ||
| // Views | ||
| //===================== | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function allCollaterals() external view returns (address[] memory) { | ||
| return LibUbiquityPool.allCollaterals(); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function collateralInformation( | ||
| address collateralAddress | ||
| ) | ||
| external | ||
| view | ||
| returns (LibUbiquityPool.CollateralInformation memory returnData) | ||
| { | ||
| return LibUbiquityPool.collateralInformation(collateralAddress); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function collateralUsdBalance() | ||
| external | ||
| view | ||
| returns (uint256 balanceTally) | ||
| { | ||
| return LibUbiquityPool.collateralUsdBalance(); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function freeCollateralBalance( | ||
| uint256 collateralIndex | ||
| ) external view returns (uint256) { | ||
| return LibUbiquityPool.freeCollateralBalance(collateralIndex); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function getDollarInCollateral( | ||
| uint256 collateralIndex, | ||
| uint256 dollarAmount | ||
| ) external view returns (uint256) { | ||
| return | ||
| LibUbiquityPool.getDollarInCollateral( | ||
| collateralIndex, | ||
| dollarAmount | ||
| ); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function getDollarPriceUsd() | ||
| external | ||
| view | ||
| returns (uint256 dollarPriceUsd) | ||
| { | ||
| return LibUbiquityPool.getDollarPriceUsd(); | ||
| } | ||
|
|
||
| //==================== | ||
| // Public functions | ||
| //==================== | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function mintDollar( | ||
| address collateralAddress, | ||
| uint256 collateralAmount, | ||
| uint256 dollarOutMin | ||
| ) external { | ||
| LibUbiquityPool.mintDollar( | ||
| collateralAddress, | ||
| collateralAmount, | ||
| dollarOutMin | ||
| ); | ||
| uint256 collateralIndex, | ||
| uint256 dollarAmount, | ||
| uint256 dollarOutMin, | ||
| uint256 maxCollateralIn | ||
| ) external returns (uint256 totalDollarMint, uint256 collateralNeeded) { | ||
| return | ||
| LibUbiquityPool.mintDollar( | ||
| collateralIndex, | ||
| dollarAmount, | ||
| dollarOutMin, | ||
| maxCollateralIn | ||
| ); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function redeemDollar( | ||
| address collateralAddress, | ||
| uint256 collateralIndex, | ||
| uint256 dollarAmount, | ||
| uint256 collateralOutMin | ||
| ) external { | ||
| LibUbiquityPool.redeemDollar( | ||
| collateralAddress, | ||
| dollarAmount, | ||
| collateralOutMin | ||
| ); | ||
| ) external returns (uint256 collateralOut) { | ||
| return | ||
| LibUbiquityPool.redeemDollar( | ||
| collateralIndex, | ||
| dollarAmount, | ||
| collateralOutMin | ||
| ); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function collectRedemption( | ||
| uint256 collateralIndex | ||
| ) external returns (uint256 collateralAmount) { | ||
| return LibUbiquityPool.collectRedemption(collateralIndex); | ||
| } | ||
|
|
||
| //========================= | ||
| // AMO minters functions | ||
| //========================= | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function amoMinterBorrow(uint256 collateralAmount) external { | ||
| LibUbiquityPool.amoMinterBorrow(collateralAmount); | ||
| } | ||
|
|
||
| //======================== | ||
| // Restricted functions | ||
| //======================== | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function collectRedemption(address collateralAddress) external { | ||
| LibUbiquityPool.collectRedemption(collateralAddress); | ||
| function addAmoMinter(address amoMinterAddress) external onlyAdmin { | ||
| LibUbiquityPool.addAmoMinter(amoMinterAddress); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function addToken( | ||
| function addCollateralToken( | ||
| address collateralAddress, | ||
| IMetaPool collateralMetaPool | ||
| uint256 poolCeiling | ||
| ) external onlyAdmin { | ||
| LibUbiquityPool.addToken(collateralAddress, collateralMetaPool); | ||
| LibUbiquityPool.addCollateralToken(collateralAddress, poolCeiling); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function setRedeemActive( | ||
| address collateralAddress, | ||
| bool notRedeemPaused | ||
| function removeAmoMinter(address amoMinterAddress) external onlyAdmin { | ||
| LibUbiquityPool.removeAmoMinter(amoMinterAddress); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function setCollateralPrice( | ||
| uint256 collateralIndex, | ||
| uint256 newPrice | ||
| ) external onlyAdmin { | ||
| LibUbiquityPool.setRedeemActive(collateralAddress, notRedeemPaused); | ||
| LibUbiquityPool.setCollateralPrice(collateralIndex, newPrice); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function getRedeemActive( | ||
| address _collateralAddress | ||
| ) external view returns (bool) { | ||
| return LibUbiquityPool.getRedeemActive(_collateralAddress); | ||
| function setFees( | ||
| uint256 collateralIndex, | ||
| uint256 newMintFee, | ||
| uint256 newRedeemFee | ||
| ) external onlyAdmin { | ||
| LibUbiquityPool.setFees(collateralIndex, newMintFee, newRedeemFee); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function setMintActive( | ||
| address collateralAddress, | ||
| bool notMintPaused | ||
| function setPoolCeiling( | ||
| uint256 collateralIndex, | ||
| uint256 newCeiling | ||
| ) external onlyAdmin { | ||
| LibUbiquityPool.setMintActive(collateralAddress, notMintPaused); | ||
| LibUbiquityPool.setPoolCeiling(collateralIndex, newCeiling); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function getMintActive( | ||
| address _collateralAddress | ||
| ) external view returns (bool) { | ||
| return LibUbiquityPool.getMintActive(_collateralAddress); | ||
| function setPriceThresholds( | ||
| uint256 newMintPriceThreshold, | ||
| uint256 newRedeemPriceThreshold | ||
| ) external onlyAdmin { | ||
| LibUbiquityPool.setPriceThresholds( | ||
| newMintPriceThreshold, | ||
| newRedeemPriceThreshold | ||
| ); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function getRedeemCollateralBalances( | ||
| address account, | ||
| address collateralAddress | ||
| ) external view returns (uint256) { | ||
| return | ||
| LibUbiquityPool.getRedeemCollateralBalances( | ||
| account, | ||
| collateralAddress | ||
| ); | ||
| function setRedemptionDelay(uint256 newRedemptionDelay) external onlyAdmin { | ||
| LibUbiquityPool.setRedemptionDelay(newRedemptionDelay); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function toggleCollateral(uint256 collateralIndex) external onlyAdmin { | ||
| LibUbiquityPool.toggleCollateral(collateralIndex); | ||
| } | ||
|
|
||
| /// @inheritdoc IUbiquityPool | ||
| function toggleMRB( | ||
| uint256 collateralIndex, | ||
| uint8 toggleIndex | ||
| ) external onlyAdmin { | ||
| LibUbiquityPool.toggleMRB(collateralIndex, toggleIndex); | ||
| } | ||
| } |
14 changes: 14 additions & 0 deletions
14
packages/contracts/src/dollar/interfaces/IDollarAmoMinter.sol
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity 0.8.19; | ||
|
|
||
| /// @notice AMO minter interface | ||
| /// @dev AMO minter can borrow collateral from the Ubiquity Pool to make some yield | ||
| interface IDollarAmoMinter { | ||
| /// @notice Returns collateral Dollar balance | ||
| /// @return Collateral Dollar balance | ||
| function collateralDollarBalance() external view returns (uint256); | ||
|
|
||
| /// @notice Returns collateral index (from the Ubiquity Pool) for which AMO minter is responsible | ||
| /// @return Collateral token index | ||
| function collateralIndex() external view returns (uint256); | ||
| } |
Oops, something went wrong.
10739ecThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
10739ec