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

update cpV2

Browse Source
This commit is contained in:
owen05
2021-12-13 10:34:27 +08:00
parent e271a0bdea
commit 2f1d5eae4a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/CrowdPooling/impl/CP.sol
View File

@@ -103,6 +103,8 @@ contract CP is CPVesting {
_TOTAL_BASE_ = _BASE_TOKEN_.balanceOf(address(this)); _TOTAL_BASE_ = _BASE_TOKEN_.balanceOf(address(this));
require(switches.length == 2, "SWITCHES_LENGTH_WRONG");
_IS_OVERCAP_STOP = switches[0]; _IS_OVERCAP_STOP = switches[0];
_IS_OPEN_TWAP_ = switches[1]; _IS_OPEN_TWAP_ = switches[1];

6
contracts/CrowdPooling/impl/CPFunding.sol
View File

@@ -37,7 +37,7 @@ contract CPFunding is CPStorage {
_; _;
} }
function bid(address to) external isForceStop phaseBid preventReentrant isBidderAllow(to) { function bid(address to) external isNotForceStop phaseBid preventReentrant isBidderAllow(to) {
uint256 input = _getQuoteInput(); uint256 input = _getQuoteInput();
uint256 mtFee = DecimalMath.mulFloor(input, _MT_FEE_RATE_MODEL_.getFeeRate(to)); uint256 mtFee = DecimalMath.mulFloor(input, _MT_FEE_RATE_MODEL_.getFeeRate(to));
_transferQuoteOut(_MAINTAINER_, mtFee); _transferQuoteOut(_MAINTAINER_, mtFee);
@@ -71,7 +71,7 @@ contract CPFunding is CPStorage {
// ============ SETTLEMENT ============ // ============ SETTLEMENT ============
function settle() external isForceStop phaseSettlement preventReentrant { function settle() external isNotForceStop phaseSettlement preventReentrant {
_settle(); _settle();
(uint256 poolBase, uint256 poolQuote, uint256 poolI, uint256 unUsedBase, uint256 unUsedQuote) = getSettleResult(); (uint256 poolBase, uint256 poolQuote, uint256 poolI, uint256 unUsedBase, uint256 unUsedQuote) = getSettleResult();
@@ -112,7 +112,7 @@ contract CPFunding is CPStorage {
} }
// in case something wrong with base token contract // in case something wrong with base token contract
function emergencySettle() external isForceStop phaseSettlement preventReentrant { function emergencySettle() external isNotForceStop phaseSettlement preventReentrant {
require(block.timestamp >= _PHASE_CALM_ENDTIME_.add(_SETTLEMENT_EXPIRE_), "NOT_EMERGENCY"); require(block.timestamp >= _PHASE_CALM_ENDTIME_.add(_SETTLEMENT_EXPIRE_), "NOT_EMERGENCY");
_settle(); _settle();
_UNUSED_QUOTE_ = _QUOTE_TOKEN_.balanceOf(address(this)); _UNUSED_QUOTE_ = _QUOTE_TOKEN_.balanceOf(address(this));

2
contracts/CrowdPooling/impl/CPStorage.sol
View File

@@ -85,7 +85,7 @@ contract CPStorage is InitializableOwnable, ReentrancyGuard {
mapping(address => uint256) _CLAIMED_BASE_TOKEN_; mapping(address => uint256) _CLAIMED_BASE_TOKEN_;
// ============ Modifiers ============ // ============ Modifiers ============
modifier isForceStop() { modifier isNotForceStop() {
require(!_FORCE_STOP_, "FORCE_STOP"); require(!_FORCE_STOP_, "FORCE_STOP");
_; _;
} }