diff options
author | artur-zawlocki <artur.zawlocki@gmail.com> | 2014-10-31 23:08:10 +0800 |
---|---|---|
committer | artur-zawlocki <artur.zawlocki@gmail.com> | 2014-10-31 23:08:10 +0800 |
commit | 5546ac9f94374500af8e3aa6314992c61dcaf470 (patch) | |
tree | fcc09dacad571b5c945980fa2f46625618f05313 | |
parent | f19bc2cfef4e01773447f3bc1589c11ea5accaa3 (diff) | |
parent | d56553dfb6e4392a27a34c037c8413621d714010 (diff) | |
download | dexon-solidity-5546ac9f94374500af8e3aa6314992c61dcaf470.tar.gz dexon-solidity-5546ac9f94374500af8e3aa6314992c61dcaf470.tar.zst dexon-solidity-5546ac9f94374500af8e3aa6314992c61dcaf470.zip |
Merge branch 'develop-evmcc' of github.com:imapp-pl/ethereum into develop-evmcc
Conflicts:
libevmjit/Compiler.cpp
-rw-r--r-- | vm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -471,7 +471,7 @@ h160 FakeState::createNewAddress(Address _newAddress, Address _sender, u256 _end } // Set up new account... - m_cache[_newAddress] = AddressState(0, balance(_newAddress) + _endowment, h256(), h256()); + m_cache[_newAddress] = Account(0, balance(_newAddress) + _endowment, h256(), h256()); // Execute init code. auto vmObj = VMFace::create(getVMKind(), *_gas); |