diff options
| author | chriseth <chris@ethereum.org> | 2018-08-09 06:29:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-09 06:29:40 +0800 |
| commit | 5cd5a9652cfef6b6b318916ae74cd290b69f5187 (patch) | |
| tree | a3396e696e8c144ceb6e6a682cc286657a03ddcc /libsolidity/analysis/GlobalContext.cpp | |
| parent | cbd64e0e1183869671b394ea98b774f7b7445665 (diff) | |
| parent | ed52f422b78b262c6d0e2e88b45e6cbeec470dc7 (diff) | |
| download | dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.gz dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.bz2 dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.lz dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.xz dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.tar.zst dexon-solidity-5cd5a9652cfef6b6b318916ae74cd290b69f5187.zip | |
Merge pull request #4775 from ethereum/sha3-to-keccak256
Rename FunctionKind SHA3 to KECCAK256 (as the instruction was renamed in libevmasm)
Diffstat (limited to 'libsolidity/analysis/GlobalContext.cpp')
| -rw-r--r-- | libsolidity/analysis/GlobalContext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/analysis/GlobalContext.cpp b/libsolidity/analysis/GlobalContext.cpp index 7b4bc3aa..3ac8fd47 100644 --- a/libsolidity/analysis/GlobalContext.cpp +++ b/libsolidity/analysis/GlobalContext.cpp @@ -42,7 +42,7 @@ m_magicVariables(vector<shared_ptr<MagicVariableDeclaration const>>{ make_shared<MagicVariableDeclaration>("blockhash", make_shared<FunctionType>(strings{"uint256"}, strings{"bytes32"}, FunctionType::Kind::BlockHash, false, StateMutability::View)), make_shared<MagicVariableDeclaration>("ecrecover", make_shared<FunctionType>(strings{"bytes32", "uint8", "bytes32", "bytes32"}, strings{"address"}, FunctionType::Kind::ECRecover, false, StateMutability::Pure)), make_shared<MagicVariableDeclaration>("gasleft", make_shared<FunctionType>(strings(), strings{"uint256"}, FunctionType::Kind::GasLeft, false, StateMutability::View)), - make_shared<MagicVariableDeclaration>("keccak256", make_shared<FunctionType>(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::SHA3, false, StateMutability::Pure)), + make_shared<MagicVariableDeclaration>("keccak256", make_shared<FunctionType>(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::KECCAK256, false, StateMutability::Pure)), make_shared<MagicVariableDeclaration>("log0", make_shared<FunctionType>(strings{"bytes32"}, strings{}, FunctionType::Kind::Log0)), make_shared<MagicVariableDeclaration>("log1", make_shared<FunctionType>(strings{"bytes32", "bytes32"}, strings{}, FunctionType::Kind::Log1)), make_shared<MagicVariableDeclaration>("log2", make_shared<FunctionType>(strings{"bytes32", "bytes32", "bytes32"}, strings{}, FunctionType::Kind::Log2)), @@ -58,7 +58,7 @@ m_magicVariables(vector<shared_ptr<MagicVariableDeclaration const>>{ make_shared<MagicVariableDeclaration>("ripemd160", make_shared<FunctionType>(strings{"bytes memory"}, strings{"bytes20"}, FunctionType::Kind::RIPEMD160, false, StateMutability::Pure)), make_shared<MagicVariableDeclaration>("selfdestruct", make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Kind::Selfdestruct)), make_shared<MagicVariableDeclaration>("sha256", make_shared<FunctionType>(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::SHA256, false, StateMutability::Pure)), - make_shared<MagicVariableDeclaration>("sha3", make_shared<FunctionType>(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::SHA3, false, StateMutability::Pure)), + make_shared<MagicVariableDeclaration>("sha3", make_shared<FunctionType>(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::KECCAK256, false, StateMutability::Pure)), make_shared<MagicVariableDeclaration>("suicide", make_shared<FunctionType>(strings{"address"}, strings{}, FunctionType::Kind::Selfdestruct)), make_shared<MagicVariableDeclaration>("tx", make_shared<MagicType>(MagicType::Kind::Transaction)) }) |