d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename DPP sync to ratioSync

Browse Source
This commit is contained in:
mingda
2020-12-21 23:16:55 +08:00
parent 4d180159ca
commit ad046a7b11
6 changed files with 116 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
contracts/DODOPrivatePool/impl/DPPAdmin.sol
View File

@@ -38,10 +38,9 @@ contract DPPAdmin is InitializableOwnable {
//For Rebase Token
function sync() external notFreezed onlyOwner {
IDPP(_DPP_).sync();
IDPP(_DPP_).ratioSync();
}
function setFreezeTimestamp(uint256 timestamp) external notFreezed onlyOwner {
_FREEZE_TIMESTAMP_ = timestamp;
}
@@ -111,17 +110,18 @@ contract DPPAdmin is InitializableOwnable {
operator == _OPERATOR_),
"RESET FORBIDDEN！"
);
return IDPP(_DPP_).reset(
msg.sender,
newLpFeeRate,
newMtFeeRate,
newI,
newK,
baseOutAmount,
quoteOutAmount,
minBaseReserve,
minQuoteReserve
);
return
IDPP(_DPP_).reset(
msg.sender,
newLpFeeRate,
newMtFeeRate,
newI,
newK,
baseOutAmount,
quoteOutAmount,
minBaseReserve,
minQuoteReserve
);
}
// ============ Admin Version Control ============

26
contracts/DODOPrivatePool/impl/DPPVault.sol
View File

@@ -23,10 +23,7 @@ contract DPPVault is DPPStorage {
// ============ Events ============
event Reset(
uint256 newLpFeeRate,
uint256 newMtFeeRate
);
event Reset(uint256 newLpFeeRate, uint256 newMtFeeRate);
// ============ View Functions ============
@@ -35,14 +32,22 @@ contract DPPVault is DPPStorage {
quoteReserve = _QUOTE_RESERVE_;
}
function getUserFeeRate(address user) external view returns (uint256 lpFeeRate, uint256 mtFeeRate) {
function getUserFeeRate(address user)
external
view
returns (uint256 lpFeeRate, uint256 mtFeeRate)
{
lpFeeRate = _LP_FEE_RATE_MODEL_.getFeeRate(user);
mtFeeRate = _MT_FEE_RATE_MODEL_.getFeeRate(user);
}
function getUserTradePermission(address user) external view returns (bool isBuyAllow, bool isSellAllow) {
function getUserTradePermission(address user)
external
view
returns (bool isBuyAllow, bool isSellAllow)
{
isBuyAllow = (!_BUYING_CLOSE_ && _TRADE_PERMISSION_.isAllowed(user));
isSellAllow = (!_SELLING_CLOSE_ && _TRADE_PERMISSION_.isAllowed(user));
isSellAllow = (!_SELLING_CLOSE_ && _TRADE_PERMISSION_.isAllowed(user));
}
// ============ Get Input ============
@@ -57,7 +62,7 @@ contract DPPVault is DPPStorage {
// ============ Set States ============
function sync() external preventReentrant onlyOwner {
function ratioSync() external preventReentrant onlyOwner {
uint256 baseBalance = _BASE_TOKEN_.balanceOf(address(this));
uint256 quoteBalance = _QUOTE_TOKEN_.balanceOf(address(this));
if (baseBalance != _BASE_RESERVE_) {
@@ -95,7 +100,10 @@ contract DPPVault is DPPStorage {
uint256 minBaseReserve,
uint256 minQuoteReserve
) public preventReentrant onlyOwner returns (bool) {
require(_BASE_RESERVE_ >= minBaseReserve && _QUOTE_RESERVE_ >= minQuoteReserve, "Reserve amount is not enough");
require(
_BASE_RESERVE_ >= minBaseReserve && _QUOTE_RESERVE_ >= minQuoteReserve,
"RESERVE_AMOUNT_IS_NOT_ENOUGH"
);
_LP_FEE_RATE_MODEL_.setFeeRate(newLpFeeRate);
_MT_FEE_RATE_MODEL_.setFeeRate(newMtFeeRate);
_I_.set(newI);