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

update deployv1.5 && fix

Browse Source
This commit is contained in:
owen05
2021-01-11 10:19:21 +08:00
parent 9aba31faf8
commit ab4b5b7c03
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/SmartRoute/DODOV1Proxy02.sol
View File

@@ -97,6 +97,7 @@ contract DODOV1Proxy02 is IDODOV1Proxy02, InitializableOwnable {
) external override payable judgeExpired(deadLine) returns (uint256 returnAmount) { ) external override payable judgeExpired(deadLine) returns (uint256 returnAmount) {
require(dodoPairs.length > 0, "DODOV1Proxy02: PAIRS_EMPTY"); require(dodoPairs.length > 0, "DODOV1Proxy02: PAIRS_EMPTY");
require(minReturnAmount > 0, "DODOV1Proxy02: RETURN_AMOUNT_ZERO"); require(minReturnAmount > 0, "DODOV1Proxy02: RETURN_AMOUNT_ZERO");
require(fromToken != _CHI_TOKEN_, "DODOV1Proxy02: NOT_SUPPORT_SELL_CHI");
uint256 originGas = gasleft(); uint256 originGas = gasleft();
if (fromToken != _ETH_ADDRESS_) { if (fromToken != _ETH_ADDRESS_) {

18
migrations/2_deploy_v1.5.js
View File

@@ -4,7 +4,7 @@ const file = fs.createWriteStream("../deploy-detail-v1.5.txt", { 'flags': 'a' })
let logger = new console.Console(file, file); let logger = new console.Console(file, file);
const DODOApprove = artifacts.require("DODOApprove"); const DODOApprove = artifacts.require("DODOApprove");
const DODOProxyV1 = artifacts.require("DODOV1Proxy01"); const DODOProxyV2 = artifacts.require("DODOV1Proxy02");
const DODOSellHelper = artifacts.require("DODOSellHelper"); const DODOSellHelper = artifacts.require("DODOSellHelper");
const DODOSwapCalcHelper = artifacts.require("DODOSwapCalcHelper"); const DODOSwapCalcHelper = artifacts.require("DODOSwapCalcHelper");
@@ -62,20 +62,20 @@ module.exports = async (deployer, network, accounts) => {
} }
await deployer.deploy( await deployer.deploy(
DODOProxyV1, DODOProxyV2,
DODOApproveAddress, DODOApproveAddress,
DODOSellHelperAddress, DODOSellHelperAddress,
WETHAddress, WETHAddress,
chiAddress chiAddress
); );
logger.log("DODOProxyV1 Address: ", DODOProxyV1.address); logger.log("DODOProxyV2 Address: ", DODOProxyV2.address);
const DODOProxyV1Instance = await DODOProxyV1.at(DODOProxyV1.address); const DODOProxyV2Instance = await DODOProxyV2.at(DODOProxyV2.address);
tx = await DODOProxyV1Instance.initOwner(ownerAddress); tx = await DODOProxyV2Instance.initOwner(ownerAddress);
logger.log("Set DODOProxyV1 Owner tx: ", tx.tx); logger.log("Set DODOProxyV2 Owner tx: ", tx.tx);
const DODOApproveInstance = await DODOApprove.at(DODOApproveAddress); // const DODOApproveInstance = await DODOApprove.at(DODOApproveAddress);
tx = await DODOApproveInstance.init(ownerAddress, DODOProxyV1.address); // tx = await DODOApproveInstance.init(ownerAddress, DODOProxyV1.address);
logger.log("Set DODOApprove Owner And Init Set Proxy tx: ", tx.tx); // logger.log("Set DODOApprove Owner And Init Set Proxy tx: ", tx.tx);
// var tx1 = await DODOProxyV1Instance.addWhiteList("0x111111125434b319222cdbf8c261674adb56f3ae"); // var tx1 = await DODOProxyV1Instance.addWhiteList("0x111111125434b319222cdbf8c261674adb56f3ae");
// var tx2 = await DODOProxyV1Instance.addWhiteList("0xdef1c0ded9bec7f1a1670819833240f027b25eff"); // var tx2 = await DODOProxyV1Instance.addWhiteList("0xdef1c0ded9bec7f1a1670819833240f027b25eff");

2
truffle-config.js
View File

@@ -38,7 +38,7 @@ module.exports = {
* $ truffle test --network <network-name> * $ truffle test --network <network-name>
*/ */
deploySwitch: { deploySwitch: {
DEPLOY_V1: false, DEPLOY_V1: true,
DEPLOY_V2: false, DEPLOY_V2: false,
MOCK_TOKEN: false, MOCK_TOKEN: false,
MOCK_V2_POOL: false, MOCK_V2_POOL: false,