aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsubtly <subtly@users.noreply.github.com>2014-10-29 09:44:30 +0800
committersubtly <subtly@users.noreply.github.com>2014-10-29 09:44:30 +0800
commit3c98874b97413ca2465e95f9d87b75310b3970e9 (patch)
treee79bfc4b81051d31fd9eacffbf9cc9bb464e55b9
parent0466f758ddd5a3645fa066ad12bd124c46f2081f (diff)
parentcacc4477bf134ce28a87414e839e8fcc857a947d (diff)
downloaddexon-solidity-3c98874b97413ca2465e95f9d87b75310b3970e9.tar.gz
dexon-solidity-3c98874b97413ca2465e95f9d87b75310b3970e9.tar.zst
dexon-solidity-3c98874b97413ca2465e95f9d87b75310b3970e9.zip
Merge branch 'develop' into crypto
-rw-r--r--vm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm.cpp b/vm.cpp
index 40a0a862..d69f03fd 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -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));