NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add validation in Governor on ERC-721 or ERC-1155 received (#4314)

Browse Source 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
This commit is contained in:
Claudia Barcelo
2023-06-16 02:43:17 +02:00
committed by GitHub
parent 6724873895
commit cd48b3eab3
8 changed files with 306 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
contracts/mocks/token/ERC1155ReceiverMock.sol
View File

@ -6,15 +6,24 @@ import "../../token/ERC1155/IERC1155Receiver.sol";
import "../../utils/introspection/ERC165.sol";
contract ERC1155ReceiverMock is ERC165, IERC1155Receiver {
enum RevertType {
None,
Empty,
String,
Custom
}
bytes4 private _recRetval;
bool private _recReverts;
RevertType private _recReverts;
bytes4 private _batRetval;
bool private _batReverts;
RevertType private _batReverts;
event Received(address operator, address from, uint256 id, uint256 value, bytes data, uint256 gas);
event BatchReceived(address operator, address from, uint256[] ids, uint256[] values, bytes data, uint256 gas);
constructor(bytes4 recRetval, bool recReverts, bytes4 batRetval, bool batReverts) {
error ERC1155ReceiverMockError();
constructor(bytes4 recRetval, RevertType recReverts, bytes4 batRetval, RevertType batReverts) {
_recRetval = recRetval;
_recReverts = recReverts;
_batRetval = batRetval;
@ -28,7 +37,14 @@ contract ERC1155ReceiverMock is ERC165, IERC1155Receiver {
uint256 value,
bytes calldata data
) external returns (bytes4) {
require(!_recReverts, "ERC1155ReceiverMock: reverting on receive");
if (_recReverts == RevertType.Empty) {
revert();
} else if (_recReverts == RevertType.String) {
revert("ERC1155ReceiverMock: reverting on receive");
} else if (_recReverts == RevertType.Custom) {
revert ERC1155ReceiverMockError();
}
emit Received(operator, from, id, value, data, gasleft());
return _recRetval;
}
@ -40,7 +56,14 @@ contract ERC1155ReceiverMock is ERC165, IERC1155Receiver {
uint256[] calldata values,
bytes calldata data
) external returns (bytes4) {
require(!_batReverts, "ERC1155ReceiverMock: reverting on batch receive");
if (_batReverts == RevertType.Empty) {
revert();
} else if (_batReverts == RevertType.String) {
revert("ERC1155ReceiverMock: reverting on batch receive");
} else if (_batReverts == RevertType.Custom) {
revert ERC1155ReceiverMockError();
}
emit BatchReceived(operator, from, ids, values, data, gasleft());
return _batRetval;
}