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

Adjust for chainid becoming view in 0.8.0. (#2443)

Browse Source 
Co-authored-by: Alex Beregszaszi <alex@rtfs.hu>

Co-authored-by: Daniel Kirchner <daniel@ekpyron.org>
This commit is contained in:
Alex Beregszaszi
2020-12-21 21:14:21 +00:00
committed by GitHub
parent 6be0b410dc
commit a6a4c042f5
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/drafts/EIP712.sol
View File

@ -96,7 +96,8 @@ abstract contract EIP712 {
return keccak256(abi.encodePacked("\x19\x01", _domainSeparatorV4(), structHash)); return keccak256(abi.encodePacked("\x19\x01", _domainSeparatorV4(), structHash));
} }
function _getChainId() private pure returns (uint256 chainId) { function _getChainId() private view returns (uint256 chainId) {
this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691
// solhint-disable-next-line no-inline-assembly // solhint-disable-next-line no-inline-assembly
assembly { assembly {
chainId := chainid() chainId := chainid()

3
contracts/mocks/EIP712External.sol
View File

@ -22,7 +22,8 @@ contract EIP712External is EIP712 {
require(recoveredSigner == signer); require(recoveredSigner == signer);
} }
function getChainId() external pure returns (uint256 chainId) { function getChainId() external view returns (uint256 chainId) {
this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691
// solhint-disable-next-line no-inline-assembly // solhint-disable-next-line no-inline-assembly
assembly { assembly {
chainId := chainid() chainId := chainid()

3
contracts/mocks/ERC20PermitMock.sol
View File

@ -14,7 +14,8 @@ contract ERC20PermitMock is ERC20Permit {
_mint(initialAccount, initialBalance); _mint(initialAccount, initialBalance);
} }
function getChainId() external pure returns (uint256 chainId) { function getChainId() external view returns (uint256 chainId) {
this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691
// solhint-disable-next-line no-inline-assembly // solhint-disable-next-line no-inline-assembly
assembly { assembly {
chainId := chainid() chainId := chainid()