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

Move opcodes inside the bytecode section

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-03-29 22:07:58 +01:00
parent 63b6d0099f
commit a87dd17d0f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsolidity/interface/StandardCompiler.cpp
View File

@ -266,13 +266,13 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
// @TODO: add assembly
ostringstream unused;
evmData["legacyAssembly"] = m_compilerStack.streamAssembly(unused, contractName, createSourceList(_input), true);
evmData["opcodes"] = solidity::disassemble(m_compilerStack.object(contractName).bytecode);
evmData["methodIdentifiers"] = methodIdentifiers(m_compilerStack.contractDefinition(contractName));
// @TODO: add gasEstimates
// EVM bytecode
Json::Value bytecode(Json::objectValue);
bytecode["object"] = m_compilerStack.object(contractName).toHex();
bytecode["opcodes"] = solidity::disassemble(m_compilerStack.object(contractName).bytecode);
auto sourceMap = m_compilerStack.sourceMapping(contractName);
bytecode["sourceMap"] = sourceMap ? *sourceMap : "";
// @TODO: add linkReferences
@ -281,6 +281,7 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
// EVM deployed bytecode
Json::Value deployedBytecode(Json::objectValue);
deployedBytecode["object"] = m_compilerStack.runtimeObject(contractName).toHex();
deployedBytecode["opcodes"] = solidity::disassemble(m_compilerStack.runtimeObject(contractName).bytecode);
auto runtimeSourceMap = m_compilerStack.runtimeSourceMapping(contractName);
deployedBytecode["sourceMap"] = runtimeSourceMap ? *runtimeSourceMap : "";
// @TODO: add linkReferences