cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10017 from ethereum/develop

Browse Source 
Merge develop into breaking.
This commit is contained in:
chriseth
2020-10-13 12:58:23 +02:00
committed by GitHub
parent 8a1bf41ac0 abfa136afb
commit 0ea4bdafcd
33 changed files with 804 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/ast/Types.cpp
+2 -1
View File
@@ -29,6 +29,7 @@
#include <libsolutil/Algorithms.h>
#include <libsolutil/CommonData.h>
#include <libsolutil/CommonIO.h>
#include <libsolutil/FunctionSelector.h>
#include <libsolutil/Keccak256.h>
#include <libsolutil/UTF8.h>
@@ -3596,7 +3597,7 @@ string FunctionType::externalSignature() const
u256 FunctionType::externalIdentifier() const
{
return util::FixedHash<4>::Arith(util::FixedHash<4>(util::keccak256(externalSignature())));
return util::selectorFromSignature32(externalSignature());
}
string FunctionType::externalIdentifierHex() const