crypto/becrypto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update benftmarket

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10250
build/contracts/BENFTMarket.json
View File

File diff suppressed because one or more lines are too long

22
contracts/market/BENftMarket.sol
View File

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