diff --git a/config/mbtest-config.js b/config/mbtest-config.js deleted file mode 100644 index cac44d9..0000000 --- a/config/mbtest-config.js +++ /dev/null @@ -1,56 +0,0 @@ -module.exports = { - MBTEST_CONFIG: { - //TOKEN - WETH: "0xF8cef78E923919054037a1D03662bBD884fF4edf", - CHI: "0x0000000000000000000000000000000000000000", - DODO: "0x42e2EE7Ba8975c473157634Ac2AF4098190fc741", - - //Helper - DODOSellHelper: "0xe573BCA813c741229ffB2488F7856C6cAa841041", - DODOCalleeHelper: "0xBb0CC0fb3e0c06725c67167501f850B4900D6DB5", - DODOV1PmmHelper: "0xfE5D3c52F7ee9aa32a69b96Bfbb088Ba0bCd8EfC", - DODOV2RouteHelper: "0x750C200d7c7C426da169742f705CA5268e1736b4", - - //Template - CloneFactory: "0x92496871560a01551E1B4fD04540D7A519D5C19e", - FeeRateModel: "0x63A1519eE99d1121780FFfa1726Ed2eCc6d1611B", - PermissionManager: "0x50275d3F95E0F2FCb2cAb2Ec7A231aE188d7319d", - DVM: "0x596fB37d99bd679d1af76fBCB658f7a1a31A1205", - DPP: "0x4d6942683D051FF95804B08EF11F98A7F41C1b44", - DPPAdmin: "0x79885EBC79783C9174faC36Ed99cD9467CB8cDbE", - CP: "0xe9CC152481642D7a3Ea207E3930067B19663770F", - ERC20: "0x0484C33Bad127FA77CC64d6475aDD6483c70BbB9", - MintableERC20: "0x4FBb399fB0E360e11DFF274090650C7e588F1af1", - - //Factory - DVMFactory: "0xFa39bFe0f589aba7315090bDaEbDF617535B130f", - DPPFactory: "0x708bE4dA5e8D8E40dC51A1Dc5987Cc2a7fB22334", - CrowdPoolingFactory: "0xE18691ddF53F52705CBD518dF4c2632adDD8a9e5", - ERC20Factory: "0xC7430D8919b54F85a723810FBceF2114482EC5D1", - - //Approve - DODOApprove: "0xC683516e791c5E2b8e913dE0670d499927f54CEc", - DODOApproveProxy: "0x1bc238EAd60bdF5e94BB8f7205b6e75ACabACbC0", - - //Periphery - DODOIncentive: "0xc5A6D29ed21e63A994A766558cDb055832dbF886", - - //Adpater - DODOV1Adapter: "0x1a3fa978909d86dF1244216b02733136b438D83E", - DODOV2Adapter: "0x0e1630bd2bc047fF6338F78Dc45410e1c0Fc32a0", - UniAdapter: "0x1E7727eDad5a2ef47C5AB95a20FEd515735591B2", - - //Proxy - DODOV2Proxy: "0x58eD6D2faa3C8Ff63e327463823d741E84721B6D", - - //vDODO - DODOCirculationHelper: "", - Governance: "", - dodoTeam: "", - vDODOToken: "", - - //Account - multiSigAddress: "", - defaultMaintainer: "", - } -} \ No newline at end of file diff --git a/config/mbtestnet-config.js b/config/mbtestnet-config.js deleted file mode 100644 index eb5d32e..0000000 --- a/config/mbtestnet-config.js +++ /dev/null @@ -1,56 +0,0 @@ -module.exports = { - MBTESTNET_CONFIG: { - //TOKEN - WETH: "0x18AA6Bb215CDBd179E7beAE10F66C21B26971306", - CHI: "0x0000000000000000000000000000000000000000", - DODO: "0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d", - - //Helper - DODOSellHelper: "0x67ee3Cb086F8a16f34beE3ca72FAD36F7Db929e2", - DODOCalleeHelper: "0xaaffAd1017D6a13E026A00121BF258C616B25f7C", - DODOV1PmmHelper: "0x4EE6398898F7FC3e648b3f6bA458310ac29cD352", - DODOV2RouteHelper: "0x55793C2c8A796cCE00EF2D1a86CCA2E0399BF285", - - //Template - CloneFactory: "0x1ddD02f6d31C1eF04cFA0a1AA811406B5B2884E7", - FeeRateModel: "0xD56281EF996B6B29874C77D2e1464216E8043127", - PermissionManager: "0x61b21603A527b487C4a3A80a69224b87751D0F6a", - DVM: "0xF7c5311B618E6dFBBc34210c92D2C9675D7EdDCA", - DPP: "0x4EfF1D851366b8cc51d553a87e2d12dA8Da46F2a", - DPPAdmin: "0x790B4A80Fb1094589A3c0eFC8740aA9b0C1733fB", - CP: "0x97f0153E7F5749640aDF3Ff9CFC518b79D6Fe53b", - ERC20: "0xAfe0A75DFFb395eaaBd0a7E1BBbd0b11f8609eeF", - MintableERC20: "0xC3528D128CC227fd60793007b5e3FdF7c2945282", - - //Factory - DVMFactory: "0x77106d0f8c5B8ADF95a7feaae5bea130b1D2D748", - DPPFactory: "0x67e5a449EF6B0da29D338023e7cfc50a2975F9Bb", - CrowdPoolingFactory: "0x0Fba7F96f3D7196FfAcaC46356F05Fdb7B24c38d", - ERC20Factory: "0x778DF5B12170e8af8dF94356BfC864E57CE185DC", - - //Approve - DODOApprove: "0x1565666CD77bB6DDE193e1D37Ad7b07900e6f4c0", - DODOApproveProxy: "0x1dc8D1f1600B7C1D39e6b60FBC7b021Bc4F9C993", - - //Periphery - DODOIncentive: "0x8F8Dd7DB1bDA5eD3da8C9daf3bfa471c12d58486", - - //Adpater - DODOV1Adapter: "0x1c31c6d0032768463EaBABe1A47D04c6470d31fE", - DODOV2Adapter: "0x8Fc0d51915D631Ff6B8b70dEEAE789cE5c792a62", - UniAdapter: "0x2F2f9460500F27db68AAfBfa0472cEDDb168a5a6", - - //Proxy - DODOV2Proxy: "0xf94435Ad7Edc3D5aDd1C1345622Bb745D0387416", - - //vDODO - DODOCirculationHelper: "", - Governance: "", - dodoTeam: "", - vDODOToken: "", - - //Account - multiSigAddress: "", - defaultMaintainer: "", - } -} \ No newline at end of file diff --git a/config/moonriver-config.js b/config/moonriver-config.js new file mode 100644 index 0000000..113f478 --- /dev/null +++ b/config/moonriver-config.js @@ -0,0 +1,95 @@ +module.exports = { + MOONRIVER_CONFIG: { + //TOKEN + WETH: "0x98878B06940aE243284CA214f92Bb71a2b032B8A", + CHI: "0x0000000000000000000000000000000000000000", + DODO: "", + + //Helper + //MultiCall: "0xA922EeEB7909E4a06DCb4b2bff0335Cd027cCfbF", + //DODOSwapCalcHelper: "0xA45b1105d21dFd3915EaDF1b5523196B458C7614", + //DODOZoo: "", + //DODO: "", + //ERC20Helper: "0x6373ceB657C83C91088d328622573FB766064Ac4", //not verify + DODOSellHelper: "0x5e84190a270333aCe5B9202a3F4ceBf11b81bB01", //not verify + DODOCalleeHelper: "0x6B208E08dcF6BD51F50C5Da09d15B2D8E5C46Cf2", //not verify + DODOV1PmmHelper: "0x3CD6D7F5fF977bf8069548eA1F9441b061162b42", //not verify + DODOV2RouteHelper: "0x6B4Fa0bc61Eddc928e0Df9c7f01e407BfcD3e5EF", + CurveSample: "", + + //Template + CloneFactory: "0xDfaf9584F5d229A9DBE5978523317820A8897C5A", //not verify + FeeRateModel: "0x2BBD66fC4898242BDBD2583BBe1d76E8b8f71445", + PermissionManager: "0x729f7f44bf64Ce814716b6261e267DbE6cdf021c", //not verify + DVM: "0xC3BeD579CaB3EC29B22D9AB99F4E586af42496b9",//not verify + DPP: "0x989DcAA95801C527C5B73AA65d3962dF9aCe1b0C",//not verify + DSP: "0x550B2e7bD9605b8dcdd20d01bA73f1feB6ce289b", + DPPAdmin: "0x041ABa00c57Dd47abC37A2931dF569a2A2cc57Be", + CP: "0x72d220cE168C4f361dD4deE5D826a01AD8598f6C", + ERC20MineV3: "0xf50BDc9E90B7a1c138cb7935071b85c417C4cb8e", + + ERC20: "0x80930Cb1849F7D42531506fF45E66724338A821b", + MintableERC20: "", + CustomERC20: "0xB5Dc5E183c2aCf02aB879A8569aB4EDAf147d537", + + //Factory + DVMFactory: "0x738Ebf387A0CE0eb46b0eF8Fa5DEa2EaE6B1Df51", + DPPFactory: "0xb57Dd5c265dBb13CA014F2332069E90CD0e22e65", + DSPFactory: "0xB76de21f04F677f07D9881174a1D8E624276314C", + UpCpFactory: "0x043957f7554275b90c5178872faE851dcfC1089D", + CrowdPoolingFactory: "0x0596908263Ef2724fBfBcAfA1c983FCD7a629038", + ERC20V2Factory: "0xaeB5CF31b97dce6134e416129845e01106fFB177", + DODOMineV3Registry: "0x5515363c0412AdD5c72d3E302fE1bD7dCBCF93Fe", + + //Approve + DODOApprove: "0xE8C9A78725D0451FA19878D5f8A3dC0D55FECF25", + DODOApproveProxy: "0x7737fd30535c69545deeEa54AB8Dd590ccaEBD3c", + + + //Adapter + DODOV1Adapter: "0x40672211D4310ad71daDc8cDE7Aa3Fb90d420855", + DODOV2Adapter: "0xbe9a66e49503e84ae59a4d0545365AABedf33b40", + UniAdapter: "0xa356867fDCEa8e71AEaF87805808803806231FdC", + CurveAdapter: "", + + + //Proxy + DODOV2Proxy: "0xa2CB66EBB947D217f61510882096F6e95c1DE97D", + DSPProxy: "0x5480B32c03647ff5E5A653F0465E798DBe558B57", + CpProxy: "0x45894C062E6f4E58B257e0826675355305dfef0d", + RouteProxy: "0x958f79e2998DFe417208b9A07D799265B0298e58", + DODOMineV3Proxy: "0xb159260989012fA98af560A3Fa6D9cd11a64cf6E", + + //Account + multiSigAddress: "0xef49a6DBa1C8DF859E49c17E9A485B439c7689d3", + defaultMaintainer: "0xef49a6DBa1C8DF859E49c17E9A485B439c7689d3", + + + //================== NFT ==================== + BuyoutModel: "", + Fragment: "", + NFTCollateralVault: "", + DODONFTRouteHelper: "", + + InitializableERC721: "", + InitializableERC1155: "", + NFTTokenFactory: "", + + DodoNftErc721: "", + DodoNftErc1155: "", + + DODONFTRegistry: "", + DODONFTProxy: "", + + //================= DropsV1 ================= + MysteryBoxV1: "", + RandomGenerator: "", + RandomPool: [ + "", + ], + + //================= DropsV2 ================== + DropsFeeModel: "", + DropsProxy: "" + } +} \ No newline at end of file diff --git a/configAdapter.js b/configAdapter.js index 3263a1c..0df241f 100644 --- a/configAdapter.js +++ b/configAdapter.js @@ -2,13 +2,12 @@ const { ETH_CONFIG } = require("./config/eth-config"); const { BSC_CONFIG } = require("./config/bsc-config"); const { HECO_CONFIG } = require("./config/heco-config"); const { KOVAN_CONFIG } = require("./config/kovan-config"); -const { MBTEST_CONFIG } = require("./config/mbtest-config"); -const { MBTESTNET_CONFIG } = require("./config/mbtestnet-config"); const { MATIC_CONFIG } = require("./config/matic-config"); const { ARB_CONFIG } = require("./config/arb-config"); const { RINKEBY_CONFIG } = require("./config/rinkeby-config"); const { OK_CONFIG } = require("./config/ok-config"); const { NEON_TEST_CONFIG } = require("./config/neon-test-config"); +const { MOONRIVER_CONFIG } = require("./config/moonriver-config"); exports.GetConfig = function (network, accounts) { var CONFIG = {} @@ -31,6 +30,9 @@ exports.GetConfig = function (network, accounts) { case "ok": CONFIG = OK_CONFIG break; + case "moonriver": + CONFIG = MOONRIVER_CONFIG + break; //testnet case "kovan": CONFIG = KOVAN_CONFIG @@ -47,16 +49,6 @@ exports.GetConfig = function (network, accounts) { CONFIG.multiSigAddress = accounts[0] CONFIG.defaultMaintainer = accounts[0] break; - case "mbtestnet": - CONFIG = MBTEST_CONFIG - CONFIG.multiSigAddress = accounts[0] - CONFIG.defaultMaintainer = accounts[0] - break; - case "mbtestnet_offical": - CONFIG = MBTESTNET_CONFIG - CONFIG.multiSigAddress = accounts[0] - CONFIG.defaultMaintainer = accounts[0] - break; } return CONFIG } diff --git a/migrations/2_deploy_v2.js b/migrations/2_deploy_v2.js index c03e309..4d89033 100644 --- a/migrations/2_deploy_v2.js +++ b/migrations/2_deploy_v2.js @@ -404,9 +404,6 @@ module.exports = async (deployer, network, accounts) => { DODOApproveProxyAddress, DODOSellHelperAddress ); - await deployer.deploy( - DODOProxyV2 - ); DODOV2ProxyAddress = DODOProxyV2.address; logger.log("DODOV2Proxy02 Address: ", DODOProxyV2.address); const DODOProxyV2Instance = await DODOProxyV2.at(DODOProxyV2.address); diff --git a/truffle-config.js b/truffle-config.js index 88921c5..3f36d4a 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -135,18 +135,11 @@ module.exports = { network_id: 128 }, - mbtestnet: { + moonriver: { provider: () => { - return new HDWalletProvider(privKey, 'https://moonbeam-rpc.dodoex.io'); + return new HDWalletProvider(privKey, 'https://rpc.moonriver.moonbeam.network'); }, - network_id: 1281, - }, - - mbtestnet_offical: { - provider: () => { - return new HDWalletProvider(privKey, 'https://rpc.testnet.moonbeam.network'); - }, - network_id: 1287, + network_id: 1285, }, oktest: {