Merge branch 'master' into development

CityOfZion · Oct 8, 2017 · 338d71a · 338d71a
2 parents b2470bc + f7efe14
commit 338d71a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/neo/VM/ExecutionEngine.py b/neo/VM/ExecutionEngine.py
@@ -763,6 +763,15 @@ def ExecuteOp(self, opcode, context):
 
                 estack.PushT(Struct(items))
 
+            elif opcode == THROW:
+                self._VMState |= VMState.FAULT
+                return
+
+            elif opcode == THROWIFNOT:
+                if estack.Pop().GetBoolean() == False:
+                    self._VMState |= VMState.FAULT
+                    return
+
             else:
 
                 self._VMState |= VMState.FAULT

diff --git a/neo/VM/OpCode.py b/neo/VM/OpCode.py
@@ -38,6 +38,11 @@
 TAILCALL = b'\x69'
 
 
+# Exceptions
+THROW = b'\xf0'
+THROWIFNOT = b'\xf1'
+
+
 #  Stack
 DUPFROMALTSTACK = b'\x6A'
 TOALTSTACK = b'\x6B' #  Puts the input onto the top of the alt stack. Removes it from the main stack.

diff --git a/prompt.py b/prompt.py
@@ -113,7 +113,7 @@ class PromptInterface(object):
                 'wallet {verbose}',
                 'wallet rebuild {start block}',
                 'send {assetId or name} {address} {amount}',
-                'testinvoke contract {contract hash} {params}',
+                'testinvoke {contract hash} {params}',
                 'invoke',
                 'cancel',
                 ]