From b64a96199fb17d624974d8d5efe8e0758ef117bf Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Fri, 30 May 2014 13:37:39 +0200 Subject: [PATCH] Fix for nonce incrementing. Messaging for some execution failures. State uses temporary for transaction trie. Additional optimisation. --- Assembly.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assembly.cpp b/Assembly.cpp index 1d9cb4bcb..c0dc6fd5e 100644 --- a/Assembly.cpp +++ b/Assembly.cpp @@ -213,7 +213,10 @@ void Assembly::optimise() std::vector>> rules = { { { Push, Instruction::POP }, [](AssemblyItemsConstRef) -> AssemblyItems { return {}; } }, + { { PushTag, Instruction::POP }, [](AssemblyItemsConstRef) -> AssemblyItems { return {}; } }, + { { PushString, Instruction::POP }, [](AssemblyItemsConstRef) -> AssemblyItems { return {}; } }, { { Push, PushTag, Instruction::JUMPI }, [](AssemblyItemsConstRef m) -> AssemblyItems { if (m[0].data()) return { m[1], Instruction::JUMP }; else return {}; } }, + { { Instruction::NOT, Instruction::NOT }, [](AssemblyItemsConstRef) -> AssemblyItems { return {}; } }, }; for (auto const& i: c_simple)