deploy on rinkeby

config/arbtest-config.js

@@ -1,58 +0,0 @@
-module.exports = {
-    ARBTEST_CONFIG: {
-        //TOKEN
-        WETH: "0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d",
-        CHI: "0x0000000000000000000000000000000000000000",
-        DODO: "0x67ee3Cb086F8a16f34beE3ca72FAD36F7Db929e2",
-
-        //Helper
-        DODOSellHelper: "0x313fcb27BD83607C33998AA60E409C79Fb2251fd",
-        DODOCalleeHelper: "0x1ddD02f6d31C1eF04cFA0a1AA811406B5B2884E7",
-        DODOV1PmmHelper: "0xD56281EF996B6B29874C77D2e1464216E8043127",
-        DODOV2RouteHelper: "",
-
-        //Template
-        CloneFactory: "0x61b21603A527b487C4a3A80a69224b87751D0F6a",
-        FeeRateModel: "0x4EfF1D851366b8cc51d553a87e2d12dA8Da46F2a",
-        PermissionManager: "0x97f0153E7F5749640aDF3Ff9CFC518b79D6Fe53b",
-        DVM: "0x1565666CD77bB6DDE193e1D37Ad7b07900e6f4c0",
-        DPP: "0x1dc8D1f1600B7C1D39e6b60FBC7b021Bc4F9C993",
-        DPPAdmin: "0x8F8Dd7DB1bDA5eD3da8C9daf3bfa471c12d58486",
-        CP: "0x70eFB31271C0796833f80dA4E6538d05B2AFA72C",
-        ERC20: "0x77106d0f8c5B8ADF95a7feaae5bea130b1D2D748",
-        MintableERC20: "0xa952f8716a753D9e094c4041FEBd163e38B21eDB",
-
-        //Factory
-        DVMFactory: "0xCFea63e3DE31De53D68780Dd65675F169439e470",
-        DPPFactory: "0xb7865a5ceE051d35B09A48b624D7057d3362655a",
-        UpCpFactory: "",
-        CrowdPoolingFactory: "0xCDFD45f965De9932367833Ca7187e4c9C43A2380",
-        ERC20Factory: "0x01f9BfAC04E6184e90bD7eaFD51999CE430Cc750",
-
-        //Approve
-        DODOApprove: "0x1c31c6d0032768463EaBABe1A47D04c6470d31fE",
-        DODOApproveProxy: "0x8Fc0d51915D631Ff6B8b70dEEAE789cE5c792a62",
-
-        //Periphery
-        DODOIncentive: "0x3a60A76aCAe8feeC74D6B5b665d4DBaab2abC406",
-
-
-        //Adapter
-        DODOV1Adapter: "0x3a343F2e4e142412c5dD130359edb765a6054965",
-        DODOV2Adapter: "0x2cD18557E14aF72DAA8090BcAA95b231ffC9ea26",
-        UniAdapter: "0xeCEaDe494FD5F913Fd937C5CAc4577236395Dc32",
-
-        //Proxy
-        DODOV2Proxy: "0x3bde3f150EAED3A506740EEfcbBB1BB4393600a9",
-
-        //vDODO
-        DODOCirculationHelper: "",
-        Governance: "",
-        dodoTeam: "",
-        vDODOToken: "",
-
-        //Account
-        multiSigAddress: "",
-        defaultMaintainer: "",
-    }
-}

config/oktest-config.js

@@ -1,56 +0,0 @@
-module.exports = {
-    OKTEST_CONFIG: {
-        //TOKEN
-        WETH: "0x2219845942d28716c0f7c605765fabdca1a7d9e0",
-        CHI: "0x0000000000000000000000000000000000000000",
-        DODO: "0x19DA73be23Cea6bFA804Ec020041b8F3971BC522",
-
-        //Helper
-        DODOSellHelper: "0x0F859706AeE7FcF61D5A8939E8CB9dBB6c1EDA33",
-        DODOCalleeHelper: "0xe380Ad3181A69BF92133D2feb609867c4adC61eA",
-        DODOV1PmmHelper: "0xED3Ac3335a24331F1704df8CB456C88dCA282782",
-        DODOV2RouteHelper: "0x6A08844EdeB49A8578671F1452Fd7dbcc048424F",
-
-        //Template
-        CloneFactory: "",
-        FeeRateModel: "0x4073f2b9bB95774531b9e23d206a308c614A943a",
-        PermissionManager: "0x0cA2d4BC266B1ad7a0787409AD7a0331D78Eea90",
-        DVM: "0xbd826D0d98480F1D63Bc4125F1368889517559d0",
-        DPP: "0x890ED2A571486799F1b6413fbA4669106441f702",
-        DPPAdmin: "0x00E7e2bE2e5EcD4343DeE10712Aa53e94c7B5958",
-        CP: "0x93e0fd315d95F164147a6C427dA3D6173750C256",
-        ERC20: "0x044B56B8CB54c358415Bf9507d56b1A09b5E4c29",
-        MintableERC20: "0x527a5791761fCeBa189B5bEaE175E922D87c636e",
-
-        //Factory
-        DVMFactory: "0x16810820A4ff4348Fc39C07bDf1641B724E7F5E7",
-        DPPFactory: "0x4f678ECC9d5507eDf39E7656A714A9B51Bb6EA58",
-        CrowdPoolingFactory: "0xf4D3ab686a1E133Ec0806644FE5d1FD94869F88F",
-        ERC20Factory: "0xc54c1D6Bf83c9d8ef260b93dEfc0eC00132Fa33B",
-
-        //Approve
-        DODOApprove: "0x51cB75FEd3beb23Ae3Ed5FC74a761E3913ae47f9",
-        DODOApproveProxy: "0xf40be68442e8bcf900FED714246f99BE556345e7",
-
-        //Periphery
-        DODOIncentive: "0x3318FB94AF0c7B4A45001b5901d36BBA85afef2D",
-
-        //Adpater
-        DODOV1Adapter: "0xa432E1ace51eB849d7a1664e5c60ce965B1fE6E4",
-        DODOV2Adapter: "0xC2aA2C0175e376E63cFb0bd1CAB1196DDc9a7076",
-        UniAdapter: "0x03E2427859119E497EB856a166F616a2Ce5f8c88",
-
-        //Proxy
-        DODOV2Proxy: "0xf83BeeA1025359C4d2cf554C330bF8Fd1a9eEbAb",
-
-        //vDODO
-        DODOCirculationHelper: "",
-        Governance: "",
-        dodoTeam: "",
-        vDODOToken: "",
-
-        //Account
-        multiSigAddress: "",
-        defaultMaintainer: "",
-    }
-}

config/rinkeby-config.js

@@ -20,9 +20,14 @@ module.exports = {
         DSP: "0xe2C23cBF03930418BF97e173FE3E950aD29fdb06",
         DPPAdmin: "0x2FF619B4Cfe36b0F92dD933256B1581a3269a5F4",
         CP: "0x6850eE8cF963B913a8eC3610B5f128C3100178E5",
+<<<<<<< HEAD
         ERC20: "0x7119D1Ec8235bd0a82289fDb1cCAa4bD4D1e0605",
         MintableERC20: "",
         CustomERC20: "0x0Cd57DC8367362314C510446FD106B66989Eb81a",
+=======
+        ERC20: "0x80Dd80AF76D82c1962DdFb7d69C6Fdca2AAEEF00",
+        MintableERC20: "0x595D13871de67Ae33b452e6ef59Aa18d23634FdE",
+>>>>>>> deploy on rinkeby
 
         //Factory
         DVMFactory: "0x17DddEFA0c82E0c850a4Adac2aFE3F1fe977A242",
@@ -31,7 +36,10 @@ module.exports = {
         CrowdPoolingFactory: "0xDD43520779dDCfbDe373174Ee36aEaD39771cD4f",
         UpCpFactory: "0xb09E91505347234Cb722D67042290f50F1C13749",
         ERC20Factory: "0x48476599281CB7DD46dbE47264C4594d1d2E19A8",
+<<<<<<< HEAD
         ERC20V2Factory: "0x7A22e361cB74E69B5B1C800A3aAbE3E50e84F4F6",
+=======
+>>>>>>> deploy on rinkeby
 
         //Approve
         DODOApprove: "0xcC8d87A7C747eeE4242045C47Ef25e0A81D56ae3",
@@ -86,11 +94,7 @@ module.exports = {
         DODONFTProxy: "0x0CF019E13C6527BD34eC6c8323F11aB5DF6f0922",
 
         //================= DropsV1 =================
-<<<<<<< HEAD
         MysteryBoxV1: "",
-=======
-        MysteryBoxV1: "0xff29114d297Fd2945636239E09Ab8333dA5601eA",
->>>>>>> ing
         RandomGenerator: "0x69C8a7fc6E05d7aa36114B3e35F62DEcA8E11F6E",
         RandomPool: [],