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

remove some todo

Browse Source
This commit is contained in:
owen05
2020-11-23 10:43:12 +08:00
parent 9a4480208c
commit 8458022a3c
12 changed files with 109 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
contracts/Factory/DPPFactory.sol
View File

@@ -23,12 +23,15 @@ contract DPPFactory is Ownable {
address public _PERMISSION_MANAGER_TEMPLATE_;
address public _VALUE_SOURCE_;
struct DPPInfo{
//TODO: 平台修改tag的权限
struct DPPInfo {
address creator;
uint256 createTimeStamp;
//TODO:other tags
//TODO:池子类型
}
//TODO:tags filter event
// base -> quote -> DPP address list
mapping(address => mapping(address => address[])) _REGISTRY_;
// token0 -> token1 -> DPP address list
@@ -57,31 +60,27 @@ contract DPPFactory is Ownable {
function createStandardDODOPrivatePool(
address baseToken,
address quoteToken,
address[] memory valueTemplates, //feeeRateAddr,mtRateAddr,gasPriceAddr,kAddr,iAddr
uint256[] memory values // feeRate,mtRate,gasPrice,k,i
//TODO: tag 粒度
address[] memory valueTemplates, //feeRateAddr,mtRateAddr,kAddr,iAddr
uint256[] memory values // feeRate,mtRate,k,i
) external returns (address newPrivatePool) {
require(valueTemplates.length == 5 && values.length == 5, "Incorrect number of initialization parameters");
require(valueTemplates.length == 4 && values.length == 4, "Incorrect number of initialization parameters");
(address token0, address token1) = baseToken < quoteToken ? (baseToken, quoteToken) : (quoteToken, baseToken);
uint256 len = _SORT_REGISTRY_[token0][token1].length;
bytes32 salt = keccak256(abi.encodePacked(token0, token1, len));
newPrivatePool = ICloneFactory(_CLONE_FACTORY_).clone2(_DPP_TEMPLATE_,salt);
address[] memory configAddresses = new address[](6);
configAddresses[0] = (valueTemplates[0] == address(0) ? createFeeRateModel(newPrivatePool, values[0]) : valueTemplates[0]);
configAddresses[1] = (valueTemplates[1] == address(0) ? createFeeRateModel(newPrivatePool, values[1]) : valueTemplates[1]);
configAddresses[2] = (valueTemplates[2] == address(0) ? createExternalValueModel(newPrivatePool, values[2]) : valueTemplates[2]);
configAddresses[3] = (valueTemplates[3] == address(0) ? createExternalValueModel(newPrivatePool, values[3]) : valueTemplates[3]);
configAddresses[4] = (valueTemplates[4] == address(0) ? createExternalValueModel(newPrivatePool, values[4]) : valueTemplates[4]);
configAddresses[5] = createPermissionManager(msg.sender);
newPrivatePool = ICloneFactory(_CLONE_FACTORY_).clone(_DPP_TEMPLATE_);
IDPP(newPrivatePool).init(
msg.sender,
msg.sender,
baseToken,
quoteToken,
_DODO_SMART_APPROVE_,
configAddresses
(valueTemplates[0] == address(0) ? createFeeRateModel(newPrivatePool, values[0]) : valueTemplates[0]),
(valueTemplates[1] == address(0) ? createFeeRateModel(newPrivatePool, values[1]) : valueTemplates[1]),
(valueTemplates[2] == address(0) ? createExternalValueModel(newPrivatePool, values[2]) : valueTemplates[2]),
(valueTemplates[3] == address(0) ? createExternalValueModel(newPrivatePool, values[3]) : valueTemplates[3]),
//hardcode
createExternalValueModel(msg.sender, 10**22),
createPermissionManager(msg.sender),
_DODO_SMART_APPROVE_
);
_REGISTRY_[baseToken][quoteToken].push(newPrivatePool);

41
contracts/Factory/DVMFactory.sol
View File

@@ -19,11 +19,22 @@ contract DVMFactory is Ownable {
address public _DVM_TEMPLATE_;
address public _FEE_RATE_MODEL_TEMPLATE_;
address public _PERMISSION_MANAGER_TEMPLATE_;
address public _DEFAULT_GAS_PRICE_SOURCE_;
struct DVMInfo {
address creator;
uint256 createTimeStamp;
//TODO:other tags
}
// base -> quote -> DVM address list
mapping(address => mapping(address => address[])) _REGISTRY_;
// token0 -> token1 -> DVM address list
mapping(address => mapping(address => address[])) _SORT_REGISTRY_;
// creator -> DVM address list
mapping(address => address[]) _USER_REGISTRY_;
// DVM address -> info
mapping(address => DVMInfo) _DVM_INFO_;
constructor(
address cloneFactory,
@@ -46,27 +57,33 @@ contract DVMFactory is Ownable {
uint256 mtFeeRate,
uint256 i,
uint256 k
) external returns (address newVendorMachine) {
newVendorMachine = ICloneFactory(_CLONE_FACTORY_).clone(_DVM_TEMPLATE_);
) external returns (address newVendingMachine) {
(address token0, address token1) = baseToken < quoteToken ? (baseToken, quoteToken) : (quoteToken, baseToken);
newVendingMachine = ICloneFactory(_CLONE_FACTORY_).clone(_DVM_TEMPLATE_);
IDVM(newVendorMachine).init(
IDVM(newVendingMachine).init(
msg.sender,
msg.sender,
baseToken,
quoteToken,
createConstFeeRateModel(msg.sender, lpFeeRate),
createConstFeeRateModel(msg.sender, mtFeeRate),
createConstFeeRateModel(newVendingMachine, lpFeeRate),
createConstFeeRateModel(newVendingMachine, mtFeeRate),
createPermissionManager(msg.sender),
_DEFAULT_GAS_PRICE_SOURCE_,
i,
k
);
//TODO: Create2
//TODO: DVM作为Mapping的字段，维护自身属性
//TODO: 创建者索引，便于my pool查询
_REGISTRY_[baseToken][quoteToken].push(newVendorMachine);
return newVendorMachine;
_REGISTRY_[baseToken][quoteToken].push(newVendingMachine);
_SORT_REGISTRY_[token0][token1].push(newVendingMachine);
_USER_REGISTRY_[msg.sender].push(newVendingMachine);
_DVM_INFO_[newVendingMachine] = (
DVMInfo({
creator: msg.sender,
createTimeStamp: block.timestamp
})
);
return newVendingMachine;
}
function createConstFeeRateModel(address owner, uint256 feeRate)
@@ -84,7 +101,7 @@ contract DVMFactory is Ownable {
return permissionManager;
}
function getVendorMachine(address baseToken, address quoteToken)
function getVendingMachine(address baseToken, address quoteToken)
external
view
returns (address[] memory machines)