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-11-29 17:19:41 +08:00
parent af762c3999
commit 63c1d9c70c
7 changed files with 94 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
contracts/SmartRoute/proxies/DODOCpProxy.sol
View File

@@ -29,7 +29,7 @@ contract DODOCpProxy is ReentrancyGuard {
address constant _ETH_ADDRESS_ = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
address public immutable _WETH_;
address public immutable _DODO_APPROVE_PROXY_;
address public immutable _UPCP_FACTORY_;
// address public immutable _UPCP_FACTORY_;
address public immutable _CP_FACTORY_;
// ============ Modifiers ============
@@ -46,55 +46,55 @@ contract DODOCpProxy is ReentrancyGuard {
constructor(
address payable weth,
address cpFactory,
address upCpFactory,
// address upCpFactory,
address dodoApproveProxy
) public {
_WETH_ = weth;
_CP_FACTORY_ = cpFactory;
_UPCP_FACTORY_ = upCpFactory;
// _UPCP_FACTORY_ = upCpFactory;
_DODO_APPROVE_PROXY_ = dodoApproveProxy;
}
//============ UpCrowdPooling Functions (create) ============
function createUpCrowdPooling(
address baseToken,
address quoteToken,
uint256 baseInAmount,
uint256[] memory timeLine,
uint256[] memory valueList,
bool[] memory switches,
uint256 deadLine
) external payable preventReentrant judgeExpired(deadLine) returns (address payable newUpCrowdPooling) {
address _baseToken = baseToken;
address _quoteToken = quoteToken == _ETH_ADDRESS_ ? _WETH_ : quoteToken;
// function createUpCrowdPooling(
// address baseToken,
// address quoteToken,
// uint256 baseInAmount,
// uint256[] memory timeLine,
// uint256[] memory valueList,
// bool[] memory switches,
// uint256 deadLine
// ) external payable preventReentrant judgeExpired(deadLine) returns (address payable newUpCrowdPooling) {
// address _baseToken = baseToken;
// address _quoteToken = quoteToken == _ETH_ADDRESS_ ? _WETH_ : quoteToken;
newUpCrowdPooling = IDODOV2(_UPCP_FACTORY_).createCrowdPooling();
// newUpCrowdPooling = IDODOV2(_UPCP_FACTORY_).createCrowdPooling();
_deposit(
msg.sender,
newUpCrowdPooling,
_baseToken,
baseInAmount,
false
);
// _deposit(
// msg.sender,
// newUpCrowdPooling,
// _baseToken,
// baseInAmount,
// false
// );
(bool success, ) = newUpCrowdPooling.call{value: msg.value}("");
require(success, "DODOCpProxy: Transfer failed");
// (bool success, ) = newUpCrowdPooling.call{value: msg.value}("");
// require(success, "DODOCpProxy: Transfer failed");
address[] memory tokens = new address[](2);
tokens[0] = _baseToken;
tokens[1] = _quoteToken;
// address[] memory tokens = new address[](2);
// tokens[0] = _baseToken;
// tokens[1] = _quoteToken;
IDODOV2(_UPCP_FACTORY_).initCrowdPooling(
newUpCrowdPooling,
msg.sender,
tokens,
timeLine,
valueList,
switches
);
}
// IDODOV2(_UPCP_FACTORY_).initCrowdPooling(
// newUpCrowdPooling,
// msg.sender,
// tokens,
// timeLine,
// valueList,
// switches
// );
// }
//============ CrowdPooling Functions (create) ============