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

ing

Browse Source
This commit is contained in:
owen05
2021-03-31 14:10:27 +08:00
parent 80744534d5
commit 5d288c047a
5 changed files with 67 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ import {IERC1155Receiver} from "../../intf/IERC1155Receiver.sol";
contract NFTCollateralVault is InitializableOwnable, IERC721Receiver, IERC1155Receiver {
function transferOwnership(address newOwner) public override onlyOwner {
function directTransferOwnership(address newOwner) public onlyOwner {
emit OwnershipTransferred(_OWNER_, newOwner);
_OWNER_ = newOwner;
}
@@ -24,38 +24,40 @@ contract NFTCollateralVault is InitializableOwnable, IERC721Receiver, IERC1155Re
//TODO? assetTo
function withdrawERC721(address nftContract, uint256 tokenId) public onlyOwner {
IERC721(nftContract).safeTransferFrom(msg.sender, _OWNER_, tokenId, "");
// IERC721(nftContract).safeTransferFrom(address(this), _OWNER_, tokenId, "");
}
//TODO? assetTo
function withdrawERC1155(address nftContract, uint256[] memory tokenIds, uint256[] memory amounts) public onlyOwner {
IERC1155(nftContract).safeBatchTransferFrom(msg.sender, _OWNER_, tokenIds, amounts, "");
// IERC1155(nftContract).safeBatchTransferFrom(address(this), _OWNER_, tokenIds, amounts, "");
}
function onERC721Received(
address operator,
address from,
uint256 tokenId,
bytes calldata data
address,
address,
uint256,
bytes calldata
) external override returns (bytes4) {
return IERC721Receiver.onERC721Received.selector;
}
function onERC1155Received(
address operator,
address from,
uint256 id,
uint256 value,
bytes calldata data
address,
address,
uint256,
uint256,
bytes calldata
) external override returns (bytes4){
return IERC1155Receiver.onERC1155Received.selector;
}
function onERC1155BatchReceived(
address operator,
address from,
uint256[] calldata ids,
uint256[] calldata values,
bytes calldata data
address,
address,
uint256[] calldata,
uint256[] calldata,
bytes calldata
) external override returns (bytes4){
return IERC1155Receiver.onERC1155BatchReceived.selector;
}