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

update factory && kovan deploy

Browse Source
This commit is contained in:
owen05
2020-12-24 11:51:55 +08:00
parent 4e5a95cf6f
commit 7df13cbbcb
15 changed files with 337 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ 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 {IUnownedDVMFactory} from "../../Factory/UnownedDVMFactory.sol";
import {IDVMFactory} from "../../Factory/DVMFactory.sol";
import {CPStorage} from "./CPStorage.sol";
import {PMMPricing} from "../../lib/PMMPricing.sol";
@@ -101,7 +101,7 @@ contract CPFunding is CPStorage {
uint256 ratio = DecimalMath.ONE.sub(DecimalMath.divCeil(baseDepth, poolQuote));
_poolI = ratio.mul(ratio).div(avgPrice);
}
_POOL_ = IUnownedDVMFactory(_POOL_FACTORY_).createDODOVendingMachine(
_POOL_ = IDVMFactory(_POOL_FACTORY_).createUnOwnedDODOVendingMachine(
address(this),
_poolBaseToken,
_poolQuoteToken,

43
contracts/Factory/DPPFactory.sol
View File

@@ -44,6 +44,9 @@ contract DPPFactory is InitializableOwnable {
address dpp
);
event RemoveDPP(address dpp);
// ============ Functions ============
constructor(
@@ -138,10 +141,50 @@ contract DPPFactory is InitializableOwnable {
IDPPAdmin(adminModel).init(owner, dpp, operator, dodoSmartApprove);
}
// ============ Admin Operation Functions ============
function updateAdminTemplate(address _newDPPAdminTemplate) external onlyOwner {
_DPP_ADMIN_TEMPLATE_ = _newDPPAdminTemplate;
}
function addPoolByAdmin(
address creator,
address baseToken,
address quoteToken,
address pool
) external onlyOwner {
_REGISTRY_[baseToken][quoteToken].push(pool);
_USER_REGISTRY_[creator].push(pool);
emit NewDPP(baseToken, quoteToken, creator, pool);
}
function removePoolByAdmin(
address creator,
address baseToken,
address quoteToken,
address pool
) external onlyOwner {
address[] memory registryList = _REGISTRY_[baseToken][quoteToken];
for (uint256 i = 0; i < registryList.length; i++) {
if (registryList[i] == pool) {
registryList[i] = registryList[registryList.length - 1];
break;
}
}
_REGISTRY_[baseToken][quoteToken] = registryList;
_REGISTRY_[baseToken][quoteToken].pop();
address[] memory userRegistryList = _USER_REGISTRY_[creator];
for (uint256 i = 0; i < userRegistryList.length; i++) {
if (userRegistryList[i] == pool) {
userRegistryList[i] = userRegistryList[userRegistryList.length - 1];
break;
}
}
_USER_REGISTRY_[creator] = userRegistryList;
_USER_REGISTRY_[creator].pop();
emit RemoveDPP(pool);
}
// ============ View Functions ============
function getPrivatePool(address baseToken, address quoteToken)

97
contracts/Factory/DVMFactory.sol
View File

@@ -25,6 +25,15 @@ interface IDVMFactory {
uint256 i,
uint256 k
) external returns (address newVendingMachine);
function createUnOwnedDODOVendingMachine(
address creator,
address baseToken,
address quoteToken,
uint256 lpFeeRate,
uint256 i,
uint256 k
) external returns (address newVendingMachine);
}
contract DVMFactory is InitializableOwnable {
@@ -34,8 +43,14 @@ contract DVMFactory is InitializableOwnable {
address public immutable _DVM_TEMPLATE_;
address public immutable _FEE_RATE_MODEL_TEMPLATE_;
address public immutable _PERMISSION_MANAGER_TEMPLATE_;
address public immutable _DEFAULT_GAS_PRICE_SOURCE_;
address public _DVM_ADMIN_TEMPLATE_;
address public immutable _DEFAULT_MAINTAINER_;
address public immutable _DEFAULT_MT_FEE_RATE_MODEL_;
address public immutable _DEFAULT_PERMISSION_MANAGER_;
address public immutable _DEFAULT_GAS_PRICE_SOURCE_;
address internal constant _EMPTY_ = 0x0000000000000000000000000000000000000000;
// ============ Registry ============
@@ -53,6 +68,8 @@ contract DVMFactory is InitializableOwnable {
address dvm
);
event RemoveDVM(address dvm);
// ============ Functions ============
constructor(
@@ -61,13 +78,20 @@ contract DVMFactory is InitializableOwnable {
address dvmAdminTemplate,
address feeRateModelTemplate,
address permissionManagerTemplate,
address defaultGasPriceSource
address defaultGasPriceSource,
address defaultMaintainer,
address defaultMtFeeRateModel,
address defaultPermissionManager
) public {
_CLONE_FACTORY_ = cloneFactory;
_DVM_TEMPLATE_ = dvmTemplate;
_DVM_ADMIN_TEMPLATE_ = dvmAdminTemplate;
_FEE_RATE_MODEL_TEMPLATE_ = feeRateModelTemplate;
_PERMISSION_MANAGER_TEMPLATE_ = permissionManagerTemplate;
_DEFAULT_MAINTAINER_ = defaultMaintainer;
_DEFAULT_MT_FEE_RATE_MODEL_ = defaultMtFeeRateModel;
_DEFAULT_PERMISSION_MANAGER_ = defaultPermissionManager;
_DEFAULT_GAS_PRICE_SOURCE_ = defaultGasPriceSource;
}
@@ -101,6 +125,36 @@ contract DVMFactory is InitializableOwnable {
emit NewDVM(baseToken, quoteToken, creator, newVendingMachine);
}
function createUnOwnedDODOVendingMachine(
address creator,
address baseToken,
address quoteToken,
uint256 lpFeeRate,
uint256 i,
uint256 k
) external returns (address newVendingMachine) {
newVendingMachine = ICloneFactory(_CLONE_FACTORY_).clone(_DVM_TEMPLATE_);
{
IDVM(newVendingMachine).init(
_EMPTY_,
_DEFAULT_MAINTAINER_,
baseToken,
quoteToken,
_createFeeRateModel(_EMPTY_, lpFeeRate),
_DEFAULT_MT_FEE_RATE_MODEL_,
_DEFAULT_PERMISSION_MANAGER_,
_DEFAULT_GAS_PRICE_SOURCE_,
i,
k
);
}
_REGISTRY_[baseToken][quoteToken].push(newVendingMachine);
_USER_REGISTRY_[creator].push(newVendingMachine);
emit NewDVM(baseToken, quoteToken, creator, newVendingMachine);
}
function _createFeeRateModel(address owner, uint256 feeRate)
internal
returns (address feeRateModel)
@@ -122,10 +176,49 @@ contract DVMFactory is InitializableOwnable {
IDVMAdmin(adminModel).init(owner, dvm);
}
// ============ Admin Operation Functions ============
function updateAdminTemplate(address _newDVMAdminTemplate) external onlyOwner {
_DVM_ADMIN_TEMPLATE_ = _newDVMAdminTemplate;
}
function addPoolByAdmin(
address creator,
address baseToken,
address quoteToken,
address pool
) external onlyOwner {
_REGISTRY_[baseToken][quoteToken].push(pool);
_USER_REGISTRY_[creator].push(pool);
emit NewDVM(baseToken, quoteToken, creator, pool);
}
function removePoolByAdmin(
address creator,
address baseToken,
address quoteToken,
address pool
) external onlyOwner {
address[] memory registryList = _REGISTRY_[baseToken][quoteToken];
for (uint256 i = 0; i < registryList.length; i++) {
if (registryList[i] == pool) {
registryList[i] = registryList[registryList.length - 1];
break;
}
}
_REGISTRY_[baseToken][quoteToken] = registryList;
_REGISTRY_[baseToken][quoteToken].pop();
address[] memory userRegistryList = _USER_REGISTRY_[creator];
for (uint256 i = 0; i < userRegistryList.length; i++) {
if (userRegistryList[i] == pool) {
userRegistryList[i] = userRegistryList[userRegistryList.length - 1];
break;
}
}
_USER_REGISTRY_[creator] = userRegistryList;
_USER_REGISTRY_[creator].pop();
emit RemoveDVM(pool);
}
// ============ View Functions ============
function getVendingMachine(address baseToken, address quoteToken)

141
contracts/Factory/UnownedDVMFactory.sol
View File

@@ -1,141 +0,0 @@
/*
Copyright 2020 DODO ZOO.
SPDX-License-Identifier: Apache-2.0
*/
pragma solidity 0.6.9;
pragma experimental ABIEncoderV2;
import {Ownable} from "../lib/Ownable.sol";
import {ICloneFactory} from "../lib/CloneFactory.sol";
import {IFeeRateModel} from "../lib/FeeRateModel.sol";
import {IDVM} from "../DODOVendingMachine/intf/IDVM.sol";
import {IDVMAdmin} from "../DODOVendingMachine/intf/IDVMAdmin.sol";
import {IPermissionManager} from "../lib/PermissionManager.sol";
interface IUnownedDVMFactory {
function createDODOVendingMachine(
address creator,
address baseToken,
address quoteToken,
uint256 lpFeeRate,
uint256 i,
uint256 k
) external returns (address newVendingMachine);
}
contract UnownedDVMFactory {
// ============ Templates ============
address public immutable _CLONE_FACTORY_;
address public immutable _DVM_TEMPLATE_;
address public immutable _FEE_RATE_MODEL_TEMPLATE_;
address public immutable _DEFAULT_MAINTAINER_;
address public immutable _DEFAULT_MT_FEE_RATE_MODEL_;
address public immutable _DEFAULT_PERMISSION_MANAGER_;
address public immutable _DEFAULT_GAS_PRICE_SOURCE_;
address internal constant _EMPTY_ = 0x0000000000000000000000000000000000000000;
// ============ Registry ============
// base -> quote -> DVM address list
mapping(address => mapping(address => address[])) public _REGISTRY_;
// creator -> DVM address list
mapping(address => address[]) public _USER_REGISTRY_;
// ============ Events ============
event NewUnOwnedDVM(
address baseToken,
address quoteToken,
address creator,
address dvm
);
// ============ Functions ============
constructor(
address cloneFactory,
address dvmTemplate,
address feeRateModelTemplate,
address defaultMaintainer,
address defaultMtFeeRateModel,
address defaultPermissionManager,
address defaultGasPriceSource
) public {
_CLONE_FACTORY_ = cloneFactory;
_DVM_TEMPLATE_ = dvmTemplate;
_FEE_RATE_MODEL_TEMPLATE_ = feeRateModelTemplate;
_DEFAULT_MAINTAINER_ = defaultMaintainer;
_DEFAULT_MT_FEE_RATE_MODEL_ = defaultMtFeeRateModel;
_DEFAULT_PERMISSION_MANAGER_ = defaultPermissionManager;
_DEFAULT_GAS_PRICE_SOURCE_ = defaultGasPriceSource;
}
function createDODOVendingMachine(
address creator,
address baseToken,
address quoteToken,
uint256 lpFeeRate,
uint256 i,
uint256 k
) external returns (address newVendingMachine) {
newVendingMachine = ICloneFactory(_CLONE_FACTORY_).clone(_DVM_TEMPLATE_);
{
IDVM(newVendingMachine).init(
_EMPTY_,
_DEFAULT_MAINTAINER_,
baseToken,
quoteToken,
_createFeeRateModel(_EMPTY_, lpFeeRate),
_DEFAULT_MT_FEE_RATE_MODEL_,
_DEFAULT_PERMISSION_MANAGER_,
_DEFAULT_GAS_PRICE_SOURCE_,
i,
k
);
}
_REGISTRY_[baseToken][quoteToken].push(newVendingMachine);
_USER_REGISTRY_[creator].push(newVendingMachine);
emit NewUnOwnedDVM(baseToken, quoteToken, creator, newVendingMachine);
}
function _createFeeRateModel(address owner, uint256 feeRate)
internal
returns (address feeRateModel)
{
feeRateModel = ICloneFactory(_CLONE_FACTORY_).clone(_FEE_RATE_MODEL_TEMPLATE_);
IFeeRateModel(feeRateModel).init(owner, feeRate);
}
// ============ View Functions ============
function getVendingMachine(address baseToken, address quoteToken)
external
view
returns (address[] memory machines)
{
return _REGISTRY_[baseToken][quoteToken];
}
function getVendingMachineBidirection(address token0, address token1)
external
view
returns (address[] memory baseToken0Machines, address[] memory baseToken1Machines)
{
return (_REGISTRY_[token0][token1], _REGISTRY_[token1][token0]);
}
function getVendingMachineByUser(address user)
external
view
returns (address[] memory machines)
{
return _USER_REGISTRY_[user];
}
}

42
contracts/SmartRoute/helper/DODOV2RouteHelper.sol
View File

@@ -13,7 +13,6 @@ import {IDODOV2} from "../intf/IDODOV2.sol";
contract DODOV2RouteHelper {
address public immutable _DVM_FACTORY_;
address public immutable _DPP_FACTORY_;
//TODO:UnownedDVMFactory 去掉可行性
struct PairDetail {
uint256 i;
@@ -23,7 +22,10 @@ contract DODOV2RouteHelper {
uint256 B0;
uint256 Q0;
uint8 R;
uint256 totalFeeRate;
uint256 lpFeeRate;
uint256 mtFeeRate;
address baseToken;
address quoteToken;
}
constructor(address dvmFactory,address dppFactory) public {
@@ -37,30 +39,40 @@ contract DODOV2RouteHelper {
uint256 len = baseToken0DVM.length + baseToken1DVM.length + baseToken0DPP.length + baseToken1DPP.length;
res = new PairDetail[](len);
for(uint8 i = 0; i < len; i++) {
PairDetail memory curRes = PairDetail(0,0,0,0,0,0,0,0);
PairDetail memory curRes = PairDetail(0,0,0,0,0,0,0,0,0,address(0),address(0));
address cur;
if(i < baseToken0DVM.length) {
cur = baseToken0DVM[i];
curRes.baseToken = token0;
curRes.quoteToken = token1;
} else if(i < baseToken0DVM.length + baseToken1DVM.length) {
cur = baseToken1DVM[i - baseToken0DVM.length];
curRes.baseToken = token1;
curRes.quoteToken = token0;
} else if(i < baseToken0DVM.length + baseToken1DVM.length + baseToken0DPP.length) {
cur = baseToken0DPP[i - baseToken0DVM.length - baseToken1DVM.length];
curRes.baseToken = token0;
curRes.quoteToken = token1;
} else {
cur = baseToken1DPP[i - baseToken0DVM.length - baseToken1DVM.length - baseToken0DPP.length];
curRes.baseToken = token1;
curRes.quoteToken = token0;
}
(
curRes.i,
curRes.K,
curRes.B,
curRes.Q,
curRes.B0,
curRes.Q0,
curRes.R
) = IDODOV2(cur).getPMMStateForCall();
(uint256 lpFeeRate, uint256 mtFeeRate) = IDODOV2(cur).getUserFeeRate(userAddr);
curRes.totalFeeRate = lpFeeRate + mtFeeRate;
if(!IDODOV2(cur)._BUYING_CLOSE_() && !IDODOV2(cur)._SELLING_CLOSE_()){
(
curRes.i,
curRes.K,
curRes.B,
curRes.Q,
curRes.B0,
curRes.Q0,
curRes.R
) = IDODOV2(cur).getPMMStateForCall();
(curRes.lpFeeRate, curRes.mtFeeRate) = IDODOV2(cur).getUserFeeRate(userAddr);
}
res[i] = curRes;
}
}

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

@@ -18,9 +18,13 @@ interface IDODOV2 {
function getVaultReserve() external view returns (uint256 baseReserve, uint256 quoteReserve);
function _BASE_TOKEN_() external returns (address);
function _BASE_TOKEN_() external view returns (address);
function _QUOTE_TOKEN_() external returns (address);
function _QUOTE_TOKEN_() external view returns (address);
function _BUYING_CLOSE_() external view returns (bool);
function _SELLING_CLOSE_() external view returns (bool);
function _OWNER_() external returns (address);