From 811e09675f582eddf01d575fda050f046d4bd9e9 Mon Sep 17 00:00:00 2001
From: Anna Shaleva <shaleva.ann@nspcc.ru>
Date: Wed, 12 Oct 2022 10:19:47 +0300
Subject: [PATCH] cli: simplify VM preparation for VM CLI

Load script from provided transaction if so.
---
 cli/vm/cli.go | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/cli/vm/cli.go b/cli/vm/cli.go
index 4aaeab3cf..afd0aa087 100644
--- a/cli/vm/cli.go
+++ b/cli/vm/cli.go
@@ -650,7 +650,6 @@ func handleLoadNEF(c *cli.Context) error {
 		return err
 	}
 	v := getVMFromContext(c.App)
-	v.LoadWithFlags(nef.Script, callflag.All)
 	fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
 	setManifestInContext(c.App, m)
 	changePrompt(c.App)
@@ -678,7 +677,6 @@ func handleLoadBase64(c *cli.Context) error {
 		return err
 	}
 	v := getVMFromContext(c.App)
-	v.LoadWithFlags(b, callflag.All)
 	fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
 	changePrompt(c.App)
 	return nil
@@ -713,7 +711,6 @@ func handleLoadHex(c *cli.Context) error {
 		return err
 	}
 	v := getVMFromContext(c.App)
-	v.LoadWithFlags(b, callflag.All)
 	fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
 	changePrompt(c.App)
 	return nil
@@ -750,7 +747,6 @@ func handleLoadGo(c *cli.Context) error {
 	}
 	v := getVMFromContext(c.App)
 	setManifestInContext(c.App, m)
-	v.LoadWithFlags(b.Script, callflag.All)
 	fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
 	changePrompt(c.App)
 	return nil
@@ -789,8 +785,6 @@ func handleLoadTx(c *cli.Context) error {
 		return err
 	}
 	v := getVMFromContext(c.App)
-
-	v.LoadWithFlags(tx.Script, callflag.All)
 	fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
 	changePrompt(c.App)
 	return nil
@@ -834,9 +828,10 @@ func handleLoadDeployed(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	v := getVMFromContext(c.App)
-	v.LoadScriptWithHash(cs.NEF.Script, h, callflag.All)
-	fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", v.Context().LenInstr())
+	ic = getInteropContextFromContext(c.App) // fetch newly-created IC.
+	ic.ReuseVM(ic.VM)                        // clear previously loaded program and context.
+	ic.VM.LoadScriptWithHash(cs.NEF.Script, cs.Hash, callflag.All)
+	fmt.Fprintf(c.App.Writer, "READY: loaded %d instructions\n", ic.VM.Context().LenInstr())
 	setManifestInContext(c.App, &cs.Manifest)
 	changePrompt(c.App)
 	return nil
@@ -858,7 +853,8 @@ func finalizeInteropContext(app *cli.App) {
 }
 
 // resetInteropContext calls finalizer for current interop context and replaces
-// it with the newly created one.
+// it with the newly created one. If transaction is provided, then its script is
+// loaded into bound VM.
 func resetInteropContext(app *cli.App, tx *transaction.Transaction, height ...uint32) error {
 	finalizeInteropContext(app)
 	bc := getChainFromContext(app)
@@ -883,6 +879,9 @@ func resetInteropContext(app *cli.App, tx *transaction.Transaction, height ...ui
 			return fmt.Errorf("failed to create VM: %w", err)
 		}
 	}
+	if tx != nil {
+		newIc.VM.LoadWithFlags(tx.Script, callflag.All)
+	}
 
 	setInteropContextInContext(app, newIc)
 	return nil