update factory

2021-06-03 10:40:03 +08:00
parent 4facf65919
commit 699daaba9c
9 changed files with 114 additions and 26 deletions
--- a/config/arb-config.js
+++ b/config/arb-config.js
@@ -9,42 +9,42 @@ module.exports = {
        DODOSellHelper: "0x18AA6Bb215CDBd179E7beAE10F66C21B26971306",
        DODOCalleeHelper: "0xaaffAd1017D6a13E026A00121BF258C616B25f7C",
        DODOV1PmmHelper: "0x4EE6398898F7FC3e648b3f6bA458310ac29cD352",
-        DODOV2RouteHelper: "",
+        DODOV2RouteHelper: "0xd72b354BD39f8F11D0cA07bD5724896Bb1a42707",

        //Template
        CloneFactory: "0x1ddD02f6d31C1eF04cFA0a1AA811406B5B2884E7",
        FeeRateModel: "0xD56281EF996B6B29874C77D2e1464216E8043127",
        PermissionManager: "0x61b21603A527b487C4a3A80a69224b87751D0F6a",
        DVM: "0x790B4A80Fb1094589A3c0eFC8740aA9b0C1733fB",
-        DPP: "",
-        DSP: "",
+        DPP: "0x1565666CD77bB6DDE193e1D37Ad7b07900e6f4c0",
+        DSP: "0x778DF5B12170e8af8dF94356BfC864E57CE185DC",

-        DPPAdmin: "",
-        CP: "",
+        DPPAdmin: "0x1dc8D1f1600B7C1D39e6b60FBC7b021Bc4F9C993",
+        CP: "0x8F8Dd7DB1bDA5eD3da8C9daf3bfa471c12d58486",
        ERC20: "0xC3528D128CC227fd60793007b5e3FdF7c2945282",
-        MintableERC20: "",
+        MintableERC20: "0x70eFB31271C0796833f80dA4E6538d05B2AFA72C",

        //Factory
-        DVMFactory: "",
-        DPPFactory: "",
-        DSPFactory: "",
-        UpCpFactory: "",
-        CrowdPoolingFactory: "",
-        ERC20Factory: "",
+        DVMFactory: "0xb0C7cB15b52b0093130487209e96CFeC0Ba4Ff66",
+        DPPFactory: "0xF0B4338E3e3dfE9B6934FD68697ba8cF1055A1aD",
+        DSPFactory: "0xa1254eE5c6d6616904A82c55C6e134557096B6D4",
+        UpCpFactory: "0x69f52AC40185A2A005D49114F0B77b7bA856F0a0",
+        CrowdPoolingFactory: "0x884E3EE9e25896c57E7d8d6FAACef22B02BCD6bE",
+        ERC20Factory: "0x141b4497a298340E8B451ac4eeE947B00aDbe07A",

        //Approve
-        DODOApprove: "",
-        DODOApproveProxy: "",
+        DODOApprove: "0xCDFD45f965De9932367833Ca7187e4c9C43A2380",
+        DODOApproveProxy: "0x0fe261aeE0d1C4DFdDee4102E82Dd425999065F4",

        //Adapter
-        DODOV1Adapter: "",
-        DODOV2Adapter: "0x97f0153E7F5749640aDF3Ff9CFC518b79D6Fe53b",
-        UniAdapter: "",
+        DODOV1Adapter: "0xd5a7E197bacE1F3B26E2760321d6ce06Ad07281a",
+        DODOV2Adapter: "0x8aB2D334cE64B50BE9Ab04184f7ccBa2A6bb6391",
+        UniAdapter: "0x17eBC315760Bb47384224A5f3BF829222fbD3Aa7",

        //Proxy
-        DODOV2Proxy: "",
-        DSPProxy: "",
-        CpProxy: "",
+        DODOV2Proxy: "0xeCEaDe494FD5F913Fd937C5CAc4577236395Dc32",
+        DSPProxy: "0x3a343F2e4e142412c5dD130359edb765a6054965",
+        CpProxy: "0x2cD18557E14aF72DAA8090BcAA95b231ffC9ea26",
        RouteProxy: "",

        //Account
--- a/contracts/Factory/CrowdPoolingFactory.sol
+++ b/contracts/Factory/CrowdPoolingFactory.sol
@@ -27,10 +27,10 @@ contract CrowdPoolingFactory is InitializableOwnable {

    address public immutable _CLONE_FACTORY_;
    address public immutable _DVM_FACTORY_;
-    address public immutable _DEFAULT_MAINTAINER_;
    address public immutable _DEFAULT_MT_FEE_RATE_MODEL_;
    address public immutable _DEFAULT_PERMISSION_MANAGER_;
    address public _CP_TEMPLATE_;
+    address public _DEFAULT_MAINTAINER_;

    // ============ Settings =============

@@ -164,6 +164,10 @@ contract CrowdPoolingFactory is InitializableOwnable {
        _CP_TEMPLATE_ = _newCPTemplate;
    }

+    function updateDefaultMaintainer(address _newMaintainer) external onlyOwner {
+        _DEFAULT_MAINTAINER_ = _newMaintainer;
+    }
+
    function setCapRatio(uint256 _newCapRatio) public onlyOwner {
        require(_newCapRatio > 0 && _newCapRatio <= 100, "CP_FACTORY : INVALID");
        _CAP_RATIO_ = _newCapRatio;
--- a/contracts/Factory/DPPFactory.sol
+++ b/contracts/Factory/DPPFactory.sol
@@ -24,9 +24,9 @@ contract DPPFactory is InitializableOwnable {
    // ============ Templates ============

    address public immutable _CLONE_FACTORY_;
-    address public immutable _DEFAULT_MAINTAINER_;
    address public immutable _DEFAULT_MT_FEE_RATE_MODEL_;
    address public immutable _DODO_APPROVE_PROXY_;
+    address public _DEFAULT_MAINTAINER_;
    address public _DPP_TEMPLATE_;
    address public _DPP_ADMIN_TEMPLATE_;

@@ -123,6 +123,10 @@ contract DPPFactory is InitializableOwnable {
        _DPP_ADMIN_TEMPLATE_ = _newDPPAdminTemplate;
    }

+    function updateDefaultMaintainer(address _newMaintainer) external onlyOwner {
+        _DEFAULT_MAINTAINER_ = _newMaintainer;
+    }
+
    function updateDppTemplate(address _newDPPTemplate) external onlyOwner {
        _DPP_TEMPLATE_ = _newDPPTemplate;
    }
--- a/contracts/Factory/DSPFactory.sol
+++ b/contracts/Factory/DSPFactory.sol
@@ -33,8 +33,8 @@ contract DSPFactory is InitializableOwnable {
    // ============ Templates ============

    address public immutable _CLONE_FACTORY_;
-    address public immutable _DEFAULT_MAINTAINER_;
    address public immutable _DEFAULT_MT_FEE_RATE_MODEL_;
+    address public _DEFAULT_MAINTAINER_;
    address public _DSP_TEMPLATE_;

    // ============ Registry ============
@@ -96,6 +96,10 @@ contract DSPFactory is InitializableOwnable {
        _DSP_TEMPLATE_ = _newDSPTemplate;
    }

+    function updateDefaultMaintainer(address _newMaintainer) external onlyOwner {
+        _DEFAULT_MAINTAINER_ = _newMaintainer;
+    }
+
    function addPoolByAdmin(
        address creator,
        address baseToken,
--- a/contracts/Factory/DVMFactory.sol
+++ b/contracts/Factory/DVMFactory.sol
@@ -34,8 +34,8 @@ contract DVMFactory is InitializableOwnable {
    // ============ Templates ============

    address public immutable _CLONE_FACTORY_;
-    address public immutable _DEFAULT_MAINTAINER_;
    address public immutable _DEFAULT_MT_FEE_RATE_MODEL_;
+    address public _DEFAULT_MAINTAINER_;
    address public _DVM_TEMPLATE_;

    // ============ Registry ============
@@ -101,6 +101,10 @@ contract DVMFactory is InitializableOwnable {
    function updateDvmTemplate(address _newDVMTemplate) external onlyOwner {
        _DVM_TEMPLATE_ = _newDVMTemplate;
    }
+    
+    function updateDefaultMaintainer(address _newMaintainer) external onlyOwner {
+        _DEFAULT_MAINTAINER_ = _newMaintainer;
+    }

    function addPoolByAdmin(
        address creator,
--- a/contracts/Factory/UpCrowdPoolingFactory.sol
+++ b/contracts/Factory/UpCrowdPoolingFactory.sol
@@ -27,9 +27,9 @@ contract UpCrowdPoolingFactory is InitializableOwnable {

    address public immutable _CLONE_FACTORY_;
    address public immutable _DVM_FACTORY_;
-    address public immutable _DEFAULT_MAINTAINER_;
    address public immutable _DEFAULT_MT_FEE_RATE_MODEL_;
    address public immutable _DEFAULT_PERMISSION_MANAGER_;
+    address public _DEFAULT_MAINTAINER_;
    address public _CP_TEMPLATE_;

    // ============ Settings =============
@@ -159,6 +159,10 @@ contract UpCrowdPoolingFactory is InitializableOwnable {
        _CP_TEMPLATE_ = _newCPTemplate;
    }

+    function updateDefaultMaintainer(address _newMaintainer) external onlyOwner {
+        _DEFAULT_MAINTAINER_ = _newMaintainer;
+    }
+
    function setFreezeDuration(uint256 _newFreeDuration) public onlyOwner {
        _FREEZE_DURATION_ = _newFreeDuration;
    }
--- a/deploy-detail-periphery.txt
+++ b/deploy-detail-periphery.txt
@@ -480,3 +480,9 @@ network type: heco
 Deploy time: 2021/5/7 下午5:07:08
 Deploy type: test - Adapter
 test_Adapter Address:  0x31AC053c31a77055b2ae2d3899091C0A9c19cE3a
+====================================================
+network type: arb
+Deploy time: 2021/6/2 上午11:20:42
+Deploy type: FeeRateImpl
+FeeRateImplAddress:  0x4F57F6929E58AE564F6AB090fE0AEEcb39B0f270
+Init feeRateImpl Tx: 0xbafcadf128e2d5fbab1927e32bc87d0db8d905b7bee5c8e3edc40f137942e6a9
--- a/deploy-detail-v2.0.txt
+++ b/deploy-detail-v2.0.txt
@@ -1138,3 +1138,65 @@ Deploy time: 2021/5/31 下午3:05:10
 Deploy type: V2
 multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
 DvmTemplateAddress:  0x790B4A80Fb1094589A3c0eFC8740aA9b0C1733fB
+====================================================
+network type: arb
+Deploy time: 2021/6/2 上午10:46:16
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+DspTemplateAddress:  0x778DF5B12170e8af8dF94356BfC864E57CE185DC
+DppTemplateAddress:  0x1565666CD77bB6DDE193e1D37Ad7b07900e6f4c0
+DppAdminTemplateAddress:  0x1dc8D1f1600B7C1D39e6b60FBC7b021Bc4F9C993
+CpTemplateAddress:  0x8F8Dd7DB1bDA5eD3da8C9daf3bfa471c12d58486
+MintableERC20TemplateAddress:  0x70eFB31271C0796833f80dA4E6538d05B2AFA72C
+ERC20FactoryAddress:  0x77106d0f8c5B8ADF95a7feaae5bea130b1D2D748
+DODOApprove Address:  0xa952f8716a753D9e094c4041FEBd163e38B21eDB
+DODOApproveProxy Address:  0x67e5a449EF6B0da29D338023e7cfc50a2975F9Bb
+DvmFactoryAddress:  0x01f9BfAC04E6184e90bD7eaFD51999CE430Cc750
+Init DvmFactory Tx: 0x67f7db5796efe3fd753bff6cfdd4d277881d395d2eb2dd9e688a31d0244237d9
+DppFactoryAddress:  0xF31162ef57b61D2FBA4f64dBbaC536bFc782D37c
+Init DppFactory Tx: 0x450caf276a03dd085f51b5c70c1d3ade015b17f5dbc3327b3901c7f693c34bee
+UpCrowdPoolingFactory address:  0x1cC529DB2a7D45F68B698A7019D4eE1e6FB2D58F
+Init UpCpFactory Tx: 0xdb1518bd4787163b7cca23ddafdba29973e1d510ce0ec0faaa6c508467c6ac55
+CpFactoryAddress:  0x1c31c6d0032768463EaBABe1A47D04c6470d31fE
+Init CpFactory Tx: 0xb6d723aee230a426cc1ea25f4673d01bc74c58361ff2e92f9623931f5f3fec8a
+DspFactoryAddress:  0x2F2f9460500F27db68AAfBfa0472cEDDb168a5a6
+Init DspFactory Tx: 0x51703f87346b974462a8d47de8000edaa9567e4263c53424c173a2fd73465435
+DODOV2RouteHelper Address:  0xfF133A6D335b50bDAa6612D19E1352B049A8aE6a
+DODODspProxy Address:  0xCFea63e3DE31De53D68780Dd65675F169439e470
+CpProxy address:  0x96a75d73b3de29c009863fA6329D96b2181D3Dc4
+DODOV2Proxy02 Address:  0xb7865a5ceE051d35B09A48b624D7057d3362655a
+Init DODOProxyV2 Tx: 0x0d088832d51426c344053268bf6b46d9b6b7d1f0451e4a5fd09028807edd149d
+DODOApproveProxy Init tx:  0xfbdbb0bf82487ef21e2c49f72063920853509201a5dd925bbc7c89e0b3efed82
+DODOApprove Init tx:  0x2850d312db558867674328baa82da3c89afc6cfe1c6142c07b0b92de7c150798
+====================================================
+network type: arb
+Deploy time: 2021/6/2 上午10:56:50
+Deploy type: V2
+multiSigAddress:  0x1e0D4043C0CD3ed15F3c2AfE60B0F213c9b5E30d
+ERC20FactoryAddress:  0x141b4497a298340E8B451ac4eeE947B00aDbe07A
+DODOApprove Address:  0xCDFD45f965De9932367833Ca7187e4c9C43A2380
+DODOApproveProxy Address:  0x0fe261aeE0d1C4DFdDee4102E82Dd425999065F4
+DvmFactoryAddress:  0xb0C7cB15b52b0093130487209e96CFeC0Ba4Ff66
+Init DvmFactory Tx: 0x16b29cc196014a472fcddb34adaa4e813b7c3f2aaf1db09d1b45353db45543e3
+DppFactoryAddress:  0xF0B4338E3e3dfE9B6934FD68697ba8cF1055A1aD
+Init DppFactory Tx: 0x6fe6ce31aafa5aac7c22506c0f838dab364f4dac16108b317f544b4ffdc3c4c9
+UpCrowdPoolingFactory address:  0x69f52AC40185A2A005D49114F0B77b7bA856F0a0
+Init UpCpFactory Tx: 0x231062a971e4ba7c25370d92b207de63a3cccffc14147edbfe7e0e2e7dc57222
+CpFactoryAddress:  0x884E3EE9e25896c57E7d8d6FAACef22B02BCD6bE
+Init CpFactory Tx: 0xcb372f2c2820805b7153bb384e71e79539f550cc1f831831f4b8d55cb451ba2e
+DspFactoryAddress:  0xa1254eE5c6d6616904A82c55C6e134557096B6D4
+Init DspFactory Tx: 0xbd58d68eed01ed2ce212413fc79cc81cbae44f9d9b5b30d4523bee84201bcc0c
+DODOV2RouteHelper Address:  0xd72b354BD39f8F11D0cA07bD5724896Bb1a42707
+DODODspProxy Address:  0x3a343F2e4e142412c5dD130359edb765a6054965
+CpProxy address:  0x2cD18557E14aF72DAA8090BcAA95b231ffC9ea26
+DODOV2Proxy02 Address:  0xeCEaDe494FD5F913Fd937C5CAc4577236395Dc32
+Init DODOProxyV2 Tx: 0x45e9434e71714855ea922c095db9796ea99cdb478f871a1514a2a9a18182b783
+DODOApproveProxy Init tx:  0xb57e796664195faf15df60af565bf6113b3e3279d4e926e6393afee03a491c2d
+DODOApprove Init tx:  0xb39ddfffb0b4dce0296da6d4c659e0c72dfa51781aabf097d0869e44a1e27a3e
+====================================================
+network type: arb
+Deploy time: 2021/6/2 上午11:02:22
+Deploy type: V2 - Adapter
+DODOV1Adapter Address:  0xd5a7E197bacE1F3B26E2760321d6ce06Ad07281a
+DODOV2Adapter Address:  0x8aB2D334cE64B50BE9Ab04184f7ccBa2A6bb6391
+UniAdapter Address:  0x17eBC315760Bb47384224A5f3BF829222fbD3Aa7
--- a/truffle-config.js
+++ b/truffle-config.js
@@ -40,7 +40,7 @@ module.exports = {
   */
  deploySwitch: {
    DEPLOY_V1:      false,
-    DEPLOY_V2:      true,
+    DEPLOY_V2:      false,
    ADAPTER:        false,
    MOCK_TOKEN:     false,
    MOCK_V2_POOL:   false,