fix
This commit is contained in:
56
config/oktest-config.js
Normal file
56
config/oktest-config.js
Normal file
@@ -0,0 +1,56 @@
|
||||
module.exports = {
|
||||
OKTEST_CONFIG: {
|
||||
//TOKEN
|
||||
WETH: "",
|
||||
CHI: "0x0000000000000000000000000000000000000000",
|
||||
DODO: "",
|
||||
|
||||
//Helper
|
||||
DODOSellHelper: "",
|
||||
DODOCalleeHelper: "",
|
||||
DODOV1PmmHelper: "",
|
||||
DODOV2RouteHelper: "",
|
||||
|
||||
//Template
|
||||
CloneFactory: "",
|
||||
FeeRateModel: "",
|
||||
PermissionManager: "",
|
||||
DVM: "",
|
||||
DPP: "",
|
||||
DPPAdmin: "",
|
||||
CP: "",
|
||||
ERC20: "",
|
||||
MintableERC20: "",
|
||||
|
||||
//Factory
|
||||
DVMFactory: "",
|
||||
DPPFactory: "",
|
||||
CrowdPoolingFactory: "",
|
||||
ERC20Factory: "",
|
||||
|
||||
//Approve
|
||||
DODOApprove: "",
|
||||
DODOApproveProxy: "",
|
||||
|
||||
//Periphery
|
||||
DODOIncentive: "",
|
||||
|
||||
//Adpater
|
||||
DODOV1Adapter: "",
|
||||
DODOV2Adapter: "",
|
||||
UniAdapter: "",
|
||||
|
||||
//Proxy
|
||||
DODOV2Proxy: "",
|
||||
|
||||
//vDODO
|
||||
DODOCirculationHelper: "",
|
||||
Governance: "",
|
||||
dodoTeam: "",
|
||||
vDODOToken: "",
|
||||
|
||||
//Account
|
||||
multiSigAddress: "",
|
||||
defaultMaintainer: "",
|
||||
}
|
||||
}
|
||||
@@ -31,6 +31,9 @@ contract DVM is DVMTrader, DVMFunding {
|
||||
uint256 k,
|
||||
bool isOpenTWAP
|
||||
) external {
|
||||
require(!_DVM_INITIALIZED_, "DVM_INITIALIZED");
|
||||
_DVM_INITIALIZED_ = true;
|
||||
|
||||
require(baseTokenAddress != quoteTokenAddress, "BASE_QUOTE_CAN_NOT_BE_SAME");
|
||||
_BASE_TOKEN_ = IERC20(baseTokenAddress);
|
||||
_QUOTE_TOKEN_ = IERC20(quoteTokenAddress);
|
||||
|
||||
@@ -21,6 +21,8 @@ contract DVMStorage is ReentrancyGuard {
|
||||
|
||||
bool public _IS_OPEN_TWAP_ = false;
|
||||
|
||||
bool internal _DVM_INITIALIZED_;
|
||||
|
||||
// ============ Core Address ============
|
||||
|
||||
address public _MAINTAINER_;
|
||||
|
||||
@@ -97,7 +97,8 @@ module.exports = async (deployer, network, accounts) => {
|
||||
logger.log("network type: " + network);
|
||||
logger.log("Deploy time: " + new Date().toLocaleString());
|
||||
logger.log("Deploy type: V2");
|
||||
|
||||
logger.log("multiSigAddress: ", multiSigAddress)
|
||||
|
||||
if (DODOTokenAddress == "") return;
|
||||
//Helper
|
||||
if (DODOSellHelperAddress == "") {
|
||||
@@ -282,7 +283,7 @@ module.exports = async (deployer, network, accounts) => {
|
||||
logger.log("Init DODOProxyV2 Tx:", tx.tx);
|
||||
|
||||
|
||||
if (network == 'kovan') {
|
||||
if (network == 'kovan' || network == 'mbtestnet') {
|
||||
|
||||
const DODOApproveProxyInstance = await DODOApproveProxy.at(DODOApproveProxyAddress);
|
||||
var tx = await DODOApproveProxyInstance.init(multiSigAddress, [DODOProxyV2.address]);
|
||||
|
||||
@@ -39,7 +39,7 @@ module.exports = {
|
||||
*/
|
||||
deploySwitch: {
|
||||
DEPLOY_V1: false,
|
||||
DEPLOY_V2: false,
|
||||
DEPLOY_V2: true,
|
||||
ADAPTER: false,
|
||||
MOCK_TOKEN: false,
|
||||
MOCK_V2_POOL: false,
|
||||
|
||||
Reference in New Issue
Block a user