diff options
| author | chriseth <c@ethdev.com> | 2015-09-10 18:01:05 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-09-11 21:21:37 +0800 |
| commit | a9edc7b1a601747f96e47fe60a5fc10df489696f (patch) | |
| tree | 8165a9a44cc6cf23f6a8d8b152facfe3fd65a909 /solc/jsonCompiler.cpp | |
| parent | 337fde9d11adac85800b405a3fdb4bcd09039ebf (diff) | |
| download | dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar.gz dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar.bz2 dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar.lz dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar.xz dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.tar.zst dexon-solidity-a9edc7b1a601747f96e47fe60a5fc10df489696f.zip | |
Transition from bytecode to more general linker objects.
Diffstat (limited to 'solc/jsonCompiler.cpp')
| -rw-r--r-- | solc/jsonCompiler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index b6b9f512..b7bb9fe7 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -76,7 +76,7 @@ Json::Value estimateGas(CompilerStack const& _compiler, string const& _contract) if (eth::AssemblyItems const* items = _compiler.assemblyItems(_contract)) { Gas gas = GasEstimator::functionalEstimation(*items); - u256 bytecodeSize(_compiler.runtimeBytecode(_contract).size()); + u256 bytecodeSize(_compiler.runtimeObject(_contract).bytecode.size()); Json::Value creationGas(Json::arrayValue); creationGas[0] = gasToJson(gas); creationGas[1] = gasToJson(bytecodeSize * eth::c_createDataGas); @@ -168,8 +168,8 @@ string compile(string _input, bool _optimize) Json::Value contractData(Json::objectValue); contractData["solidity_interface"] = compiler.solidityInterface(contractName); contractData["interface"] = compiler.interface(contractName); - contractData["bytecode"] = toHex(compiler.bytecode(contractName)); - contractData["opcodes"] = eth::disassemble(compiler.bytecode(contractName)); + contractData["bytecode"] = compiler.object(contractName).toHex(); + contractData["opcodes"] = eth::disassemble(compiler.object(contractName).bytecode); contractData["functionHashes"] = functionHashes(compiler.contractDefinition(contractName)); contractData["gasEstimates"] = estimateGas(compiler, contractName); ostringstream unused; |