From 365a14c4772d0f5121f281c146c285e493c71c7e Mon Sep 17 00:00:00 2001 From: tracy <25892474+traceurl@users.noreply.github.com> Date: Mon, 13 Nov 2023 16:28:56 +0800 Subject: [PATCH] deploy to manta --- config/manta-config.js | 60 +++++++++++++++++++++++ configAdapter.js | 3 +- contracts/external/MulticallWithValid.sol | 2 +- migrations/3_deploy_v2.js | 2 +- 4 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 config/manta-config.js diff --git a/config/manta-config.js b/config/manta-config.js new file mode 100644 index 0000000..7620ba1 --- /dev/null +++ b/config/manta-config.js @@ -0,0 +1,60 @@ +module.exports = { + MANTA_CONFIG: { + //TOKEN + WETH: "0x0Dc808adcE2099A9F62AA87D9670745AbA741746", + + //Helper + DODOSellHelper: "0x8eA40e8Da3ae64Bad5E77a5f7DB346499F543baC", + DODOCalleeHelper: "0x44023441f2Bad375b6b5C6354B03c3E9AD01E269", + DODOV1PmmHelper: "0x17644d3B366273faC75A07996E2F90A99A2946a7", + DODOV2RouteHelper: "0x4CAD0052524648A7Fa2cfE279997b00239295F33", + ERC20Helper: "0xB5c7BA1EAde74800cD6cf5F56b1c4562De373780", + DODOSwapCalcHelper: "0xbcd2FDC3B884Cf0dfD932f55Ec2Fe1fB7e8c62Da", + MultiCall: "0xf5Ec1a19e1570bDf0A3AaA6585274f27027270b1", + + //Template + CloneFactory: "0x628E5081bA93b1c4F58E54e7175088B1ACe58852", + FeeRateModel: "0x7B07164ecFaF0F0D85DFC062Bc205a4674c75Aa0", + FeeRateDIP3Impl: "0x4aAe1d041C01078725dB016BA4D4F72455CaF931", + PermissionManager: "0x5fe43C0EbfE66b83C10A9A37AD1E4aC640AAAA65", + DVM: "0x1fC8EC204549C865a17b4059A57decA66A4Bd4cC", + DSP: "0x6a9De0C6235bDD14B52eeA53F5a08Ff7D4183b3e", + DPPAdvanced: "0xCb3dC90E800C961d4a206BeAAFd92A6d2E06495e", + DPPAdvancedAdmin: "0xCD536b4DECFD2fa0443666B6becD145F8aDe2E48", + CP: "0x3dD629473A2eD7f3C6299FFD9F3e0C283d073f11", + ERC20MineV2: "0x89872650fA1A391f58B4E144222bB02e44db7e3B", + ERC20MineV3: "0x6de4d882a84A98f4CCD5D33ea6b3C99A07BAbeB1", + ERC20: "0x8414560d69650bC0c915d5d4385e1714a23cbe81", + CustomERC20: "0xEAC4BFef7D1c872Ed705B01856af7f9802adC596", + CustomMintableERC20: "0x04f7BaE2A4c05cd567F762E33450deBCebdC89EA", + + //Factory + DVMFactory: "0x97bBF5BB1dcfC93A8c67e97E50Bea19DB3416A83", + DPPFactory: "0xa71415675F68f29259ddD63215E5518d2735bf0a", + DSPFactory: "0x29C7718e8B606cEF1c44Fe6e43e07aF9D0875DE1", + CrowdPoolingFactory: "0xFD2b7994f91c08aAa5e013E899334A2DBb500DF1", + ERC20V3Factory: "0xc0F9553Df63De5a97Fe64422c8578D0657C360f7", + DODOMineV2Factory: "0x46AF6b152F2cb02a3cFcc74014C2617BC4F6cD5C", + DODOMineV3Registry: "0x66c45FF040e86DC613F239123A5E21FFdC3A3fEC", + + //Approve + DODOApprove: "0x0226fCE8c969604C3A0AD19c37d1FAFac73e13c2", + DODOApproveProxy: "0xa23137871C4A4ce8514f581EE82262CD1A49EEAE", + + //Adpater + DODOV2Adapter: "0x7dB214f2D46d94846936a0f8Bd9044c5C5Bd2b93", + + //Proxy + DODOV2Proxy: "0x2F86652dAEF5f1728c54191C955F065Ec3C188c7", + DSPProxy: "0x0B1467f71c082D8d410aF4376C685D9A6893cF36", + CpProxy: "0x2F66C5aAF006Bd9c51615D617589C16c0ed35fD3", + DPPProxy: "0xCDA4a6cc5997002B87f28D46852F9F0aA0f3c897", + FeeRouteProxy1: "0x2933c0374089D7D98BA0C71c5E02E1A0e09deBEE", // for front-end + FeeRouteProxy2: "0x200D866Edf41070DE251Ef92715a6Ea825A5Eb80", // for widget + DODOMineV3Proxy: "0xA6d0066328Edbcf3220cf8F61e8527e589DD9719", + + //Account + multiSigAddress: "0xa7b9C3a116b20bEDDdBE4d90ff97157f67F0bD97", + defaultMaintainer: "0xa7b9C3a116b20bEDDdBE4d90ff97157f67F0bD97", + } +} \ No newline at end of file diff --git a/configAdapter.js b/configAdapter.js index ac12c8b..854a9d7 100755 --- a/configAdapter.js +++ b/configAdapter.js @@ -16,6 +16,7 @@ const { LINEA_CONFIG } = require("./config/linea-config"); const { BASE_CONFIG } = require("./config/base-config"); const { SCROLL_SEPOLIA_CONFIG } = require("./config/scroll-sepolia-config"); const { MANTA_TESTNET_CONFIG } = require("./config/manta-testnet-config"); +const { MANTA_CONFIG } = require("./config/manta-config"); const { OPTIMISM_CONFIG } = require("./config/optimism-config"); const { SCROLL_CONFIG } = require("./config/scroll-config"); @@ -62,7 +63,7 @@ exports.GetConfig = function (network, accounts) { CONFIG = BASE_CONFIG break; case "dashboard": - CONFIG = SCROLL_CONFIG + CONFIG = MANTA_CONFIG break; //testnet case "kovan": diff --git a/contracts/external/MulticallWithValid.sol b/contracts/external/MulticallWithValid.sol index a5ba7be..35e409a 100644 --- a/contracts/external/MulticallWithValid.sol +++ b/contracts/external/MulticallWithValid.sol @@ -7,7 +7,7 @@ pragma experimental ABIEncoderV2; /// @author Nick Johnson // WithValid -contract Multicall { +contract MulticallWithValid { struct Call { address target; bytes callData; diff --git a/migrations/3_deploy_v2.js b/migrations/3_deploy_v2.js index 010ad77..2276804 100644 --- a/migrations/3_deploy_v2.js +++ b/migrations/3_deploy_v2.js @@ -589,7 +589,7 @@ module.exports = async (deployer, network, accounts) => { //DODOMineV2Factory set owner console.log("DODOMineV2Factory set owner"); - const dodoMineV2FactoryInstance = await DODOMineV2Factory.at(DODOMineV2FactoryAddress); + const dodoMineV2FactoryInstance = await MineV2Factory.at(DODOMineV2FactoryAddress); var tx = await dodoMineV2FactoryInstance.initOwner(multiSigAddress); logger.log("Init DODOMineV2Factory Tx:", tx.tx);