From 1bb26dcdc189bd6d30566cc3acd45e130b974265 Mon Sep 17 00:00:00 2001
From: Roman Khimov <roman@nspcc.ru>
Date: Thu, 9 Jul 2020 15:00:49 +0300
Subject: [PATCH 1/2] vm: fix INITSSLOT, it's context-wide, not VM-wide

It's tied to the current contract, not to VM.
---
 pkg/vm/context.go   |  1 +
 pkg/vm/json_test.go |  2 +-
 pkg/vm/vm.go        | 14 ++++++--------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkg/vm/context.go b/pkg/vm/context.go
index bfbf2f2bb..4f6ddadf7 100644
--- a/pkg/vm/context.go
+++ b/pkg/vm/context.go
@@ -35,6 +35,7 @@ type Context struct {
 	// Alt stack pointer.
 	astack *Stack
 
+	static    *Slot
 	local     *Slot
 	arguments *Slot
 
diff --git a/pkg/vm/json_test.go b/pkg/vm/json_test.go
index 614aec000..395041994 100644
--- a/pkg/vm/json_test.go
+++ b/pkg/vm/json_test.go
@@ -176,7 +176,7 @@ func testFile(t *testing.T, filename string) {
 								require.Equal(t, op, opcode.Opcode(ctx.prog[ctx.nextip]))
 							}
 							compareStacks(t, s.EStack, vm.estack)
-							compareSlots(t, s.StaticFields, vm.static)
+							compareSlots(t, s.StaticFields, ctx.static)
 						}
 					}
 
diff --git a/pkg/vm/vm.go b/pkg/vm/vm.go
index 82911410b..6fd32508a 100644
--- a/pkg/vm/vm.go
+++ b/pkg/vm/vm.go
@@ -71,8 +71,6 @@ type VM struct {
 	estack *Stack // execution stack.
 	astack *Stack // alt stack.
 
-	static *Slot
-
 	// Hash to verify in CHECKSIG/CHECKMULTISIG.
 	checkhash []byte
 
@@ -585,13 +583,13 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
 		v.estack.PushVal(result)
 
 	case opcode.INITSSLOT:
-		if v.static != nil {
+		if ctx.static != nil {
 			panic("already initialized")
 		}
 		if parameter[0] == 0 {
 			panic("zero argument")
 		}
-		v.static = v.newSlot(int(parameter[0]))
+		ctx.static = v.newSlot(int(parameter[0]))
 
 	case opcode.INITSLOT:
 		if ctx.local != nil || ctx.arguments != nil {
@@ -612,20 +610,20 @@ func (v *VM) execute(ctx *Context, op opcode.Opcode, parameter []byte) (err erro
 		}
 
 	case opcode.LDSFLD0, opcode.LDSFLD1, opcode.LDSFLD2, opcode.LDSFLD3, opcode.LDSFLD4, opcode.LDSFLD5, opcode.LDSFLD6:
-		item := v.static.Get(int(op - opcode.LDSFLD0))
+		item := ctx.static.Get(int(op - opcode.LDSFLD0))
 		v.estack.PushVal(item)
 
 	case opcode.LDSFLD:
-		item := v.static.Get(int(parameter[0]))
+		item := ctx.static.Get(int(parameter[0]))
 		v.estack.PushVal(item)
 
 	case opcode.STSFLD0, opcode.STSFLD1, opcode.STSFLD2, opcode.STSFLD3, opcode.STSFLD4, opcode.STSFLD5, opcode.STSFLD6:
 		item := v.estack.Pop().Item()
-		v.static.Set(int(op-opcode.STSFLD0), item)
+		ctx.static.Set(int(op-opcode.STSFLD0), item)
 
 	case opcode.STSFLD:
 		item := v.estack.Pop().Item()
-		v.static.Set(int(parameter[0]), item)
+		ctx.static.Set(int(parameter[0]), item)
 
 	case opcode.LDLOC0, opcode.LDLOC1, opcode.LDLOC2, opcode.LDLOC3, opcode.LDLOC4, opcode.LDLOC5, opcode.LDLOC6:
 		item := ctx.local.Get(int(op - opcode.LDLOC0))

From 15c6cc932dd9c2f63b66354a0c26a214f3760be0 Mon Sep 17 00:00:00 2001
From: Roman Khimov <roman@nspcc.ru>
Date: Thu, 9 Jul 2020 15:05:14 +0300
Subject: [PATCH 2/2] vm: drop checkedhash, it's an unused NeoVM 2 remnant

---
 pkg/vm/vm.go | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkg/vm/vm.go b/pkg/vm/vm.go
index 6fd32508a..2105e58e9 100644
--- a/pkg/vm/vm.go
+++ b/pkg/vm/vm.go
@@ -71,9 +71,6 @@ type VM struct {
 	estack *Stack // execution stack.
 	astack *Stack // alt stack.
 
-	// Hash to verify in CHECKSIG/CHECKMULTISIG.
-	checkhash []byte
-
 	refs *refCounter
 
 	gasConsumed int64
@@ -493,12 +490,6 @@ func (v *VM) AtBreakpoint() bool {
 	return v.state.HasFlag(breakState)
 }
 
-// SetCheckedHash sets checked hash for CHECKSIG and CHECKMULTISIG instructions.
-func (v *VM) SetCheckedHash(h []byte) {
-	v.checkhash = make([]byte, len(h))
-	copy(v.checkhash, h)
-}
-
 // GetInteropID converts instruction parameter to an interop ID.
 func GetInteropID(parameter []byte) uint32 {
 	return binary.LittleEndian.Uint32(parameter)