diff options
| author | Paweł Bylica <pawel.bylica@imapp.pl> | 2014-12-15 22:11:35 +0800 |
|---|---|---|
| committer | Paweł Bylica <pawel.bylica@imapp.pl> | 2014-12-15 22:11:35 +0800 |
| commit | 59fe1fdf9294feab37999e386784f80e390e9001 (patch) | |
| tree | 5aa61d98891fd5e944a72f754ef6710740b5b13f /solidityExecutionFramework.h | |
| parent | a9b5c1b9cab3aee23b2df8f260ed935b36de257d (diff) | |
| parent | dd309de94c2cd6a5d77be877e4f30b5a70d725f5 (diff) | |
| download | dexon-solidity-59fe1fdf9294feab37999e386784f80e390e9001.tar dexon-solidity-59fe1fdf9294feab37999e386784f80e390e9001.tar.gz dexon-solidity-59fe1fdf9294feab37999e386784f80e390e9001.tar.bz2 dexon-solidity-59fe1fdf9294feab37999e386784f80e390e9001.tar.lz dexon-solidity-59fe1fdf9294feab37999e386784f80e390e9001.tar.xz dexon-solidity-59fe1fdf9294feab37999e386784f80e390e9001.tar.zst dexon-solidity-59fe1fdf9294feab37999e386784f80e390e9001.zip | |
Merge commit '1b8f9fdc3b44503890ed1bcb5da8bd5cb8dd83a5' into develop-evmcc
Conflicts:
test/TestHelper.cpp
Diffstat (limited to 'solidityExecutionFramework.h')
| -rw-r--r-- | solidityExecutionFramework.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solidityExecutionFramework.h b/solidityExecutionFramework.h index 9d40e8a4..91ee7ad6 100644 --- a/solidityExecutionFramework.h +++ b/solidityExecutionFramework.h @@ -117,7 +117,7 @@ private: void sendMessage(bytes const& _data, bool _isCreation, u256 const& _value = 0) { m_state.addBalance(m_sender, _value); // just in case - eth::Executive executive(m_state); + eth::Executive executive(m_state, 0); eth::Transaction t = _isCreation ? eth::Transaction(_value, m_gasPrice, m_gas, _data, 0, KeyPair::create().sec()) : eth::Transaction(_value, m_gasPrice, m_gas, m_contractAddress, _data, 0, KeyPair::create().sec()); bytes transactionRLP = t.rlp(); @@ -137,7 +137,7 @@ private: else { BOOST_REQUIRE(m_state.addressHasCode(m_contractAddress)); - BOOST_REQUIRE(!executive.call(m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas, m_sender)); + BOOST_REQUIRE(!executive.call(m_contractAddress, m_contractAddress, m_sender, _value, m_gasPrice, &_data, m_gas, m_sender)); } BOOST_REQUIRE(executive.go()); m_state.noteSending(m_sender); |