d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
owen05
2021-04-28 09:41:33 +08:00
parent ad1126d59b
commit 0c4d1ea9eb
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/CollateralVault/impl/NFTCollateralVault.sol
View File

@@ -47,6 +47,7 @@ contract NFTCollateralVault is InitializableOwnable, IERC721Receiver, IERC1155Re
// ============ Ownable ============ // ============ Ownable ============
function directTransferOwnership(address newOwner) external onlyOwner { function directTransferOwnership(address newOwner) external onlyOwner {
require(newOwner != address(0), "DODONftVault: ZERO_ADDRESS");
_OWNER_ = newOwner; _OWNER_ = newOwner;
emit OwnershipTransferred(_OWNER_, newOwner); emit OwnershipTransferred(_OWNER_, newOwner);
} }
@@ -60,11 +61,13 @@ contract NFTCollateralVault is InitializableOwnable, IERC721Receiver, IERC1155Re
} }
function withdrawERC721(address nftContract, uint256 tokenId) external onlyOwner { function withdrawERC721(address nftContract, uint256 tokenId) external onlyOwner {
require(nftContract != address(0), "DODONftVault: ZERO_ADDRESS");
_removeNftInfo(nftContract, tokenId, 1); _removeNftInfo(nftContract, tokenId, 1);
IERC721(nftContract).safeTransferFrom(address(this), _OWNER_, tokenId, ""); IERC721(nftContract).safeTransferFrom(address(this), _OWNER_, tokenId, "");
} }
function withdrawERC1155(address nftContract, uint256[] memory tokenIds, uint256[] memory amounts) external onlyOwner { function withdrawERC1155(address nftContract, uint256[] memory tokenIds, uint256[] memory amounts) external onlyOwner {
require(nftContract != address(0), "DODONftVault: ZERO_ADDRESS");
require(tokenIds.length == amounts.length, "PARAMS_NOT_MATCH"); require(tokenIds.length == amounts.length, "PARAMS_NOT_MATCH");
for(uint256 i = 0; i < tokenIds.length; i++) { for(uint256 i = 0; i < tokenIds.length; i++) {
_removeNftInfo(nftContract, tokenIds[i], amounts[i]); _removeNftInfo(nftContract, tokenIds[i], amounts[i]);

10
contracts/SmartRoute/proxies/DODONFTProxy.sol
View File

@@ -150,6 +150,11 @@ contract DODONFTProxy is ReentrancyGuard, InitializableOwnable {
uint256 quoteAmount, uint256 quoteAmount,
uint8 flag // 0 - ERC20, 1 - quoteInETH uint8 flag // 0 - ERC20, 1 - quoteInETH
) external payable preventReentrant { ) external payable preventReentrant {
if(flag == 1)
require(msg.value == quoteAmount, "DODONFTProxy: VALUE_INVALID");
else
require(msg.value == 0, "DODONFTProxy: WE_SAVED_YOUR_MONEY");
_deposit(msg.sender, fragment, IFragment(fragment)._QUOTE_(), quoteAmount, flag == 1); _deposit(msg.sender, fragment, IFragment(fragment)._QUOTE_(), quoteAmount, flag == 1);
IFragment(fragment).buyout(msg.sender); IFragment(fragment).buyout(msg.sender);
emit Buyout(msg.sender, fragment, quoteAmount); emit Buyout(msg.sender, fragment, quoteAmount);
@@ -160,6 +165,11 @@ contract DODONFTProxy is ReentrancyGuard, InitializableOwnable {
uint256 stakeAmount, uint256 stakeAmount,
uint8 flag // 0 - ERC20, 1 - ETH uint8 flag // 0 - ERC20, 1 - ETH
) external payable preventReentrant { ) external payable preventReentrant {
if(flag == 1)
require(msg.value == stakeAmount, "DODONFTProxy: VALUE_INVALID");
else
require(msg.value == 0, "DODONFTProxy: WE_SAVED_YOUR_MONEY");
address stakeVault = IFeeDistributor(feeDistributor)._STAKE_VAULT_(); address stakeVault = IFeeDistributor(feeDistributor)._STAKE_VAULT_();
require(stakeVault != address(0), "DODONFTProxy:STAKE_VAULT_EMPTY"); require(stakeVault != address(0), "DODONFTProxy:STAKE_VAULT_EMPTY");
_deposit(msg.sender, stakeVault, IFeeDistributor(feeDistributor)._STAKE_TOKEN_(), stakeAmount, flag == 1); _deposit(msg.sender, stakeVault, IFeeDistributor(feeDistributor)._STAKE_TOKEN_(), stakeAmount, flag == 1);

2
test/DODONFT/nftMainFlow.test.ts
View File

@@ -143,7 +143,7 @@ describe("DODONFT", () => {
assert(nftInfo.tokenId, '0') assert(nftInfo.tokenId, '0')
}); });
it.only("createFragment", async () => { it("createFragment", async () => {
var erc721Address = await ctx.createERC721(ctx, author); var erc721Address = await ctx.createERC721(ctx, author);
var vaultAddress = await ctx.createNFTVault(ctx, author); var vaultAddress = await ctx.createNFTVault(ctx, author);
var nftVaultInstance = contracts.getContractWithAddress(contracts.NFT_VAULT, vaultAddress); var nftVaultInstance = contracts.getContractWithAddress(contracts.NFT_VAULT, vaultAddress);