arb+ing

2021-06-01 21:18:35 +08:00
parent e29a88c60f
commit 4facf65919
5 changed files with 124 additions and 4 deletions
--- a/config/arb-config.js
+++ b/config/arb-config.js
@@ -0,0 +1,54 @@
+module.exports = {
+    ARB_CONFIG: {
+        //TOKEN
+        WETH: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
+        CHI: "0x0000000000000000000000000000000000000000",
+        DODO: "",
+
+        //Helper
+        DODOSellHelper: "0x18AA6Bb215CDBd179E7beAE10F66C21B26971306",
+        DODOCalleeHelper: "0xaaffAd1017D6a13E026A00121BF258C616B25f7C",
+        DODOV1PmmHelper: "0x4EE6398898F7FC3e648b3f6bA458310ac29cD352",
+        DODOV2RouteHelper: "",
+
+        //Template
+        CloneFactory: "0x1ddD02f6d31C1eF04cFA0a1AA811406B5B2884E7",
+        FeeRateModel: "0xD56281EF996B6B29874C77D2e1464216E8043127",
+        PermissionManager: "0x61b21603A527b487C4a3A80a69224b87751D0F6a",
+        DVM: "0x790B4A80Fb1094589A3c0eFC8740aA9b0C1733fB",
+        DPP: "",
+        DSP: "",
+
+        DPPAdmin: "",
+        CP: "",
+        ERC20: "0xC3528D128CC227fd60793007b5e3FdF7c2945282",
+        MintableERC20: "",
+
+        //Factory
+        DVMFactory: "",
+        DPPFactory: "",
+        DSPFactory: "",
+        UpCpFactory: "",
+        CrowdPoolingFactory: "",
+        ERC20Factory: "",
+
+        //Approve
+        DODOApprove: "",
+        DODOApproveProxy: "",
+
+        //Adapter
+        DODOV1Adapter: "",
+        DODOV2Adapter: "0x97f0153E7F5749640aDF3Ff9CFC518b79D6Fe53b",
+        UniAdapter: "",
+
+        //Proxy
+        DODOV2Proxy: "",
+        DSPProxy: "",
+        CpProxy: "",
+        RouteProxy: "",
+
+        //Account
+        multiSigAddress: "0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d",
+        defaultMaintainer: "0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d",
+    }
+}
--- a/configAdapter.js
+++ b/configAdapter.js
@@ -7,6 +7,7 @@ const { MBTESTNET_CONFIG } = require("./config/mbtestnet-config");
 const { OKTEST_CONFIG } = require("./config/oktest-config");
 const { ARBTEST_CONFIG } = require("./config/arbtest-config");
 const { MATIC_CONFIG } = require("./config/matic-config");
+const { ARB_CONFIG } = require("./config/arb-config");

 exports.GetConfig = function (network, accounts) {
    var CONFIG = {}
@@ -24,6 +25,9 @@ exports.GetConfig = function (network, accounts) {
        case "matic":
            CONFIG = MATIC_CONFIG
            break;
+        case "arb":
+            CONFIG = ARB_CONFIG
+            break;
        //testnet
        case "kovan":
            CONFIG = KOVAN_CONFIG
--- a/deploy-detail-v2.0.txt
+++ b/deploy-detail-v2.0.txt
@@ -1085,3 +1085,56 @@ Deploy type: V2 - Adapter
 DODOV1Adapter Address:  0xB5397B2210f49e96a5EB2c9747Aa2bD9397d90C0
 DODOV2Adapter Address:  0x02fCB21dc1cf221939C1d4277fB54016b5d32bC7
 UniAdapter Address:  0xbef0C8Cd420b76e9d31509abbfd7f8C9f664527c
+====================================================
+network type: arb
+Deploy time: 2021/5/31 下午2:41:43
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+====================================================
+network type: arb
+Deploy time: 2021/5/31 下午2:43:10
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+====================================================
+network type: arb
+Deploy time: 2021/5/31 下午2:48:23
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+====================================================
+network type: arb
+Deploy time: 2021/5/31 下午2:49:26
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+====================================================
+network type: arb
+Deploy time: 2021/5/31 下午2:51:29
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+====================================================
+network type: arb
+Deploy time: 2021/5/31 下午2:59:16
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+====================================================
+network type: arb
+Deploy time: 2021/5/31 下午3:00:44
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+DODOCalleeHelperAddress:  0xaaffAd1017D6a13E026A00121BF258C616B25f7C
+DODOV1RouterHelper Address:  0x4EE6398898F7FC3e648b3f6bA458310ac29cD352
+CloneFactoryAddress:  0x1ddD02f6d31C1eF04cFA0a1AA811406B5B2884E7
+DefaultMtFeeRateAddress:  0xD56281EF996B6B29874C77D2e1464216E8043127
+Init DefaultMtFeeRateAddress Tx: 0x4a624beab88b081995bddaf3510e6d00cc86ca82c51eac227203fade882c8784
+DefaultPermissionAddress:  0x61b21603A527b487C4a3A80a69224b87751D0F6a
+Init DefaultPermissionAddress Tx: 0x7a52ed73784396fdf95fa610e59264ae434635464ddd880b2188827511f05261
+====================================================
+network type: arb
+Deploy time: 2021/5/31 下午3:04:16
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+====================================================
+network type: arb
+Deploy time: 2021/5/31 下午3:05:10
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+DvmTemplateAddress:  0x790B4A80Fb1094589A3c0eFC8740aA9b0C1733fB
--- a/migrations/2_deploy_v2.js
+++ b/migrations/2_deploy_v2.js
@@ -45,7 +45,6 @@ module.exports = async (deployer, network, accounts) => {
    if (CONFIG == null) return;
    //TOKEN
    let WETHAddress = CONFIG.WETH;
-    let DODOTokenAddress = CONFIG.DODO;

    //Helper
    let DODOSellHelperAddress = CONFIG.DODOSellHelper;
@@ -103,7 +102,6 @@ module.exports = async (deployer, network, accounts) => {
        logger.log("Deploy type: V2");
        logger.log("multiSigAddress: ", multiSigAddress)

-        if (DODOTokenAddress == "") return;
        //Helper
        if (DODOSellHelperAddress == "") {
            await deployer.deploy(DODOSellHelper);
@@ -333,7 +331,7 @@ module.exports = async (deployer, network, accounts) => {
        logger.log("Init DODOProxyV2 Tx:", tx.tx);


-        if (network == 'kovan' || network == 'mbtestnet' || network == 'oktest' || network == 'matic') {
+        if (network == 'kovan' || network == 'mbtestnet' || network == 'oktest' || network == 'matic' || network == 'arb') {

            const DODOApproveProxyInstance = await DODOApproveProxy.at(DODOApproveProxyAddress);
            var tx = await DODOApproveProxyInstance.init(multiSigAddress, [DODOProxyV2.address, DODOCpProxy.address, DODODspProxy.address]);
--- a/truffle-config.js
+++ b/truffle-config.js
@@ -40,7 +40,7 @@ module.exports = {
   */
  deploySwitch: {
    DEPLOY_V1:      false,
-    DEPLOY_V2:      false,
+    DEPLOY_V2:      true,
    ADAPTER:        false,
    MOCK_TOKEN:     false,
    MOCK_V2_POOL:   false,
@@ -141,6 +141,17 @@ module.exports = {
      skipDryRun: true
    },

+    arb: {
+      provider: function () {
+        return wrapProvider(
+          new HDWalletProvider(privKey, "https://arb1.arbitrum.io/rpc")
+        )
+      },
+      network_id: 42161,
+      gas: 200000000,
+      gasPrice: 400000000,
+    },
+
    arbtest: {
      provider: function () {
        return wrapProvider(