From 6ce00fde82d33bd7af15b97290730df8b695cf1b Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Mon, 5 Oct 2020 13:08:55 +0300
Subject: [PATCH] vm, core: move invocation counter from InteropContext to VM

---
 pkg/core/interop/context.go       | 2 --
 pkg/core/interop/contract/call.go | 2 +-
 pkg/core/interop/runtime/util.go  | 4 ++--
 pkg/core/interop_system_test.go   | 2 +-
 pkg/vm/vm.go                      | 4 ++++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/core/interop/context.go b/pkg/core/interop/context.go
index 61ab10961..7528f61f6 100644
--- a/pkg/core/interop/context.go
+++ b/pkg/core/interop/context.go
@@ -35,7 +35,6 @@ type Context struct {
 	DAO           *dao.Cached
 	Notifications []state.NotificationEvent
 	Log           *zap.Logger
-	Invocations   map[util.Uint160]int
 	VM            *vm.VM
 	Functions     [][]Function
 }
@@ -53,7 +52,6 @@ func NewContext(trigger trigger.Type, bc blockchainer.Blockchainer, d dao.DAO, n
 		DAO:           dao,
 		Notifications: nes,
 		Log:           log,
-		Invocations:   make(map[util.Uint160]int),
 		// Functions is a slice of slices of interops sorted by ID.
 		Functions: [][]Function{},
 	}
diff --git a/pkg/core/interop/contract/call.go b/pkg/core/interop/contract/call.go
index cb0b4a333..e27a54894 100644
--- a/pkg/core/interop/contract/call.go
+++ b/pkg/core/interop/contract/call.go
@@ -67,7 +67,7 @@ func CallExInternal(ic *interop.Context, cs *state.Contract,
 	}
 
 	u := cs.ScriptHash()
-	ic.Invocations[u]++
+	ic.VM.Invocations[u]++
 	ic.VM.LoadScriptWithHash(cs.Script, u, ic.VM.Context().GetCallFlags()&f)
 	var isNative bool
 	for i := range ic.Natives {
diff --git a/pkg/core/interop/runtime/util.go b/pkg/core/interop/runtime/util.go
index 861be68bf..de17a0b59 100644
--- a/pkg/core/interop/runtime/util.go
+++ b/pkg/core/interop/runtime/util.go
@@ -59,10 +59,10 @@ func GetNotifications(ic *interop.Context) error {
 // GetInvocationCounter returns how many times current contract was invoked during current tx execution.
 func GetInvocationCounter(ic *interop.Context) error {
 	currentScriptHash := ic.VM.GetCurrentScriptHash()
-	count, ok := ic.Invocations[currentScriptHash]
+	count, ok := ic.VM.Invocations[currentScriptHash]
 	if !ok {
 		count = 1
-		ic.Invocations[currentScriptHash] = count
+		ic.VM.Invocations[currentScriptHash] = count
 	}
 	ic.VM.Estack().PushVal(count)
 	return nil
diff --git a/pkg/core/interop_system_test.go b/pkg/core/interop_system_test.go
index 49e88acfa..7abdfcbd7 100644
--- a/pkg/core/interop_system_test.go
+++ b/pkg/core/interop_system_test.go
@@ -296,7 +296,7 @@ func TestRuntimeGetInvocationCounter(t *testing.T) {
 	v, ic, chain := createVM(t)
 	defer chain.Close()
 
-	ic.Invocations[hash.Hash160([]byte{2})] = 42
+	ic.VM.Invocations[hash.Hash160([]byte{2})] = 42
 
 	t.Run("No invocations", func(t *testing.T) {
 		v.LoadScript([]byte{1})
diff --git a/pkg/vm/vm.go b/pkg/vm/vm.go
index ffc9332e6..706c6fb96 100644
--- a/pkg/vm/vm.go
+++ b/pkg/vm/vm.go
@@ -80,6 +80,9 @@ type VM struct {
 	SyscallHandler func(v *VM, id uint32) error
 
 	trigger trigger.Type
+
+	// Invocations is a script invocation counter.
+	Invocations map[util.Uint160]int
 }
 
 // New returns a new VM object ready to load AVM bytecode scripts.
@@ -96,6 +99,7 @@ func NewWithTrigger(t trigger.Type) *VM {
 		trigger: t,
 
 		SyscallHandler: defaultSyscallHandler,
+		Invocations:    make(map[util.Uint160]int),
 	}
 
 	vm.estack = vm.newItemStack("evaluation")