merge feature/nft

2021-07-13 16:33:40 +08:00
parent 1d054e4bf7 51eba29b42
commit fd91104354
83 changed files with 12971 additions and 14538 deletions
--- a/config/arbtest-config.js
+++ b/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: "",
-    }
-}
--- a/config/bsc-config.js
+++ b/config/bsc-config.js
@@ -45,9 +45,9 @@ module.exports = {


        //Adapter
-        DODOV1Adapter: "0x0596908263Ef2724fBfBcAfA1c983FCD7a629038",
-        DODOV2Adapter: "0xAB623fBcaeb522046185051911209F5b2C2a2e1f",
-        UniAdapter: "0x5e530cD60931d9DE694a86827e76BB24493A1520",
+        DODOV1Adapter: "0x8E4842d0570c85Ba3805A9508Dce7C6A458359d0",
+        DODOV2Adapter: "0x165BA87e882208100672b6C56f477eE42502c820",
+        UniAdapter: "0xE223AcD7CBAFabCFfcAfeC5e69877424c4760aC2",

        //Proxy
        DODOV2Proxy: "",
@@ -65,5 +65,36 @@ module.exports = {
        //Account
        multiSigAddress: "0xcaa42F09AF66A8BAE3A7445a7f63DAD97c11638b",
        defaultMaintainer: "0xcaa42F09AF66A8BAE3A7445a7f63DAD97c11638b",
+
+
+        //================== NFT ====================
+        BuyoutModel: "0xfEA1AcAD77F64bf6E933635eD078e63d22484197",
+        Fragment: "0x9542F458B7003e7C8e938c6a87161D410243B419",
+        NFTCollateralVault: "0xd66B8b705D270767Cc9D25400CE61198DA1e3629",
+        DODONFTRouteHelper: "0x2d8349E957A69E4cC7B4ef225A4B6a85Be57FBF3",
+
+        InitializableERC721: "0xbd0Ed394042ae14a1D6b7478386CDFfd9d1ea188",
+        InitializableERC1155: "0x3c5509Cc5212C62f77e36126efec7ADb75c830A5",
+        NFTTokenFactory: "0x6e08eaAfea48c147e8d092a7979d7B266f16b8fA",
+
+        DodoNftErc721: "0x5eD972C0a7f8D0C4dEDf6a37848A297B67489888",
+        DodoNftErc1155: "0xdC9224cbc4B1826Bb74fF383FF1CE94DE1F56119",
+
+        DODONFTRegistry: "0x2c0Dd764A0bE8A7e747Cb0765E268d576edce31a",
+        DODONFTProxy: "0x4852394EcC099f13bdC44764FA34dEB26D8131fa",
+
+        //================= DropsV1 =================
+        // MysteryBoxV1: "0xc25286ef3BaE3f6Fe2d6d0A6e2acAd0301AF97b8", //波老师
+        // MysteryBoxV1: "0xDf7E00Cd0bb91D1502a1A14575E58b5d8f20C8D4", //KAVA
+        MysteryBoxV1: "0x3E629332c51046a17ec236553cB931CF0548B5e1", //Fear
+        RandomGenerator: "0x7C062B9C584fA6eC2504270790D38240A2c5fE72",
+        RandomPool: [
+            "0x82aff931d74f0645ce80e8f419b94c8f93952686",
+            "0x327134de48fcdd75320f4c32498d1980470249ae"
+        ],
+
+        //================= DropsV2 ==================
+        DropsFeeModel: "0x6de96b1a41FF2E8264925B4C5C0564C46DC0C67d",
+        DropsProxy: "0xC05A30468d039381AaBaB6dcaC31078DB2C3323B"
    }
 }
--- a/config/eth-config.js
+++ b/config/eth-config.js
@@ -43,9 +43,9 @@ module.exports = {
        DODOIncentive: "0x989DcAA95801C527C5B73AA65d3962dF9aCe1b0C",

        //Adpater
-        DODOV1Adapter: "0x9B64c81ba54eA51e1f6B7fefb3cfF8AA6F1e2A09",
-        DODOV2Adapter: "0xE55154D09265b18aC7CDAC6E646672A5460389a1",
-        UniAdapter: "0x043957f7554275b90c5178872faE851dcfC1089D",
+        DODOV1Adapter: "0x91E1c84BA8786B1FaE2570202F0126C0b88F6Ec7",
+        DODOV2Adapter: "0xe6AafA1c45D9d0C64686c1f1D17B9fe9c7DAB05b",
+        UniAdapter: "0x50D148D0908C602A56884B8628A36470a875EEb2",

        //Proxy
        DODOV2Proxy: "",
--- a/config/heco-config.js
+++ b/config/heco-config.js
@@ -42,9 +42,9 @@ module.exports = {
        DODOIncentive: "0x0000000000000000000000000000000000000000",

        //Adpater
-        DODOV1Adapter: "0x9B63602c1FEd8292b76fb611B5de66a8fB7F8a77",
-        DODOV2Adapter: "0xF68a04C267e492A21F0818C357f83c665230C5ad",
-        UniAdapter: "0xDfa10eC79CE97689a7FeD409aEc3174681EF9602",
+        DODOV1Adapter: "0x99d69565EdA438E3ebAA0627A407968ABD0f755b",
+        DODOV2Adapter: "0x14F7B8Fb0c1447DdE7bcf92a8d9BB058c8A5FE64",
+        UniAdapter: "0xa95cE97a04f61efb201c08da41e4bBF7E7106770",

        //Proxy
        DODOV2Proxy: "0xAc7cC7d2374492De2D1ce21e2FEcA26EB0d113e7",
--- a/config/kovan-config.js
+++ b/config/kovan-config.js
@@ -55,6 +55,7 @@ module.exports = {
        DODOMineV3Proxy: "",


+
        //vDODO
        DODOCirculationHelper: "",
        Governance: "",
@@ -64,5 +65,36 @@ module.exports = {
        //Account
        multiSigAddress: "",
        defaultMaintainer: "",
+
+
+        //================== NFT ====================
+        BuyoutModel:"",
+        Fragment: "",
+        NFTCollateralVault: "0xD25278cd387e54E77C5490F5220b551fe2feb772",
+        DODONFTRouteHelper: "0xDD1511f2Bcdb0E6F916F9740BF83f31dF0fb63b4",
+
+        InitializableERC721: "0x62dC4615AC755959a82b6D22FA5652A037284c0b",
+        InitializableERC1155: "0xc4d86FFB26EB6EcAe80D3f1e2c8519832Fd478B2",
+        NFTTokenFactory: "0x834D13Ca0322Ccfe67596f09Cc26Ee3584297B94",
+
+        DodoNftErc721: "0x98f2A8d6100635Ecb40ADA1B1FFb1ff4f0b3c5D8",
+        DodoNftErc1155: "0xE9C572287936dB1B0a951ca0768C1b0d26b62A04",
+
+        DODONFTRegistry: "0x579eBcC668b5517F733587091C35D495FE8d6b68",
+        DODONFTProxy: "",
+
+        //================= DropsV1 =================
+        // MysteryBoxV1: "0x47d2b27525b93A9c9E03001E1D19310A08748D55",//波老师
+        MysteryBoxV1: "0xd56Fd300aE2e4C46cd34460776007dCE1C4F2043",
+        RandomGenerator: "0x53F54E4760FA5f839e5624782D032495613DF218",
+        RandomPool: [
+            "0xa2e0ef85618732d80e5ef362773da1c92e8b1c57",
+            "0xaCfc959e0E85726d09A36E6DFdD56FB2e5dB8F77",
+            "0x7A733869CB210393f3c02B740c58498EB1f8815C"
+        ],
+
+        //================= DropsV2 ==================
+        DropsFeeModel: "0xDBe1C360050638C9d0f28f23B51b198C8B70D9eA",
+        DropsProxy: "0xa3a23cee044F995a97D86defeABf769bAd57c7c8",
    }
 }
--- a/config/matic-config.js
+++ b/config/matic-config.js
@@ -9,7 +9,7 @@ module.exports = {
        DODOSellHelper: "0xDfaf9584F5d229A9DBE5978523317820A8897C5A",
        DODOCalleeHelper: "0x2BBD66fC4898242BDBD2583BBe1d76E8b8f71445",
        DODOV1PmmHelper: "0x18DFdE99F578A0735410797e949E8D3e2AFCB9D2",
-        DODOV2RouteHelper: "0x958f79e2998DFe417208b9A07D799265B0298e58",
+        DODOV2RouteHelper: "0x324c747885a88EA6f8115C46E0605C828ed527D3",

        //Template
        CloneFactory: "0x729f7f44bf64Ce814716b6261e267DbE6cdf021c",
@@ -27,23 +27,23 @@ module.exports = {
        CustomERC20: "0xaF49DBAaf177beE57f84731260a9eb8819d25eff",

        //Factory
-        DVMFactory: "0xbAb9F4ff4A19a0e8EEBC56b06750253228ffAc6E",
-        DPPFactory: "0xE55154D09265b18aC7CDAC6E646672A5460389a1",
-        DSPFactory: "0xa356867fDCEa8e71AEaF87805808803806231FdC",
-        UpCpFactory: "0x335aC99bb3E51BDbF22025f092Ebc1Cf2c5cC619",
-        CrowdPoolingFactory: "0x85351262f7474Ebe23FfAcD633cf20A491F1325D",
+        DVMFactory: "0x79887f65f83bdf15Bcc8736b5e5BcDB48fb8fE13",
+        DPPFactory: "0x95E887aDF9EAa22cC1c6E3Cb7f07adC95b4b25a8",
+        DSPFactory: "0x43C49f8DD240e1545F147211Ec9f917376Ac1e87",
+        UpCpFactory: "0x326c788c4C236f2bceC9476C66F8593Aa31be4Fc",
+        CrowdPoolingFactory: "0x42ddEc68db70F5992eB7AB22dfaD8A57109841C9",
        ERC20Factory: "0xaeB5CF31b97dce6134e416129845e01106fFB177",
        ERC20V2Factory: "0x8e2f666F316b614c76676215F16F0A9746f96a90",
        DODOMineV3Registry: "",

        //Approve
-        DODOApprove: "0x9aE501385Bc7996A2A4a1FBb00c8d3820611BCB5",
-        DODOApproveProxy: "0x738Ebf387A0CE0eb46b0eF8Fa5DEa2EaE6B1Df51",
+        DODOApprove: "0x6D310348d5c12009854DFCf72e0DF9027e8cb4f4",
+        DODOApproveProxy: "0x01FEEA29da5Ae41B0b5F6b10b93EE34752eF80d7",

        //Adapter
-        DODOV1Adapter: "0xB5397B2210f49e96a5EB2c9747Aa2bD9397d90C0",
-        DODOV2Adapter: "0x02fCB21dc1cf221939C1d4277fB54016b5d32bC7",
-        UniAdapter: "0xbef0C8Cd420b76e9d31509abbfd7f8C9f664527c",
+        DODOV1Adapter: "0xDBFaF391C37339c903503495395Ad7D6B096E192",
+        DODOV2Adapter: "0x6C30bE15d88462B788DEa7c6A860a2CCAF7B2670",
+        UniAdapter: "0xe373DF144a70BCCc10190f97bEDE647D1eD6cfc8",

        //Proxy
        DODOV2Proxy: "0x45894C062E6f4E58B257e0826675355305dfef0d",
--- a/config/mbtestnet-config.js
+++ b/config/mbtestnet-config.js
--- a/config/oktest-config.js
+++ b/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: "",
-    }
-}
--- a/config/rinkeby-config.js
+++ b/config/rinkeby-config.js
@@ -25,6 +25,7 @@ module.exports = {
        MintableERC20: "",
        CustomERC20: "0x0Cd57DC8367362314C510446FD106B66989Eb81a",

+
        //Factory
        DVMFactory: "0x17DddEFA0c82E0c850a4Adac2aFE3F1fe977A242",
        DPPFactory: "0x510b49803E356C750f3a93bA5508C0FFD9f71bDD",
@@ -97,7 +98,6 @@ module.exports = {
        DropsProxy: "0xa968a8B14174395c922347Ab593a0CD7EFf30cf1",

        //DODODropsV2: "0x4A2b9f63AE41cF3003A494F2d8Fcd9Ed850b9A6f"
-
        // DropsERC721: "0x3df8d553275781C777f432A74EEE9099226B9d13",
        // DropsERC1155: "0x3a8EcF30428bd4e33Cd7011533DFd596F7705c8F",
    }