update benftmarket

This commit is contained in:
zhl 2023-01-10 17:08:05 +08:00
parent 8fcb9f3c95
commit 04770f2bd4
2 changed files with 5335 additions and 4937 deletions

File diff suppressed because one or more lines are too long

View File

@ -164,8 +164,8 @@ contract BENFTMarket is Ownable, ReentrancyGuard, ERC1155Holder,ERC721Holder {
);
} else if (erc1155Supported[orderInfo.nftToken]) {
IERC1155(orderInfo.nftToken).safeTransferFrom(
msg.sender,
address(this),
msg.sender,
orderInfo.tokenId,
orderInfo.amount,
""
@ -191,11 +191,21 @@ contract BENFTMarket is Ownable, ReentrancyGuard, ERC1155Holder,ERC721Holder {
"NFTMarket: cancel caller is not owner"
);
OrderInfo memory orderInfo = orderInfos[orderId];
if (erc721Supported[orderInfo.nftToken]) {
IERC721(orderInfo.nftToken).safeTransferFrom(
address(this),
msg.sender,
orderInfo.tokenId
);
} else if (erc1155Supported[orderInfo.nftToken]) {
IERC1155(orderInfo.nftToken).safeTransferFrom(
address(this),
msg.sender,
orderInfo.tokenId,
orderInfo.amount,
""
);
}
delete orderInfos[orderId];
emit CancelOrder(orderId, orderInfo.nftToken, orderInfo.tokenId);