diff options
| author | Christoph Jentzsch <jentzsch.software@gmail.com> | 2014-10-30 00:25:24 +0800 |
|---|---|---|
| committer | Christoph Jentzsch <jentzsch.software@gmail.com> | 2014-10-30 00:25:24 +0800 |
| commit | 4df3ca25f3fb7e3ac3ee3e23ddb95fb44b5311c2 (patch) | |
| tree | e6e62e9f953461d9817f34299962015bcc41d1e3 /vm.cpp | |
| parent | 3565d42a14feae1af85fa2aabc455d8f1f6da15b (diff) | |
| parent | cacc4477bf134ce28a87414e839e8fcc857a947d (diff) | |
| download | dexon-solidity-4df3ca25f3fb7e3ac3ee3e23ddb95fb44b5311c2.tar dexon-solidity-4df3ca25f3fb7e3ac3ee3e23ddb95fb44b5311c2.tar.gz dexon-solidity-4df3ca25f3fb7e3ac3ee3e23ddb95fb44b5311c2.tar.bz2 dexon-solidity-4df3ca25f3fb7e3ac3ee3e23ddb95fb44b5311c2.tar.lz dexon-solidity-4df3ca25f3fb7e3ac3ee3e23ddb95fb44b5311c2.tar.xz dexon-solidity-4df3ca25f3fb7e3ac3ee3e23ddb95fb44b5311c2.tar.zst dexon-solidity-4df3ca25f3fb7e3ac3ee3e23ddb95fb44b5311c2.zip | |
Merge remote-tracking branch 'upstream/develop' into stateTests
Diffstat (limited to 'vm.cpp')
| -rw-r--r-- | vm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -363,9 +363,9 @@ void FakeExtVM::importExec(mObject& _o) code = &thisTxCode; if (_o["code"].type() == str_type) if (_o["code"].get_str().find_first_of("0x") == 0) - thisTxCode = compileLLL(_o["code"].get_str()); - else thisTxCode = fromHex(_o["code"].get_str().substr(2)); + else + thisTxCode = compileLLL(_o["code"].get_str()); else if (_o["code"].type() == array_type) for (auto const& j: _o["code"].get_array()) thisTxCode.push_back(toByte(j)); |