cerc-io/solidity
10
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

Count gas for transaction and code deposit.

Browse Source
This commit is contained in:
chriseth 2019-07-11 18:34:41 +02:00
parent 3dec3af638
commit b7d17c578d
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
test/EVMHost.cpp
View File

@ -24,6 +24,8 @@
#include <test/evmc/helpers.hpp> #include <test/evmc/helpers.hpp>
#include <test/evmc/loader.h> #include <test/evmc/loader.h>
#include <libevmasm/GasMeter.h>
#include <libdevcore/Exceptions.h> #include <libdevcore/Exceptions.h>
#include <libdevcore/Assertions.h> #include <libdevcore/Assertions.h>
#include <libdevcore/Keccak256.h> #include <libdevcore/Keccak256.h>
@ -131,6 +133,20 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
bytes code; bytes code;
evmc_message message = _message; evmc_message message = _message;
if (message.depth == 0)
{
message.gas -= message.kind == EVMC_CREATE ? eth::GasCosts::txCreateGas : eth::GasCosts::txGas;
for (size_t i = 0; i < message.input_size; ++i)
message.gas -= message.input_data[i] == 0 ? eth::GasCosts::txDataZeroGas : eth::GasCosts::txDataNonZeroGas;
if (message.gas < 0)
{
evmc::result result({});
result.status_code = EVMC_OUT_OF_GAS;
m_state = stateBackup;
return result;
}
}
if (message.kind == EVMC_CREATE) if (message.kind == EVMC_CREATE)
{ {
// TODO this is not the right formula // TODO this is not the right formula
@ -169,14 +185,25 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
evmc::result result = m_vm->execute(*this, m_evmVersion, message, code.data(), code.size()); evmc::result result = m_vm->execute(*this, m_evmVersion, message, code.data(), code.size());
m_currentAddress = currentAddress; m_currentAddress = currentAddress;
if (message.kind == EVMC_CREATE)
{
result.gas_left -= eth::GasCosts::createDataGas * result.output_size;
if (result.gas_left < 0)
{
result.gas_left = 0;
result.status_code = EVMC_OUT_OF_GAS;
// TODO clear some fields?
}
else
{
result.create_address = message.destination;
destination.code = bytes(result.output_data, result.output_data + result.output_size);
destination.codeHash = convertToEVMC(keccak256(destination.code));
}
}
if (result.status_code != EVMC_SUCCESS) if (result.status_code != EVMC_SUCCESS)
m_state = stateBackup; m_state = stateBackup;
else if (message.kind == EVMC_CREATE)
{
result.create_address = message.destination;
destination.code = bytes(result.output_data, result.output_data + result.output_size);
destination.codeHash = convertToEVMC(keccak256(destination.code));
}
return result; return result;
} }