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

Merge tag 'v2.2.0' of github.com:OpenZeppelin/openzeppelin-solidity

Browse Source 
v2.2.0
This commit is contained in:
Francisco Giordano
2019-05-28 17:40:27 -03:00
parent f18fd17355 9ed1b44865
commit 2b9dc9ae87
162 changed files with 3035 additions and 2330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/introspection/ERC165.sol
View File

@ -1,4 +1,4 @@
pragma solidity ^0.5.0;
pragma solidity ^0.5.2;
import "zos-lib/contracts/Initializable.sol";
import "./IERC165.sol";
@ -10,7 +10,7 @@ import "./IERC165.sol";
*/
contract ERC165 is Initializable, IERC165 {
bytes4 private constant _INTERFACE_ID_ERC165 = 0x01ffc9a7;
/**
/*
* 0x01ffc9a7 ===
* bytes4(keccak256('supportsInterface(bytes4)'))
*/

14
contracts/introspection/ERC165Checker.sol
View File

@ -1,16 +1,16 @@
pragma solidity ^0.5.0;
pragma solidity ^0.5.2;
/**
* @title ERC165Checker
* @dev Use `using ERC165Checker for address`; to include this library
* https://github.com/ethereum/EIPs/blob/master/EIPS/eip-165.md
* https://eips.ethereum.org/EIPS/eip-165
*/
library ERC165Checker {
// As per the EIP-165 spec, no interface should ever match 0xffffffff
bytes4 private constant _INTERFACE_ID_INVALID = 0xffffffff;
bytes4 private constant _INTERFACE_ID_ERC165 = 0x01ffc9a7;
/**
/*
* 0x01ffc9a7 ===
* bytes4(keccak256('supportsInterface(bytes4)'))
*/
@ -109,15 +109,15 @@ library ERC165Checker {
mstore(output, 0x0)
success := staticcall(
30000, // 30k gas
account, // To addr
30000, // 30k gas
account, // To addr
encodedParams_data,
encodedParams_size,
output,
0x20 // Outputs are 32 bytes long
0x20 // Outputs are 32 bytes long
)
result := mload(output) // Load the result
result := mload(output) // Load the result
}
}
}

4
contracts/introspection/IERC165.sol
View File

@ -1,8 +1,8 @@
pragma solidity ^0.5.0;
pragma solidity ^0.5.2;
/**
* @title IERC165
* @dev https://github.com/ethereum/EIPs/blob/master/EIPS/eip-165.md
* @dev https://eips.ethereum.org/EIPS/eip-165
*/
interface IERC165 {
/**