aboutsummaryrefslogtreecommitdiffstats
path: root/solc/jsonCompiler.cpp
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2015-11-21 21:34:21 +0800
committerGav Wood <i@gavwood.com>2015-11-21 21:34:21 +0800
commitbff172cf656843dd0f05def1f920be3d98df9640 (patch)
tree0f2d0c5841dc487d0235f74f77a350d4196246da /solc/jsonCompiler.cpp
parent9997aac1637727d735e1c474da6ecf9d98f072cf (diff)
downloaddexon-solidity-bff172cf656843dd0f05def1f920be3d98df9640.tar.gz
dexon-solidity-bff172cf656843dd0f05def1f920be3d98df9640.tar.zst
dexon-solidity-bff172cf656843dd0f05def1f920be3d98df9640.zip
Fix up for new API from EIP-1.1.
Diffstat (limited to 'solc/jsonCompiler.cpp')
-rw-r--r--solc/jsonCompiler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp
index 43164807..cb3eeefd 100644
--- a/solc/jsonCompiler.cpp
+++ b/solc/jsonCompiler.cpp
@@ -27,7 +27,6 @@
#include <libdevcore/CommonData.h>
#include <libdevcore/CommonIO.h>
#include <libevmcore/Instruction.h>
-#include <libevmcore/Params.h>
#include <libsolidity/parsing/Scanner.h>
#include <libsolidity/parsing/Parser.h>
#include <libsolidity/ast/ASTPrinter.h>
@@ -67,6 +66,7 @@ Json::Value gasToJson(GasEstimator::GasConsumption const& _gas)
Json::Value estimateGas(CompilerStack const& _compiler, string const& _contract)
{
+ eth::EVMSchedule schedule;// TODO: make relevant to supposed context.
Json::Value gasEstimates(Json::objectValue);
using Gas = GasEstimator::GasConsumption;
if (!_compiler.assemblyItems(_contract) && !_compiler.runtimeAssemblyItems(_contract))
@@ -77,7 +77,7 @@ Json::Value estimateGas(CompilerStack const& _compiler, string const& _contract)
u256 bytecodeSize(_compiler.runtimeObject(_contract).bytecode.size());
Json::Value creationGas(Json::arrayValue);
creationGas[0] = gasToJson(gas);
- creationGas[1] = gasToJson(bytecodeSize * eth::c_createDataGas);
+ creationGas[1] = gasToJson(bytecodeSize * schedule.createDataGas);
gasEstimates["creation"] = creationGas;
}
if (eth::AssemblyItems const* items = _compiler.runtimeAssemblyItems(_contract))