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

cp add settle fund

Browse Source
This commit is contained in:
owen05
2020-12-30 17:05:31 +08:00
parent 4e5accd62d
commit 9d2b0f06f5
7 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,10 @@ import {SafeMath} from "../../lib/SafeMath.sol";
contract CP is CPVesting {
using SafeMath for uint256;
receive() external payable {
require(_INITIALIZED_ == false, "WE_NOT_SAVE_ETH_AFTER_INIT");
}
function init(
address[] calldata addressList,
uint256[] calldata timeLine,
@@ -83,5 +87,7 @@ contract CP is CPVesting {
require(_CLIFF_RATE_ <= 1e18, "CLIFF_RATE_WRONG");
_TOTAL_BASE_ = _BASE_TOKEN_.balanceOf(address(this));
require(address(this).balance == _SETTEL_FUND_, "SETTLE_FUND_NOT_MATCH");
}
}

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

@@ -115,6 +115,8 @@ contract CPFunding is CPStorage {
_transferQuoteOut(_POOL_, poolQuote);
_TOTAL_LP_AMOUNT_ = IDVM(_POOL_).buyShares(address(this));
msg.sender.transfer(_SETTEL_FUND_);
}
// in case something wrong with base token contract

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

@@ -19,6 +19,7 @@ contract CPStorage is InitializableOwnable, ReentrancyGuard {
using SafeMath for uint256;
uint256 internal constant _SETTLEMENT_EXPIRE_ = 86400 * 7;
uint256 internal constant _SETTEL_FUND_ = 200 finney;
// ============ Timeline ============

2
contracts/Factory/CrowdPoolingFactory.sol
View File

@@ -122,8 +122,6 @@ contract CrowdPoolingFactory is InitializableOwnable {
_USER_REGISTRY_[creator].push(cpAddress);
emit NewCP(baseToken, quoteToken, creator, cpAddress);
//TODO: 初始存入资金，用于settle补贴
}
// ============ View Functions ============

3
contracts/SmartRoute/DODOV2Proxy01.sol
View File

@@ -606,7 +606,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
uint256[] memory timeLine,
uint256[] memory valueList,
uint256 deadLine
) external override judgeExpired(deadLine) returns (address newCrowdPooling) {
) external override payable judgeExpired(deadLine) returns (address payable newCrowdPooling) {
address _baseToken = baseToken;
address _quoteToken = quoteToken == _ETH_ADDRESS_ ? _WETH_ : quoteToken;
@@ -620,6 +620,7 @@ contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable
false
);
newCrowdPooling.transfer(msg.value);
IDODOV2(_CP_FACTORY_).initCrowdPooling(
newCrowdPooling,

2
contracts/SmartRoute/intf/IDODOV2.sol
View File

@@ -85,7 +85,7 @@ interface IDODOV2 {
//========== CrowdPooling ===========
function createCrowdPooling() external returns (address newCrowdPooling);
function createCrowdPooling() external returns (address payable newCrowdPooling);
function initCrowdPooling(
address cpAddress,

2
contracts/SmartRoute/intf/IDODOV2Proxy01.sol
View File

@@ -100,7 +100,7 @@ interface IDODOV2Proxy01 is IDODOV1Proxy01 {
uint256[] memory timeLine,
uint256[] memory valueList,
uint256 deadLine
) external returns (address newCrowdPooling);
) external payable returns (address payable newCrowdPooling);
function bid(
address assetTo,