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

update deploy shell && change approve and proxy initOwner

Browse Source
This commit is contained in:
owen05
2020-12-14 17:14:41 +08:00
parent ba4ccf89e3
commit a7cfde52e0
4 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/SmartRoute/DODOApprove.sol
View File

@@ -9,9 +9,9 @@ pragma solidity 0.6.9;
import {IERC20} from "../intf/IERC20.sol";
import {SafeERC20} from "../lib/SafeERC20.sol";
import {Ownable} from "../lib/Ownable.sol";
import {InitializableOwnable} from "../lib/InitializableOwnable.sol";
contract DODOApprove is Ownable {
contract DODOApprove is InitializableOwnable {
using SafeERC20 for IERC20;
// ============ Storage ============

4
contracts/SmartRoute/DODOV1Proxy01.sol
View File

@@ -18,9 +18,9 @@ import {IUni} from "./intf/IUni.sol";
import {IDODOApprove} from "../intf/IDODOApprove.sol";
import {IDODOV1Proxy01} from "./intf/IDODOV1Proxy01.sol";
import {ReentrancyGuard} from "../lib/ReentrancyGuard.sol";
import {Ownable} from "../lib/Ownable.sol";
import {InitializableOwnable} from "../lib/InitializableOwnable.sol";
contract DODOV1Proxy01 is IDODOV1Proxy01, ReentrancyGuard, Ownable {
contract DODOV1Proxy01 is IDODOV1Proxy01, ReentrancyGuard, InitializableOwnable {
using SafeMath for uint256;
using UniversalERC20 for IERC20;

4
contracts/SmartRoute/DODOV2Proxy01.sol
View File

@@ -20,9 +20,9 @@ import {UniversalERC20} from "./lib/UniversalERC20.sol";
import {SafeERC20} from "../lib/SafeERC20.sol";
import {DecimalMath} from "../lib/DecimalMath.sol";
import {ReentrancyGuard} from "../lib/ReentrancyGuard.sol";
import {Ownable} from "../lib/Ownable.sol";
import {InitializableOwnable} from "../lib/InitializableOwnable.sol";
contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, Ownable {
contract DODOV2Proxy01 is IDODOV2Proxy01, ReentrancyGuard, InitializableOwnable {
using SafeMath for uint256;
using UniversalERC20 for IERC20;

42
migrations/2_deploy_v1.5.js
View File

@@ -15,26 +15,29 @@ module.exports = async (deployer, network, accounts) => {
let DODOApproveAddress = "";
let chiAddress = "";
let DODOSwapCalcHelperAddress = "";
let ownerAddress = ""
if (network == "kovan") {
DODOSellHelperAddress = "0xbdEae617F2616b45DCB69B287D52940a76035Fe3";
WETHAddress = "0x5eca15b12d959dfcf9c71c59f8b467eb8c6efd0b";
DODOSwapCalcHelperAddress = "";
// DODOApproveAddress = "0xbcf0fC05860b14cB3D62D1d4C7f531Ad2F28E0fE";
DODOApproveAddress = "0x0C4a80B2e234448E5f6fD86e7eFA733d985004c8";
chiAddress = "0x0000000000004946c0e9f43f4dee607b0ef1fa1c";
ownerAddress = accounts[0];
} else if (network == "live") {
DODOSellHelperAddress = "0x533da777aedce766ceae696bf90f8541a4ba80eb";
WETHAddress = "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2";
// DODOApproveAddress = "0x4eC851895d85bfa6835241b3157ae10FfFD3BebC";
DODOApproveAddress = "";
chiAddress = "0x0000000000004946c0e9F43F4Dee607b0eF1fA1c";
DODOSwapCalcHelperAddress = "0x22C1a736DBE8200E6DF2f3D8F97c0D5749c1E257";
ownerAddress = "0x95C4F5b83aA70810D4f142d58e5F7242Bd891CB0";
} else if (network == "bsclive") {
DODOSellHelperAddress = "0x0F859706AeE7FcF61D5A8939E8CB9dBB6c1EDA33";
WETHAddress = "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c";
DODOApproveAddress = "0x19DA73be23Cea6bFA804Ec020041b8F3971BC522";
DODOApproveAddress = "";
chiAddress = "0x0000000000000000000000000000000000000000";
DODOSwapCalcHelperAddress = "";
//TODO:待生成替换
ownerAddress = accounts[0];
} else return;
if (DEPLOY_ROUTE) {
@@ -42,12 +45,16 @@ module.exports = async (deployer, network, accounts) => {
logger.log("====================================================");
logger.log("network type: " + network);
logger.log("Deploy time: " + new Date().toLocaleString());
var tx;
logger.log("Deploy type: Proxy");
if (DODOApproveAddress == "") {
await deployer.deploy(DODOApprove);
DODOApproveAddress = DODOApprove.address;
logger.log("DODOApprove Address: ", DODOApproveAddress);
const DODOApproveInstance = await DODOApprove.at(DODOApproveAddress);
var tx = await DODOApproveInstance.initOwner(ownerAddress);
logger.log("Set DODOApprove Owner tx: ", tx.tx);
}
if (DODOSellHelperAddress == "") {
await deployer.deploy(DODOSellHelper);
@@ -66,17 +73,24 @@ module.exports = async (deployer, network, accounts) => {
chiAddress
);
logger.log("DODOProxyV1 Address: ", DODOProxyV1.address);
const DODOApproveInstance = await DODOApprove.at(DODOApproveAddress);
var tx = await DODOApproveInstance.setDODOProxy(DODOProxyV1.address);
logger.log("DODOApprove setProxy tx: ", tx.tx);
const DODOProxyV1Instance = await DODOProxyV1.at(DODOProxyV1.address);
var tx1 = await DODOProxyV1Instance.addWhiteList("0x111111125434b319222cdbf8c261674adb56f3ae");
var tx2 = await DODOProxyV1Instance.addWhiteList("0xf740b67da229f2f10bcbd38a7979992fcc71b8eb");
var tx3 = await DODOProxyV1Instance.addWhiteList("0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D");
logger.log("AddWhiteList tx1: ", tx1.tx);
logger.log("AddWhiteList tx2: ", tx2.tx);
logger.log("AddWhiteList tx3: ", tx3.tx);
tx = await DODOProxyV1Instance.initOwner(ownerAddress);
logger.log("Set DODOProxyV1 Owner tx: ", tx.tx);
if (network == "kovan") {
const DODOApproveInstance = await DODOApprove.at(DODOApproveAddress);
tx = await DODOApproveInstance.unlockSetProxy(DODOProxyV1.address);
logger.log("DODOApprove unlockSetProxy tx: ", tx.tx);
tx = await DODOApproveInstance.setDODOProxy();
logger.log("DODOApprove triggerSetProxy tx: ", tx.tx);
// var tx1 = await DODOProxyV1Instance.addWhiteList("0x111111125434b319222cdbf8c261674adb56f3ae");
// var tx2 = await DODOProxyV1Instance.addWhiteList("0xf740b67da229f2f10bcbd38a7979992fcc71b8eb");
// var tx3 = await DODOProxyV1Instance.addWhiteList("0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D");
// logger.log("AddWhiteList tx1: ", tx1.tx);
// logger.log("AddWhiteList tx2: ", tx2.tx);
// logger.log("AddWhiteList tx3: ", tx3.tx);
}
}
};