diff --git a/config/arb-config.js b/config/arb-config.js index 31d86b9..c8bcead 100644 --- a/config/arb-config.js +++ b/config/arb-config.js @@ -70,7 +70,7 @@ module.exports = { //================== NFT ==================== BuyoutModel: "0x23B06D1557e8cAe3f03f71DCbB3123E071693af7", Fragment: "0x0bDc004b3eC9b746FF3Fc34E7F74240a8a941B06", - NFTCollateralVault: "0x50da4C88343406EcE70aDf3f8C3D32911169a96d", + NFTCollateralVault: "0xedd626EE5Cf73bf1A64DaEe6E2B912A37CDf9882",//0x50da4C88343406EcE70aDf3f8C3D32911169a96d DODONFTRouteHelper: "0xFcbd98cc89b2cf60362d3533463C1309f39c539D", DodoNftErc721: "0x4ec636C32195DD4E4Be1D37c0838DB1a8E3E4E30", diff --git a/config/bsc-config.js b/config/bsc-config.js index 7e1431a..6892343 100644 --- a/config/bsc-config.js +++ b/config/bsc-config.js @@ -74,7 +74,7 @@ module.exports = { //================== NFT ==================== BuyoutModel: "0xfEA1AcAD77F64bf6E933635eD078e63d22484197", Fragment: "0xA8f057fDB35d8Ebe1039D77f88c6f8575a839b14", - NFTCollateralVault: "0xd66B8b705D270767Cc9D25400CE61198DA1e3629", + NFTCollateralVault: "0x0Dd95Ce685b8B101C52B43b203C351cf2D3A1DEb",//0xd66B8b705D270767Cc9D25400CE61198DA1e3629 DODONFTRouteHelper: "0x2d8349E957A69E4cC7B4ef225A4B6a85Be57FBF3", InitializableERC721: "0xbd0Ed394042ae14a1D6b7478386CDFfd9d1ea188", diff --git a/config/eth-config.js b/config/eth-config.js index 7e5573d..4f539ac 100644 --- a/config/eth-config.js +++ b/config/eth-config.js @@ -69,7 +69,7 @@ module.exports = { //================== NFT ==================== BuyoutModel: "0x102739e36Bc412CF79ff62f3e1efABA9F8296426", Fragment: "0xB14dA65459DB957BCEec86a79086036dEa6fc3AD", - NFTCollateralVault: "0xF019b39F3561730451598c813BEC823096E132Da", + NFTCollateralVault: "0xa5D3bDC0CE5b88F2Ee82b1f648d9c16c84af5d6A",//0xF019b39F3561730451598c813BEC823096E132Da DODONFTRouteHelper: "0x90294216e8C79e812d3F1965f5c8362F0EFB7603", DodoNftErc721: "0x945497d9A3e0C1600478e466E2a38Ff8E1623E55", diff --git a/config/heco-config.js b/config/heco-config.js index 9e0a270..0444d03 100644 --- a/config/heco-config.js +++ b/config/heco-config.js @@ -72,7 +72,7 @@ module.exports = { //================== NFT ==================== BuyoutModel: "0xF0A4D44455168896ad0f305Ff6b744Cbd79704b9", Fragment: "0xA566676A9961CD6FF72875257E6962D8FcffCfff", - NFTCollateralVault: "0xd03853d45609122A31902D9971F243a9f70Ef2A5", + NFTCollateralVault: "0x8caA3eDeE291cDfCA94820cFDfd97E10F749Ee6e",//0xd03853d45609122A31902D9971F243a9f70Ef2A5 DODONFTRouteHelper: "0x5AE86Ec9d43Fb90729b2d75f99DCD73736885492", DodoNftErc721: "0xc5D46183ce36679186517C04EC9b35B8EE944f72", diff --git a/config/matic-config.js b/config/matic-config.js index 1eca1e1..aff2687 100644 --- a/config/matic-config.js +++ b/config/matic-config.js @@ -65,7 +65,7 @@ module.exports = { //================== NFT ==================== BuyoutModel: "0x5cE3aA21432F77945328c4847eC0a0C164336045", Fragment: "0xDeD89eeA18fF19BCf1c72Cee0a653589cEd3d81C", - NFTCollateralVault: "0xA254c1E29c175ED0b68B441f2Fb774C4A3BF3238", + NFTCollateralVault: "0x1071A668F523dDD12e30B39eeD7cb28eBD63Ca2B",//0xA254c1E29c175ED0b68B441f2Fb774C4A3BF3238 DODONFTRouteHelper: "0x19309bB932df8C07DbCa8dF93ad4FCc419271e16", DodoNftErc721: "0xA1FfE96Ee3e72a9Ec7523E5a289695843D3fd0f4", diff --git a/config/ok-config.js b/config/ok-config.js index 1737b3d..f5aa653 100644 --- a/config/ok-config.js +++ b/config/ok-config.js @@ -65,7 +65,7 @@ module.exports = { //================== NFT ==================== BuyoutModel: "0x0c4b4F1D5F5c989457cdD6f5102308b33c922281", Fragment: "0x4E312cE243Ce87554Bb0d7257783180a80942D22", - NFTCollateralVault: "0x95E887aDF9EAa22cC1c6E3Cb7f07adC95b4b25a8", + NFTCollateralVault: "0xA3dfF6ae0F73f0970E31Da63B3736F7D3CEF683e",//0x95E887aDF9EAa22cC1c6E3Cb7f07adC95b4b25a8 DODONFTRouteHelper: "0xF4489F010Bfe8955A17c512a106e76FCF7BDE7D4", DodoNftErc721: "0x42ddEc68db70F5992eB7AB22dfaD8A57109841C9", diff --git a/contracts/CollateralVault/impl/NFTCollateralVault.sol b/contracts/CollateralVault/impl/NFTCollateralVault.sol index ac0615b..64897e4 100644 --- a/contracts/CollateralVault/impl/NFTCollateralVault.sol +++ b/contracts/CollateralVault/impl/NFTCollateralVault.sol @@ -42,7 +42,7 @@ contract NFTCollateralVault is InitializableOwnable, IERC721Receiver, IERC1155Re require(nftContract != address(0), "DODONftVault: ZERO_ADDRESS"); for(uint256 i = 0; i < tokenIds.length; i++) { IERC721(nftContract).safeTransferFrom(msg.sender, address(this), tokenIds[i]); - emit AddNftToken(nftContract, tokenIds[i], 1); + // emit AddNftToken(nftContract, tokenIds[i], 1); } } @@ -50,9 +50,9 @@ contract NFTCollateralVault is InitializableOwnable, IERC721Receiver, IERC1155Re require(nftContract != address(0), "DODONftVault: ZERO_ADDRESS"); require(tokenIds.length == amounts.length, "PARAMS_NOT_MATCH"); IERC1155(nftContract).safeBatchTransferFrom(msg.sender, address(this), tokenIds, amounts, ""); - for(uint256 i = 0; i < tokenIds.length; i++) { - emit AddNftToken(nftContract, tokenIds[i], amounts[i]); - } + // for(uint256 i = 0; i < tokenIds.length; i++) { + // emit AddNftToken(nftContract, tokenIds[i], amounts[i]); + // } } // ============ Ownable ============