diff --git a/config/arb-config.js b/config/arb-config.js index afd4605..31d86b9 100644 --- a/config/arb-config.js +++ b/config/arb-config.js @@ -65,6 +65,18 @@ module.exports = { //Account multiSigAddress: "0x01d3E7271c278Aa3AA56EeBa6a109b2C200679fA", - defaultMaintainer: "0x01d3E7271c278Aa3AA56EeBa6a109b2C200679fA" + defaultMaintainer: "0x01d3E7271c278Aa3AA56EeBa6a109b2C200679fA", + + //================== NFT ==================== + BuyoutModel: "0x23B06D1557e8cAe3f03f71DCbB3123E071693af7", + Fragment: "0x0bDc004b3eC9b746FF3Fc34E7F74240a8a941B06", + NFTCollateralVault: "0x50da4C88343406EcE70aDf3f8C3D32911169a96d", + DODONFTRouteHelper: "0xFcbd98cc89b2cf60362d3533463C1309f39c539D", + + DodoNftErc721: "0x4ec636C32195DD4E4Be1D37c0838DB1a8E3E4E30", + DodoNftErc1155: "0x3Ec5a174DAfF0A91DCD0935866ED9E6514441Ba8", + + DODONFTRegistry: "0x8327b093caf1a32985887CE89BD6c8F80A6B7535", + DODONFTProxy: "0x6A51C8A1139B9233C31331D2Cf442E0652329f23", } } \ No newline at end of file diff --git a/config/bsc-config.js b/config/bsc-config.js index 1b12464..7e1431a 100644 --- a/config/bsc-config.js +++ b/config/bsc-config.js @@ -73,7 +73,7 @@ module.exports = { //================== NFT ==================== BuyoutModel: "0xfEA1AcAD77F64bf6E933635eD078e63d22484197", - Fragment: "0x9542F458B7003e7C8e938c6a87161D410243B419", + Fragment: "0xA8f057fDB35d8Ebe1039D77f88c6f8575a839b14", NFTCollateralVault: "0xd66B8b705D270767Cc9D25400CE61198DA1e3629", DODONFTRouteHelper: "0x2d8349E957A69E4cC7B4ef225A4B6a85Be57FBF3", @@ -85,7 +85,7 @@ module.exports = { DodoNftErc1155: "0xdC9224cbc4B1826Bb74fF383FF1CE94DE1F56119", DODONFTRegistry: "0x2c0Dd764A0bE8A7e747Cb0765E268d576edce31a", - DODONFTProxy: "0xb9c408574393487BFb95c0E7E94f0D76E1e6fCde", + DODONFTProxy: "0x0D224A4a6Da3Cfb360B9879965b1f78865798C71", //================= DropsV1 ================= // MysteryBoxV1: "0xc25286ef3BaE3f6Fe2d6d0A6e2acAd0301AF97b8", //波老师 diff --git a/config/eth-config.js b/config/eth-config.js index bec8abe..7e5573d 100644 --- a/config/eth-config.js +++ b/config/eth-config.js @@ -66,8 +66,16 @@ module.exports = { multiSigAddress: "0x95C4F5b83aA70810D4f142d58e5F7242Bd891CB0", defaultMaintainer: "0x95C4F5b83aA70810D4f142d58e5F7242Bd891CB0", + //================== NFT ==================== + BuyoutModel: "0x102739e36Bc412CF79ff62f3e1efABA9F8296426", + Fragment: "0xB14dA65459DB957BCEec86a79086036dEa6fc3AD", + NFTCollateralVault: "0xF019b39F3561730451598c813BEC823096E132Da", + DODONFTRouteHelper: "0x90294216e8C79e812d3F1965f5c8362F0EFB7603", - //============= NFT ================ DodoNftErc721: "0x945497d9A3e0C1600478e466E2a38Ff8E1623E55", + DodoNftErc1155: "", + + DODONFTRegistry: "0xA7263eb38b9A61B72397c884b5f9bFb5C34A7840", + DODONFTProxy: "0x987e2a3A65A526C66ac66B6F8c84120055363625", } } \ No newline at end of file diff --git a/config/heco-config.js b/config/heco-config.js index 6b89b35..9e0a270 100644 --- a/config/heco-config.js +++ b/config/heco-config.js @@ -68,5 +68,17 @@ module.exports = { defaultMaintainer: "0xD93c8D2429a6b0269527f148F3A0e5D187B0b1Ca", //DODOTreasury Address: "0x6ed2B1aFB1483b150fF428178F1aE5b8e7367A26" + + //================== NFT ==================== + BuyoutModel: "0xF0A4D44455168896ad0f305Ff6b744Cbd79704b9", + Fragment: "0xA566676A9961CD6FF72875257E6962D8FcffCfff", + NFTCollateralVault: "0xd03853d45609122A31902D9971F243a9f70Ef2A5", + DODONFTRouteHelper: "0x5AE86Ec9d43Fb90729b2d75f99DCD73736885492", + + DodoNftErc721: "0xc5D46183ce36679186517C04EC9b35B8EE944f72", + DodoNftErc1155: "0x036C7f862B80Bb2a9D2Bd0597f9f48D72a9B82F6", + + DODONFTRegistry: "0x77777FF74856716fd3FF89aD59fcABcCc1bE0522", + DODONFTProxy: "0x181d1F15281E5475c517Fb840A6d31d32BbF65f3", } } \ No newline at end of file diff --git a/config/matic-config.js b/config/matic-config.js index ab02568..1eca1e1 100644 --- a/config/matic-config.js +++ b/config/matic-config.js @@ -61,5 +61,17 @@ module.exports = { defaultMaintainer: "0x3CD6D7F5fF977bf8069548eA1F9441b061162b42", //Treasury Address: "0x65C5e6F299656CB2458DC18f46b3DF7E1e7e2776" + + //================== NFT ==================== + BuyoutModel: "0x5cE3aA21432F77945328c4847eC0a0C164336045", + Fragment: "0xDeD89eeA18fF19BCf1c72Cee0a653589cEd3d81C", + NFTCollateralVault: "0xA254c1E29c175ED0b68B441f2Fb774C4A3BF3238", + DODONFTRouteHelper: "0x19309bB932df8C07DbCa8dF93ad4FCc419271e16", + + DodoNftErc721: "0xA1FfE96Ee3e72a9Ec7523E5a289695843D3fd0f4", + DodoNftErc1155: "0xFEb1fBcdAAF4475c1AFfeED66395D274e520fD57", + + DODONFTRegistry: "0x840135913a2527C3481DB29e323E05F301D33210", + DODONFTProxy: "0xCb0A88A465Da7aB09C09B418F27bFf159A0FE09b", } } \ No newline at end of file diff --git a/config/ok-config.js b/config/ok-config.js index 82c2581..1737b3d 100644 --- a/config/ok-config.js +++ b/config/ok-config.js @@ -63,20 +63,16 @@ module.exports = { //================== NFT ==================== - BuyoutModel: "", - Fragment: "", - NFTCollateralVault: "", - DODONFTRouteHelper: "", + BuyoutModel: "0x0c4b4F1D5F5c989457cdD6f5102308b33c922281", + Fragment: "0x4E312cE243Ce87554Bb0d7257783180a80942D22", + NFTCollateralVault: "0x95E887aDF9EAa22cC1c6E3Cb7f07adC95b4b25a8", + DODONFTRouteHelper: "0xF4489F010Bfe8955A17c512a106e76FCF7BDE7D4", - InitializableERC721: "", - InitializableERC1155: "", - NFTTokenFactory: "", + DodoNftErc721: "0x42ddEc68db70F5992eB7AB22dfaD8A57109841C9", + DodoNftErc1155: "0x43C49f8DD240e1545F147211Ec9f917376Ac1e87", - DodoNftErc721: "", - DodoNftErc1155: "", - - DODONFTRegistry: "", - DODONFTProxy: "", + DODONFTRegistry: "0x327344B382EE1b44FB0a72945fCDCC7243200dD7", + DODONFTProxy: "0x326c788c4C236f2bceC9476C66F8593Aa31be4Fc", //================= DropsV1 ================= MysteryBoxV1: "", diff --git a/migrations/5_deploy_nft.js b/migrations/5_deploy_nft.js index c87cf37..0a47412 100644 --- a/migrations/5_deploy_nft.js +++ b/migrations/5_deploy_nft.js @@ -122,29 +122,29 @@ module.exports = async (deployer, network, accounts) => { logger.log("Deploy type: NFT"); logger.log("multiSigAddress: ", multiSigAddress) - //ERC721 - if (ERC721Address == "") { - await deployer.deploy(InitializableERC721); - ERC721Address = InitializableERC721.address; - logger.log("ERC721Address: ", ERC721Address); - } - //ERC1155 - if (ERC1155Address == "") { - await deployer.deploy(InitializableERC1155); - ERC1155Address = InitializableERC1155.address; - logger.log("ERC1155Address: ", ERC1155Address); - } - //NFTTokenFactory - if (NFTTokenFactoryAddress == "") { - await deployer.deploy( - NFTTokenFactory, - CloneFactoryAddress, - ERC721Address, - ERC1155Address - ); - NFTTokenFactoryAddress = NFTTokenFactory.address; - logger.log("NFTTokenFactoryAddress: ", NFTTokenFactoryAddress); - } + // //ERC721 + // if (ERC721Address == "") { + // await deployer.deploy(InitializableERC721); + // ERC721Address = InitializableERC721.address; + // logger.log("ERC721Address: ", ERC721Address); + // } + // //ERC1155 + // if (ERC1155Address == "") { + // await deployer.deploy(InitializableERC1155); + // ERC1155Address = InitializableERC1155.address; + // logger.log("ERC1155Address: ", ERC1155Address); + // } + // //NFTTokenFactory + // if (NFTTokenFactoryAddress == "") { + // await deployer.deploy( + // NFTTokenFactory, + // CloneFactoryAddress, + // ERC721Address, + // ERC1155Address + // ); + // NFTTokenFactoryAddress = NFTTokenFactory.address; + // logger.log("NFTTokenFactoryAddress: ", NFTTokenFactoryAddress); + // } //NFTRegister if (DODONFTRegistryAddress == "") { diff --git a/truffle-config.js b/truffle-config.js index 3f36d4a..169c003 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -109,8 +109,8 @@ module.exports = { provider: function () { return new HDWalletProvider(privKey, "https://mainnet.infura.io/v3/" + infuraId); }, - gas: 6000000, - gasPrice: 150000000000, + gas: 4000000, + gasPrice: 50000000000, network_id: 1, skipDryRun: true }, @@ -128,6 +128,7 @@ module.exports = { }, heco: { + networkCheckTimeout: 100000, provider: function () { return new HDWalletProvider(privKey, "https://http-mainnet.hecochain.com"); }, @@ -157,7 +158,7 @@ module.exports = { provider: () => { return new HDWalletProvider(privKey, 'https://exchainrpc.okex.org') }, - gasPrice: 100000000, + gasPrice: 500000000, network_id: 66, confirmations: 5, timeoutBlocks: 200, @@ -206,7 +207,7 @@ module.exports = { }, network_id: '42161', gas: 1200000, - gasPrice: 900000000, + gasPrice: 700000000, skipDryRun: true },