add new features on cp

This commit is contained in:
owen05
2021-11-09 21:05:54 +08:00
parent 549d8f1e5e
commit d295533e88
10 changed files with 75 additions and 43 deletions

View File

@@ -38,6 +38,7 @@ contract UpCrowdPoolingFactory is InitializableOwnable {
uint256 public _VEST_DURATION_ = 0;
uint256 public _CLIFF_RATE_ = 10**18;
mapping(address => address) liquidityProtectWhitelist;
// ============ Registry ============
@@ -49,6 +50,7 @@ contract UpCrowdPoolingFactory is InitializableOwnable {
// ============ modifiers ===========
modifier valueCheck(
address creator,
address cpAddress,
address baseToken,
uint256[] memory timeLine,
@@ -57,7 +59,10 @@ contract UpCrowdPoolingFactory is InitializableOwnable {
require(timeLine[2] <= _CALM_DURATION_, "CP_FACTORY : PHASE_CALM_DURATION_INVALID");
require(timeLine[4] == _VEST_DURATION_, "CP_FACTORY : VEST_DURATION_INVALID");
require(valueList[3] == _CLIFF_RATE_, "CP_FACTORY : CLIFF_RATE_INVALID");
require(timeLine[3] >= _FREEZE_DURATION_, "CP_FACTORY : FREEZE_DURATION_INVALID");
if(liquidityProtectWhitelist[creator] != baseToken) {
require(timeLine[3]>= _FREEZE_DURATION_, "CP_FACTORY : FREEZE_DURATION_INVALID");
}
_;
}
@@ -95,18 +100,17 @@ contract UpCrowdPoolingFactory is InitializableOwnable {
function initCrowdPooling(
address cpAddress,
address creator,
address baseToken,
address quoteToken,
address[] memory tokens,//0 baseToken 1 quoteToken
uint256[] memory timeLine,
uint256[] memory valueList,
bool isOpenTWAP
) external valueCheck(cpAddress,baseToken,timeLine,valueList) {
bool[] memory switches
) external valueCheck(creator,cpAddress,tokens[0],timeLine,valueList) {
{
address[] memory addressList = new address[](7);
addressList[0] = creator;
addressList[1] = _DEFAULT_MAINTAINER_;
addressList[2] = baseToken;
addressList[3] = quoteToken;
addressList[2] = tokens[0];
addressList[3] = tokens[1];
addressList[4] = _DEFAULT_PERMISSION_MANAGER_;
addressList[5] = _DEFAULT_MT_FEE_RATE_MODEL_;
addressList[6] = _DVM_FACTORY_;
@@ -117,14 +121,14 @@ contract UpCrowdPoolingFactory is InitializableOwnable {
addressList,
timeLine,
valueList,
isOpenTWAP
switches
);
}
_REGISTRY_[baseToken][quoteToken].push(cpAddress);
_REGISTRY_[tokens[0]][tokens[1]].push(cpAddress);
_USER_REGISTRY_[creator].push(cpAddress);
emit NewCP(baseToken, quoteToken, creator, cpAddress);
emit NewCP(tokens[0], tokens[1], creator, cpAddress);
}
// ============ View Functions ============
@@ -154,6 +158,10 @@ contract UpCrowdPoolingFactory is InitializableOwnable {
}
// ============ Owner Functions ============
function setLiquidityProtectWhitelist(address creator, address baseToken) external onlyOwner {
liquidityProtectWhitelist[creator] = baseToken;
}
function updateCPTemplate(address _newCPTemplate) external onlyOwner {
_CP_TEMPLATE_ = _newCPTemplate;