diff options
| author | Gav Wood <g@ethdev.com> | 2015-11-23 19:42:28 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-11-23 19:42:28 +0800 |
| commit | 2554d6104a491e586ecad9cf7fe31949dc46e968 (patch) | |
| tree | 3a3639713c76c95f33f432bb00bbba2842682557 /solc/jsonCompiler.cpp | |
| parent | 58110b27c14962b6a46bc3b09e8ea1a75a4087e7 (diff) | |
| parent | bff172cf656843dd0f05def1f920be3d98df9640 (diff) | |
| download | dexon-solidity-2554d6104a491e586ecad9cf7fe31949dc46e968.tar dexon-solidity-2554d6104a491e586ecad9cf7fe31949dc46e968.tar.gz dexon-solidity-2554d6104a491e586ecad9cf7fe31949dc46e968.tar.bz2 dexon-solidity-2554d6104a491e586ecad9cf7fe31949dc46e968.tar.lz dexon-solidity-2554d6104a491e586ecad9cf7fe31949dc46e968.tar.xz dexon-solidity-2554d6104a491e586ecad9cf7fe31949dc46e968.tar.zst dexon-solidity-2554d6104a491e586ecad9cf7fe31949dc46e968.zip | |
Merge pull request #236 from ethereum/hot_gav
Fix up for new API from EIP-1.1.
Diffstat (limited to 'solc/jsonCompiler.cpp')
| -rw-r--r-- | solc/jsonCompiler.cpp | 4 |
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)) |