diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-09-26 05:49:26 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2018-09-26 23:11:02 +0800 |
| commit | 6a1e79a8e3fa8e8135de32b2b16eca93de5fb14c (patch) | |
| tree | a2b30b2ecbdf68f36308b65b905d353a1729aa33 | |
| parent | 5d985abcab8d54fcef142f01039ab6d5628f3237 (diff) | |
| download | dexon-solidity-6a1e79a8e3fa8e8135de32b2b16eca93de5fb14c.tar.gz dexon-solidity-6a1e79a8e3fa8e8135de32b2b16eca93de5fb14c.tar.zst dexon-solidity-6a1e79a8e3fa8e8135de32b2b16eca93de5fb14c.zip | |
Set the price of EXTCODEHASH properly
| -rw-r--r-- | libevmasm/GasMeter.cpp | 4 | ||||
| -rw-r--r-- | libevmasm/Instruction.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp index 59afc4da..d98b3efa 100644 --- a/libevmasm/GasMeter.cpp +++ b/libevmasm/GasMeter.cpp @@ -112,9 +112,11 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _ gas += wordGas(GasCosts::copyGas, m_state->relativeStackElement(-2)); break; case Instruction::EXTCODESIZE: - case Instruction::EXTCODEHASH: 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 46f6c628..cf98c938 100644 --- a/libevmasm/Instruction.cpp +++ b/libevmasm/Instruction.cpp @@ -217,7 +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::ExtCode } }, + { 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 } }, |