diff --git a/deploy-detail-v1.5.txt b/deploy-detail-v1.5.txt index beef31c..7fa8ef3 100644 --- a/deploy-detail-v1.5.txt +++ b/deploy-detail-v1.5.txt @@ -10,3 +10,13 @@ DODOSwapCalcHelper Address: 0xED3Ac3335a24331F1704df8CB456C88dCA282782 network type: live Deploy time: 2020/12/9 下午10:16:19 DODOSwapCalcHelper Address: 0x22C1a736DBE8200E6DF2f3D8F97c0D5749c1E257 +==================================================== +network type: live +Deploy time: 2020/12/12 下午12:29:38 +Deploy type: Proxy +DODOApprove Address: 0x2B03B0B40C91808981915A1704BCC086ECC956dB +DODOProxyV1 Address: 0xf1AD611399eDD53f5729178853e00856D01f381E +DODOApprove setProxy tx: 0xb00c07780c0a6a6d2cd03430ae0cc69590b9aebb581bbb3556d2fb929ab115b6 +AddWhiteList tx1: 0xb3e5cbd55c0de94916820a4cccfe4e72d48faeeb73a922f07e088c3634a37c54 +AddWhiteList tx2: 0xc078005b280677d1da032c69adba7d95b28500492b447334bb77151b595a171b +AddWhiteList tx3: 0xe80dbdfc8855677c6bc94cc810e16e36a707c6ca0fd9a56abc625d0940d927a7 diff --git a/migrations/2_deploy_v1.5.js b/migrations/2_deploy_v1.5.js index ea149b1..7667d89 100644 --- a/migrations/2_deploy_v1.5.js +++ b/migrations/2_deploy_v1.5.js @@ -25,9 +25,10 @@ module.exports = async (deployer, network, accounts) => { } else if (network == "live") { DODOSellHelperAddress = "0x533da777aedce766ceae696bf90f8541a4ba80eb"; WETHAddress = "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"; - DODOApproveAddress = "0x4eC851895d85bfa6835241b3157ae10FfFD3BebC"; + // DODOApproveAddress = "0x4eC851895d85bfa6835241b3157ae10FfFD3BebC"; + DODOApproveAddress = ""; chiAddress = "0x0000000000004946c0e9F43F4Dee607b0eF1fA1c"; - DODOSwapCalcHelperAddress = ""; + DODOSwapCalcHelperAddress = "0x22C1a736DBE8200E6DF2f3D8F97c0D5749c1E257"; } else if (network == "bsclive") { DODOSellHelperAddress = "0x0F859706AeE7FcF61D5A8939E8CB9dBB6c1EDA33"; WETHAddress = "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c"; @@ -42,10 +43,11 @@ module.exports = async (deployer, network, accounts) => { logger.log("network type: " + network); logger.log("Deploy time: " + new Date().toLocaleString()); - // logger.log("Deploy type: Proxy"); + logger.log("Deploy type: Proxy"); if (DODOApproveAddress == "") { await deployer.deploy(DODOApprove); DODOApproveAddress = DODOApprove.address; + logger.log("DODOApprove Address: ", DODOApproveAddress); } if (DODOSellHelperAddress == "") { await deployer.deploy(DODOSellHelper); @@ -55,21 +57,26 @@ module.exports = async (deployer, network, accounts) => { await deployer.deploy(DODOSwapCalcHelper, DODOSellHelperAddress); DODOSwapCalcHelperAddress = DODOSwapCalcHelper.address; } - // logger.log("DODOApprove Address: ", DODOApproveAddress); - // logger.log("DODOSellHelper Address: ", DODOSellHelperAddress); - logger.log("DODOSwapCalcHelper Address: ", DODOSwapCalcHelperAddress); - // await deployer.deploy( - // DODOProxyV1, - // DODOApproveAddress, - // DODOSellHelperAddress, - // WETHAddress, - // chiAddress - // ); - // logger.log("DODOProxyV1 Address: ", DODOProxyV1.address); + await deployer.deploy( + DODOProxyV1, + DODOApproveAddress, + DODOSellHelperAddress, + WETHAddress, + chiAddress + ); + logger.log("DODOProxyV1 Address: ", DODOProxyV1.address); - // const DODOApproveInstance = await DODOApprove.at(DODOApproveAddress); - // var tx = await DODOApproveInstance.setDODOProxy(DODOProxyV1.address); - // logger.log("DODOApprovce setProxy tx: ", tx.tx); + 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); } }; diff --git a/truffle-config.js b/truffle-config.js index fdbcedc..3eb0bdd 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -68,7 +68,7 @@ module.exports = { return new HDWalletProvider(privKey, "https://mainnet.infura.io/v3/" + infuraId); }, gas: 3000000, - gasPrice: 50000000000, + gasPrice: 40000000000, network_id: 1, skipDryRun: true },