Crowd Pooling init test

2020-12-12 15:53:42 +08:00
parent c2d2db501a
commit dc12b1d42d
8 changed files with 322 additions and 142 deletions
--- a/contracts/CrowdPooling/impl/CP.sol
+++ b/contracts/CrowdPooling/impl/CP.sol
@@ -0,0 +1,82 @@
+/*
+
+    Copyright 2020 DODO ZOO.
+    SPDX-License-Identifier: Apache-2.0
+
+*/
+
+pragma solidity 0.6.9;
+pragma experimental ABIEncoderV2;
+
+import {CPVesting} from "./CPVesting.sol";
+import {IERC20} from "../../intf/IERC20.sol";
+import {IPermissionManager} from "../../lib/PermissionManager.sol";
+import {IFeeRateModel} from "../../lib/FeeRateModel.sol";
+import {SafeMath} from "../../lib/SafeMath.sol";
+
+contract CP is CPVesting {
+    using SafeMath for uint256;
+
+    function init(
+        address[] calldata addressList,
+        uint256[] calldata timeLine,
+        uint256[] calldata valueList
+    ) external {
+        /*
+        Address List
+        0. owner
+        1. maintainer
+        2. baseToken
+        3. quoteToken
+        4. permissionManager
+        5. feeRateModel
+        6. poolFactory
+      */
+
+        initOwner(addressList[0]);
+        _MAINTAINER_ = addressList[1];
+        _BASE_TOKEN_ = IERC20(addressList[2]);
+        _QUOTE_TOKEN_ = IERC20(addressList[3]);
+        _BIDDER_PERMISSION_ = IPermissionManager(addressList[4]);
+        _MT_FEE_RATE_MODEL_ = IFeeRateModel(addressList[5]);
+        _POOL_FACTORY_ = addressList[6];
+
+        /*
+        Time Line
+        0. phase bid starttime
+        1. phase bid duration
+        2. phase calm duration
+        3. freeze duration
+        */
+
+        require(block.timestamp <= timeLine[0], "TIMELINE_WRONG");
+
+        _PHASE_BID_STARTTIME_ = timeLine[0];
+        _PHASE_BID_ENDTIME_ = _PHASE_BID_STARTTIME_.add(timeLine[1]);
+        _PHASE_CALM_ENDTIME_ = _PHASE_BID_ENDTIME_.add(timeLine[2]);
+
+        _FREEZE_DURATION_ = timeLine[3];
+
+        /*
+        Value List
+        0. pool quote cap
+        1. pool base reserve
+        2. owner quote ratio
+        3. k
+        4 i
+        */
+
+        require(valueList[4] > 0 && valueList[4] <= 10**36, "I_VALUE_WRONG");
+        require(valueList[3] <= 10**18, "K_VALUE_WRONG");
+        require(valueList[2] <= 10**18, "OWNER_RATIO_WRONG");
+
+        _POOL_QUOTE_CAP_ = valueList[0];
+        _POOL_BASE_RESERVE_ = valueList[1];
+        _OWNER_QUOTE_RATIO_ = valueList[2];
+        _K_ = valueList[2];
+        _I_ = valueList[3];
+
+        _TOTAL_BASE_ = _BASE_TOKEN_.balanceOf(address(this));
+        require(_TOTAL_BASE_ >= _POOL_BASE_RESERVE_, "BASE_TOKEN_NOT_ENOUGH");
+    }
+}
--- a/contracts/PoolKickstarter/impl/CAFunding.sol
+++ b/contracts/PoolKickstarter/impl/CAFunding.sol
@@ -13,11 +13,11 @@ import {SafeERC20} from "../../lib/SafeERC20.sol";
 import {DecimalMath} from "../../lib/DecimalMath.sol";
 import {IERC20} from "../../intf/IERC20.sol";
 import {IDVM} from "../../DODOVendingMachine/intf/IDVM.sol";
-import {IDVMFactory} from "../../Factory/DVMFactory.sol";
-import {CAStorage} from "./CAStorage.sol";
+import {IUnownedDVMFactory} from "../../Factory/UnownedDVMFactory.sol";
+import {CPStorage} from "./CPStorage.sol";
 import {PMMPricing} from "../../lib/PMMPricing.sol";

-contract CAFunding is CAStorage {
+contract CPFunding is CPStorage {
    using SafeERC20 for IERC20;

    // ============ BID & CALM PHASE ============
@@ -61,7 +61,6 @@ contract CAFunding is CAStorage {
        (uint256 poolBase, uint256 poolQuote, uint256 ownerQuote) = getSettleResult();
        _UNUSED_QUOTE_ = _QUOTE_TOKEN_.balanceOf(address(this)).sub(poolQuote).sub(ownerQuote);
        _UNUSED_BASE_ = _BASE_TOKEN_.balanceOf(address(this)).sub(poolBase);
-        uint256 avgPrice = DecimalMath.divCeil(poolQuote.add(ownerQuote), _UNUSED_BASE_);

        // 这里的目的是让开盘价尽量等于avgPrice
        // 我们统一设定k=1，如果quote和base不平衡，就必然要截断一边
@@ -70,39 +69,36 @@ contract CAFunding is CAStorage {
        // i = m (1-quote/(m*base))
        // if quote = m*base i = 1
        // if quote > m*base reverse
-        uint256 baseDepth = DecimalMath.mulFloor(avgPrice, poolBase);
-        if (poolQuote == baseDepth) {
-            _POOL_ = IDVMFactory(_POOL_FACTORY_).createDODOVendingMachine(
-                address(this),
-                address(_BASE_TOKEN_),
-                address(_QUOTE_TOKEN_),
-                3e15,
-                0,
-                1,
-                DecimalMath.ONE
-            );
-        } else if (poolQuote < baseDepth) {
-            uint256 ratio = DecimalMath.ONE.sub(DecimalMath.divFloor(poolQuote, baseDepth));
-            _POOL_ = IDVMFactory(_POOL_FACTORY_).createDODOVendingMachine(
-                address(this),
-                address(_BASE_TOKEN_),
-                address(_QUOTE_TOKEN_),
-                3e15,
-                0,
-                avgPrice.mul(ratio).mul(ratio).divCeil(DecimalMath.ONE2),
-                DecimalMath.ONE
-            );
-        } else if (poolQuote > baseDepth) {
-            uint256 ratio = DecimalMath.ONE.sub(DecimalMath.divFloor(baseDepth, poolQuote));
-            _POOL_ = IDVMFactory(_POOL_FACTORY_).createDODOVendingMachine(
-                address(this),
-                address(_QUOTE_TOKEN_),
-                address(_BASE_TOKEN_),
-                3e15,
-                0,
-                DecimalMath.reciprocalFloor(avgPrice).mul(ratio).mul(ratio).divCeil(
+        {
+            uint256 avgPrice = DecimalMath.divCeil(poolQuote.add(ownerQuote), _UNUSED_BASE_);
+            uint256 baseDepth = DecimalMath.mulFloor(avgPrice, poolBase);
+            address _poolBaseToken;
+            address _poolQuoteToken;
+            uint256 _poolI;
+            if (poolQuote == baseDepth) {
+                _poolBaseToken = address(_BASE_TOKEN_);
+                _poolQuoteToken = address(_QUOTE_TOKEN_);
+                _poolI = 1;
+            } else if (poolQuote < baseDepth) {
+                _poolBaseToken = address(_BASE_TOKEN_);
+                _poolQuoteToken = address(_QUOTE_TOKEN_);
+                uint256 ratio = DecimalMath.ONE.sub(DecimalMath.divFloor(poolQuote, baseDepth));
+                _poolI = avgPrice.mul(ratio).mul(ratio).divCeil(DecimalMath.ONE2);
+            } else if (poolQuote > baseDepth) {
+                _poolBaseToken = address(_QUOTE_TOKEN_);
+                _poolQuoteToken = address(_BASE_TOKEN_);
+                uint256 ratio = DecimalMath.ONE.sub(DecimalMath.divFloor(baseDepth, poolQuote));
+                _poolI = DecimalMath.reciprocalFloor(avgPrice).mul(ratio).mul(ratio).divCeil(
                    DecimalMath.ONE2
-                ),
+                );
+            }
+            _POOL_ = IUnownedDVMFactory(_POOL_FACTORY_).createDODOVendingMachine(
+                address(this),
+                _poolBaseToken,
+                _poolQuoteToken,
+                3e15,
+                0,
+                _poolI,
                DecimalMath.ONE
            );
        }
--- a/contracts/PoolKickstarter/impl/CAStorage.sol
+++ b/contracts/PoolKickstarter/impl/CAStorage.sol
@@ -15,7 +15,7 @@ import {IFeeRateModel} from "../../lib/FeeRateModel.sol";
 import {SafeMath} from "../../lib/SafeMath.sol";
 import {IERC20} from "../../intf/IERC20.sol";

-contract CAStorage is InitializableOwnable, ReentrancyGuard {
+contract CPStorage is InitializableOwnable, ReentrancyGuard {
    using SafeMath for uint256;

    uint256 internal constant _SETTLEMENT_EXPIRED_TIME_ = 86400 * 7;
@@ -71,7 +71,7 @@ contract CAStorage is InitializableOwnable, ReentrancyGuard {

    modifier phaseBid() {
        require(
-            block.timestamp > _PHASE_BID_STARTTIME_ && block.timestamp <= _PHASE_BID_ENDTIME_,
+            block.timestamp >= _PHASE_BID_STARTTIME_ && block.timestamp < _PHASE_BID_ENDTIME_,
            "NOT_PHASE_BID"
        );
        _;
@@ -79,7 +79,7 @@ contract CAStorage is InitializableOwnable, ReentrancyGuard {

    modifier phaseCalm() {
        require(
-            block.timestamp > _PHASE_BID_ENDTIME_ && block.timestamp <= _PHASE_CALM_ENDTIME_,
+            block.timestamp >= _PHASE_BID_ENDTIME_ && block.timestamp < _PHASE_CALM_ENDTIME_,
            "NOT_PHASE_CALM"
        );
        _;
@@ -87,14 +87,14 @@ contract CAStorage is InitializableOwnable, ReentrancyGuard {

    modifier phaseBidOrCalm() {
        require(
-            block.timestamp > _PHASE_BID_STARTTIME_ && block.timestamp <= _PHASE_CALM_ENDTIME_,
+            block.timestamp >= _PHASE_BID_STARTTIME_ && block.timestamp < _PHASE_CALM_ENDTIME_,
            "NOT_PHASE_BID_OR_CALM"
        );
        _;
    }

    modifier phaseSettlement() {
-        require(block.timestamp > _PHASE_CALM_ENDTIME_, "NOT_PHASE_EXE");
+        require(block.timestamp >= _PHASE_CALM_ENDTIME_, "NOT_PHASE_EXE");
        _;
    }

--- a/contracts/PoolKickstarter/impl/CAVesting.sol
+++ b/contracts/PoolKickstarter/impl/CAVesting.sol
@@ -13,16 +13,16 @@ import {DecimalMath} from "../../lib/DecimalMath.sol";
 import {Ownable} from "../../lib/Ownable.sol";
 import {SafeERC20} from "../../lib/SafeERC20.sol";
 import {IERC20} from "../../intf/IERC20.sol";
-import {CAFunding} from "./CAFunding.sol";
+import {CPFunding} from "./CPFunding.sol";

 /**
- * @title CAVesting
+ * @title CPVesting
 * @author DODO Breeder
 *
 * @notice Lock Token and release it linearly
 */

-contract CAVesting is CAFunding {
+contract CPVesting is CPFunding {
    using SafeMath for uint256;
    using SafeERC20 for IERC20;

--- a/contracts/PoolKickstarter/impl/CA.sol
+++ b/contracts/PoolKickstarter/impl/CA.sol
@@ -1,98 +0,0 @@
-/*
-
-    Copyright 2020 DODO ZOO.
-    SPDX-License-Identifier: Apache-2.0
-
-*/
-
-pragma solidity 0.6.9;
-pragma experimental ABIEncoderV2;
-
-import {CAVesting} from "./CAVesting.sol";
-import {IERC20} from "../../intf/IERC20.sol";
-import {IPermissionManager} from "../../lib/PermissionManager.sol";
-import {IFeeRateModel} from "../../lib/FeeRateModel.sol";
-
-contract CA is CAVesting {
-    function init(
-        address[] calldata addressList,
-        uint256[] calldata timeLine,
-        uint256[] calldata valueList,
-        bytes calldata basePayBackData,
-        bytes calldata quotePayBackData
-    ) external {
-        /*
-        Address List
-        0. owner
-        1. maintainer
-        2. baseToken
-        3. quoteToken
-        4. basePayBack
-        5. quotePayBack
-        6. permissionManager
-        7. feeRateModel
-      */
-
-        initOwner(addressList[0]);
-        _MAINTAINER_ = addressList[1];
-        _BASE_TOKEN_ = IERC20(addressList[2]);
-        _QUOTE_TOKEN_ = IERC20(addressList[3]);
-        _BASE_PAY_BACK_ = addressList[4];
-        _QUOTE_PAY_BACK_ = addressList[5];
-        _BIDDER_PERMISSION_ = IPermissionManager(addressList[6]);
-        _MT_FEE_RATE_MODEL_ = IFeeRateModel(addressList[7]);
-
-        /*
-        Time Line
-        0. phase bid starttime
-        1. phase bid endtime
-        2. phase calm endtime
-        3. start vesting time
-        4. vesting duration
-        */
-
-        require(
-            block.timestamp <= timeLine[0] &&
-                timeLine[0] <= timeLine[1] &&
-                timeLine[1] <= timeLine[2] &&
-                timeLine[2] <= timeLine[3],
-            "TIMELINE_WRONG"
-        );
-
-        _PHASE_BID_STARTTIME_ = timeLine[0];
-        _PHASE_BID_ENDTIME_ = timeLine[1];
-        _PHASE_CALM_ENDTIME_ = timeLine[2];
-        _START_VESTING_TIME_ = timeLine[3];
-
-        _VESTING_DURATION_ = timeLine[4];
-
-        /*
-        Value List
-        0. quote cap
-        1. cliff rate
-        2. k
-        3. i
-        4. owner ratio
-        */
-
-        require(
-            valueList[1] <= 10**18 &&
-                valueList[2] <= 10**18 &&
-                valueList[3] > 0 &&
-                valueList[3] <= 10**36 &&
-                valueList[4] <= 10**18,
-            "VALUE_RANGE_WRONG"
-        );
-
-        _QUOTE_CAP_ = valueList[0];
-        _CLIFF_RATE_ = valueList[1];
-        _K_ = valueList[2];
-        _I_ = valueList[3];
-        _OWNER_RATIO_ = valueList[4];
-
-        // ============ External Call Data ============
-
-        _BASE_PAY_BACK_CALL_DATA_ = basePayBackData;
-        _QUOTE_PAY_BACK_CALL_DATA_ = quotePayBackData;
-    }
-}