aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-03-30 05:07:58 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-04-21 02:38:00 +0800
commita87dd17d0f485ae2738371020774fda68644ecea (patch)
tree04145a299698e233d91af6190864c528243927b9
parent63b6d0099f0a8c0aa8f4bd6e8f19c50f063630fd (diff)
downloaddexon-solidity-a87dd17d0f485ae2738371020774fda68644ecea.tar
dexon-solidity-a87dd17d0f485ae2738371020774fda68644ecea.tar.gz
dexon-solidity-a87dd17d0f485ae2738371020774fda68644ecea.tar.bz2
dexon-solidity-a87dd17d0f485ae2738371020774fda68644ecea.tar.lz
dexon-solidity-a87dd17d0f485ae2738371020774fda68644ecea.tar.xz
dexon-solidity-a87dd17d0f485ae2738371020774fda68644ecea.tar.zst
dexon-solidity-a87dd17d0f485ae2738371020774fda68644ecea.zip
Move opcodes inside the bytecode section
-rw-r--r--libsolidity/interface/StandardCompiler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 9e425d36..e12b6444 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -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