From 46cc123552788d9a3c2efb73c8d6a7755cfde57c Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Wed, 19 Sep 2018 21:43:12 -0400
Subject: [PATCH] move memory event to vmdebugger class

---
 src/app/debugger/debuggerUI/VmDebugger.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/app/debugger/debuggerUI/VmDebugger.js b/src/app/debugger/debuggerUI/VmDebugger.js
index 06055f9573..c492b934ac 100644
--- a/src/app/debugger/debuggerUI/VmDebugger.js
+++ b/src/app/debugger/debuggerUI/VmDebugger.js
@@ -80,6 +80,15 @@ class VmDebuggerLogic {
           self.event.trigger('traceManagerCallDataUpdate', [calldata])
         }
       })
+
+      self._traceManager.getMemoryAt(index, function (error, memory) {
+        if (error) {
+          console.log(error)
+          self.event.trigger('traceManagerMemoryUpdate', [{}])
+        } else if (self._parentUI.currentStepIndex === index) {
+          self.event.trigger('traceManagerMemoryUpdate', [ui.formatMemory(memory, 16)])
+        }
+      })
     })
   }
 
@@ -101,19 +110,7 @@ function VmDebugger (_parentUI, _traceManager, _codeManager, _solidityProxy, _ca
   this.vmDebuggerLogic.event.register('traceManagerCallDataUpdate', this.calldataPanel.update.bind(this.calldataPanel))
 
   this.memoryPanel = new MemoryPanel()
-  _parentUI.event.register('indexChanged', this, function (index) {
-    if (index < 0) return
-    if (_parentUI.currentStepIndex !== index) return
-
-    _traceManager.getMemoryAt(index, function (error, memory) {
-      if (error) {
-        console.log(error)
-        self.memoryPanel.update({})
-      } else if (_parentUI.currentStepIndex === index) {
-        self.memoryPanel.update(ui.formatMemory(memory, 16))
-      }
-    })
-  })
+  this.vmDebuggerLogic.event.register('traceManagerMemoryUpdate', this.memoryPanel.update.bind(this.memoryPanel))
 
   this.callstackPanel = new CallstackPanel()
   _parentUI.event.register('indexChanged', this, function (index) {