Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use OZ safe transfer for ERC20 #1181

Merged
merged 3 commits into from
Oct 2, 2023
Merged

feat: use OZ safe transfer for ERC20 #1181

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccd2dac
feat: use OZ safe transfer for ERC20
adjisb Sep 29, 2023
8deccd9
fix: fix marketplace deployment
adjisb Sep 29, 2023
717a32f
test: remove bundle, use the right encoder
adjisb Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions packages/marketplace/contracts/transfer-manager/TransferExecutor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

pragma solidity 0.8.21;

import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
import {IERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/IERC1155Upgradeable.sol";
Expand Down Expand Up @@ -55,9 +56,9 @@ abstract contract TransferExecutor is Initializable, ITransferExecutor {
//not using transfer proxy when transferring from this contract
address token = abi.decode(asset.assetType.data, (address));
if (from == address(this)) {
require(IERC20Upgradeable(token).transfer(to, asset.value), "erc20 transfer failed");
SafeERC20Upgradeable.safeTransfer(IERC20Upgradeable(token), to, asset.value);
} else {
erc20safeTransferFrom(IERC20Upgradeable(token), from, to, asset.value);
SafeERC20Upgradeable.safeTransferFrom(IERC20Upgradeable(token), from, to, asset.value);
}
} else if (asset.assetType.assetClass == LibAsset.AssetClassType.ERC1155_ASSET_CLASS) {
//not using transfer proxy when transferring from this contract
Expand All @@ -70,15 +71,6 @@ abstract contract TransferExecutor is Initializable, ITransferExecutor {
}
}

/// @notice function for safe transfer of ERC20 tokens
/// @param token ERC20 token to be transferred
/// @param from address from which tokens will be taken
/// @param to address that will receive tokens
/// @param value how many tokens are going to be transferred
function erc20safeTransferFrom(IERC20Upgradeable token, address from, address to, uint256 value) internal {
require(token.transferFrom(from, to, value), "failure while transferring");
}

/// @notice function for safe transfer of ERC721 tokens
/// @param token ERC721 token to be transferred
/// @param from address from which token will be taken
Expand Down
Loading