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

14
contracts/governance/Governor.sol
View File

@ -70,7 +70,7 @@ abstract contract Governor is Context, ERC165, EIP712, IGovernor, IERC721Receive
* governance protocol (since v4.6).
*/
modifier onlyGovernance() {
if (_msgSender() != _executor()) {
if (_executor() != _msgSender()) {
revert GovernorOnlyExecutor(_msgSender());
}
if (_executor() != address(this)) {
@ -631,20 +631,29 @@ abstract contract Governor is Context, ERC165, EIP712, IGovernor, IERC721Receive
/**
* @dev See {IERC721Receiver-onERC721Received}.
* Receiving tokens is disabled if the governance executor is other than the governor itself (eg. when using with a timelock).
*/
function onERC721Received(address, address, uint256, bytes memory) public virtual returns (bytes4) {
if (_executor() != address(this)) {
revert GovernorDisabledDeposit();
}
return this.onERC721Received.selector;
}
/**
* @dev See {IERC1155Receiver-onERC1155Received}.
* Receiving tokens is disabled if the governance executor is other than the governor itself (eg. when using with a timelock).
*/
function onERC1155Received(address, address, uint256, uint256, bytes memory) public virtual returns (bytes4) {
if (_executor() != address(this)) {
revert GovernorDisabledDeposit();
}
return this.onERC1155Received.selector;
}
/**
* @dev See {IERC1155Receiver-onERC1155BatchReceived}.
* Receiving tokens is disabled if the governance executor is other than the governor itself (eg. when using with a timelock).
*/
function onERC1155BatchReceived(
address,
@ -653,6 +662,9 @@ abstract contract Governor is Context, ERC165, EIP712, IGovernor, IERC721Receive
uint256[] memory,
bytes memory
) public virtual returns (bytes4) {
if (_executor() != address(this)) {
revert GovernorDisabledDeposit();
}
return this.onERC1155BatchReceived.selector;
}

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;
}

30
contracts/token/ERC1155/ERC1155.sol
View File

@ -364,11 +364,16 @@ abstract contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI, IER
// Tokens rejected
revert ERC1155InvalidReceiver(to);
}
} catch Error(string memory reason) {
revert(reason);
} catch {
// non-ERC1155Receiver implementer
revert ERC1155InvalidReceiver(to);
} catch (bytes memory reason) {
if (reason.length == 0) {
// non-ERC1155Receiver implementer
revert ERC1155InvalidReceiver(to);
} else {
/// @solidity memory-safe-assembly
assembly {
revert(add(32, reason), mload(reason))
}
}
}
}
}
@ -389,11 +394,16 @@ abstract contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI, IER
// Tokens rejected
revert ERC1155InvalidReceiver(to);
}
} catch Error(string memory reason) {
revert(reason);
} catch {
// non-ERC1155Receiver implementer
revert ERC1155InvalidReceiver(to);
} catch (bytes memory reason) {
if (reason.length == 0) {
// non-ERC1155Receiver implementer
revert ERC1155InvalidReceiver(to);
} else {
/// @solidity memory-safe-assembly
assembly {
revert(add(32, reason), mload(reason))
}
}
}
}
}