diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-09-28 07:04:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-28 07:04:40 +0800 |
| commit | c4b5101b9d8337069c495b95b04a420e2665aa2d (patch) | |
| tree | 7348765fe7db6c74a8003dc8a972e477fa30fe41 /libevmasm | |
| parent | f36dee1067f09e2a6e5ec0dc5996e19e5f36c8bd (diff) | |
| parent | 8d8c855810ed51d17cab679cd89f7a75410a4258 (diff) | |
| download | dexon-solidity-c4b5101b9d8337069c495b95b04a420e2665aa2d.tar dexon-solidity-c4b5101b9d8337069c495b95b04a420e2665aa2d.tar.gz dexon-solidity-c4b5101b9d8337069c495b95b04a420e2665aa2d.tar.bz2 dexon-solidity-c4b5101b9d8337069c495b95b04a420e2665aa2d.tar.lz dexon-solidity-c4b5101b9d8337069c495b95b04a420e2665aa2d.tar.xz dexon-solidity-c4b5101b9d8337069c495b95b04a420e2665aa2d.tar.zst dexon-solidity-c4b5101b9d8337069c495b95b04a420e2665aa2d.zip | |
Merge pull request #4676 from jwasinger/extcodehash
Add support for EXTCODEHASH
Diffstat (limited to 'libevmasm')
| -rw-r--r-- | libevmasm/GasMeter.cpp | 3 | ||||
| -rw-r--r-- | libevmasm/Instruction.cpp | 2 | ||||
| -rw-r--r-- | libevmasm/Instruction.h | 1 | ||||
| -rw-r--r-- | libevmasm/SemanticInformation.cpp | 3 |
4 files changed, 9 insertions, 0 deletions
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index b40617c1..d98b3efa 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -114,6 +114,9 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _ case Instruction::EXTCODESIZE: gas = GasCosts::extCodeGas(m_evmVersion); break; + case Instruction::EXTCODEHASH: + gas = GasCosts::balanceGas(m_evmVersion); + break; case Instruction::EXTCODECOPY: gas = GasCosts::extCodeGas(m_evmVersion); gas += memoryGas(-1, -3); diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp index d5b82e75..cf98c938 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -73,6 +73,7 @@ const std::map<std::string, Instruction> dev::solidity::c_instructions = { "EXTCODECOPY", Instruction::EXTCODECOPY }, { "RETURNDATASIZE", Instruction::RETURNDATASIZE }, { "RETURNDATACOPY", Instruction::RETURNDATACOPY }, + { "EXTCODEHASH", Instruction::EXTCODEHASH }, { "BLOCKHASH", Instruction::BLOCKHASH }, { "COINBASE", Instruction::COINBASE }, { "TIMESTAMP", Instruction::TIMESTAMP }, @@ -216,6 +217,7 @@ static const std::map<Instruction, InstructionInfo> c_instructionInfo = { Instruction::EXTCODECOPY, { "EXTCODECOPY", 0, 4, 0, true, Tier::ExtCode } }, { Instruction::RETURNDATASIZE, {"RETURNDATASIZE", 0, 0, 1, false, Tier::Base } }, { Instruction::RETURNDATACOPY, {"RETURNDATACOPY", 0, 3, 0, true, Tier::VeryLow } }, + { Instruction::EXTCODEHASH, { "EXTCODEHASH", 0, 1, 1, false, Tier::Balance } }, { Instruction::BLOCKHASH, { "BLOCKHASH", 0, 1, 1, false, Tier::Ext } }, { Instruction::COINBASE, { "COINBASE", 0, 0, 1, false, Tier::Base } }, { Instruction::TIMESTAMP, { "TIMESTAMP", 0, 0, 1, false, Tier::Base } }, diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h index 50c1f47d..63424eeb 100644 --- a/libevmasm/Instruction.h +++ b/libevmasm/Instruction.h @@ -82,6 +82,7 @@ enum class Instruction: uint8_t EXTCODECOPY, ///< copy external code (from another contract) RETURNDATASIZE = 0x3d, ///< get size of return data buffer RETURNDATACOPY = 0x3e, ///< copy return data in current environment to memory + EXTCODEHASH = 0x3f, ///< get external code hash (from another contract) BLOCKHASH = 0x40, ///< get hash of most recent complete block COINBASE, ///< get the block's coinbase address diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp index 71267ee8..78f3c9c7 100644 --- a/libevmasm/SemanticInformation.cpp +++ b/libevmasm/SemanticInformation.cpp @@ -151,6 +151,7 @@ bool SemanticInformation::isDeterministic(AssemblyItem const& _item) case Instruction::MSIZE: // depends on previous writes and reads, not only on content case Instruction::BALANCE: // depends on previous calls case Instruction::EXTCODESIZE: + case Instruction::EXTCODEHASH: case Instruction::RETURNDATACOPY: // depends on previous calls case Instruction::RETURNDATASIZE: return false; @@ -172,6 +173,7 @@ bool SemanticInformation::movable(Instruction _instruction) case Instruction::KECCAK256: case Instruction::BALANCE: case Instruction::EXTCODESIZE: + case Instruction::EXTCODEHASH: case Instruction::RETURNDATASIZE: case Instruction::SLOAD: case Instruction::PC: @@ -233,6 +235,7 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction) case Instruction::GASPRICE: case Instruction::EXTCODESIZE: case Instruction::EXTCODECOPY: + case Instruction::EXTCODEHASH: case Instruction::BLOCKHASH: case Instruction::COINBASE: case Instruction::TIMESTAMP: |