diff options
author | subtly <subtly@users.noreply.github.com> | 2014-10-29 09:44:30 +0800 |
---|---|---|
committer | subtly <subtly@users.noreply.github.com> | 2014-10-29 09:44:30 +0800 |
commit | 3c98874b97413ca2465e95f9d87b75310b3970e9 (patch) | |
tree | e79bfc4b81051d31fd9eacffbf9cc9bb464e55b9 | |
parent | 0466f758ddd5a3645fa066ad12bd124c46f2081f (diff) | |
parent | cacc4477bf134ce28a87414e839e8fcc857a947d (diff) | |
download | dexon-solidity-3c98874b97413ca2465e95f9d87b75310b3970e9.tar.gz dexon-solidity-3c98874b97413ca2465e95f9d87b75310b3970e9.tar.zst dexon-solidity-3c98874b97413ca2465e95f9d87b75310b3970e9.zip |
Merge branch 'develop' into crypto
-rw-r--r-- | vm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -359,9 +359,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)); |