diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-06-09 11:12:13 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-06-09 11:12:13 +0800 |
| commit | 0d084d1d35072f78f3d016a6c44113d8e58f883e (patch) | |
| tree | 718bc690899beb0408d40c76b32d7e1a7ebbdedd /libsolidity/solidityExecutionFramework.h | |
| parent | aea36494f0ffb142a91b667ed5b19e21adb7568a (diff) | |
| parent | 88865c546fc27f824d37e72496e9fcd3181539e9 (diff) | |
| download | dexon-solidity-0d084d1d35072f78f3d016a6c44113d8e58f883e.tar dexon-solidity-0d084d1d35072f78f3d016a6c44113d8e58f883e.tar.gz dexon-solidity-0d084d1d35072f78f3d016a6c44113d8e58f883e.tar.bz2 dexon-solidity-0d084d1d35072f78f3d016a6c44113d8e58f883e.tar.lz dexon-solidity-0d084d1d35072f78f3d016a6c44113d8e58f883e.tar.xz dexon-solidity-0d084d1d35072f78f3d016a6c44113d8e58f883e.tar.zst dexon-solidity-0d084d1d35072f78f3d016a6c44113d8e58f883e.zip | |
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into filter_blockHash
Diffstat (limited to 'libsolidity/solidityExecutionFramework.h')
| -rw-r--r-- | libsolidity/solidityExecutionFramework.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libsolidity/solidityExecutionFramework.h b/libsolidity/solidityExecutionFramework.h index e81b4d7b..44590b1c 100644 --- a/libsolidity/solidityExecutionFramework.h +++ b/libsolidity/solidityExecutionFramework.h @@ -148,6 +148,8 @@ protected: { m_state.addBalance(m_sender, _value); // just in case eth::Executive executive(m_state, eth::LastHashes(), 0); + eth::ExecutionResult res; + executive.setResultRecipient(res); eth::Transaction t = _isCreation ? eth::Transaction(_value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec()) : @@ -176,7 +178,7 @@ protected: m_state.noteSending(m_sender); executive.finalize(); m_gasUsed = executive.gasUsed(); - m_output = executive.out().toVector(); + m_output = std::move(res.output); // FIXME: Looks like Framework needs ExecutiveResult embedded m_logs = executive.logs(); } |