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

Replace the inconsistent use of u160/Address/h160 with h160 only

Browse Source
This commit is contained in:
Alex Beregszaszi
2020-12-07 16:44:59 +01:00
committed by chriseth
parent 73a2843f05
commit a8197788d0
12 changed files with 214 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/EVMHost.cpp
+5 -5
View File
@@ -209,7 +209,7 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
{
// TODO this is not the right formula
// TODO is the nonce incremented on failure, too?
Address createAddress(keccak256(
h160 createAddress(keccak256(
bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
asBytes(to_string(sender.nonce++))
));
@@ -218,7 +218,7 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
}
else if (message.kind == EVMC_CREATE2)
{
Address createAddress(keccak256(
h160 createAddress(keccak256(
bytes(1, 0xff) +
bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
bytes(begin(message.create2_salt.bytes), end(message.create2_salt.bytes)) +
@@ -292,12 +292,12 @@ evmc::bytes32 EVMHost::get_block_hash(int64_t _number) const noexcept
return convertToEVMC(u256("0x3737373737373737373737373737373737373737373737373737373737373737") + _number);
}
Address EVMHost::convertFromEVMC(evmc::address const& _addr)
h160 EVMHost::convertFromEVMC(evmc::address const& _addr)
{
return Address(bytes(begin(_addr.bytes), end(_addr.bytes)));
return h160(bytes(begin(_addr.bytes), end(_addr.bytes)));
}
evmc::address EVMHost::convertToEVMC(Address const& _addr)
evmc::address EVMHost::convertToEVMC(h160 const& _addr)
{
evmc::address a;
for (size_t i = 0; i < 20; ++i)