From c02554e98c10925333e2aec23c5b79d29399d5a2 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Tue, 15 Dec 2020 16:30:12 +0530
Subject: [PATCH] trace import updated

---
 libs/remix-debug/src/trace/traceAnalyser.ts    |  2 +-
 libs/remix-debug/src/trace/traceCache.ts       |  6 +++---
 libs/remix-debug/src/trace/traceHelper.ts      |  2 +-
 libs/remix-debug/src/trace/traceManager.ts     | 14 ++++++--------
 libs/remix-debug/src/trace/traceStepManager.ts |  9 ++++-----
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/libs/remix-debug/src/trace/traceAnalyser.ts b/libs/remix-debug/src/trace/traceAnalyser.ts
index d57a6ca5cb..0612f3d4e5 100644
--- a/libs/remix-debug/src/trace/traceAnalyser.ts
+++ b/libs/remix-debug/src/trace/traceAnalyser.ts
@@ -1,5 +1,5 @@
 'use strict'
-const traceHelper = require('./traceHelper')
+import * as traceHelper from './traceHelper'
 
 export class TraceAnalyser {
 
diff --git a/libs/remix-debug/src/trace/traceCache.ts b/libs/remix-debug/src/trace/traceCache.ts
index 2c379cce3e..e44ac698bc 100644
--- a/libs/remix-debug/src/trace/traceCache.ts
+++ b/libs/remix-debug/src/trace/traceCache.ts
@@ -1,6 +1,6 @@
 'use strict'
-const remixLib = require('@remix-project/remix-lib')
-const helper = remixLib.util
+import { util } from '@remix-project/remix-lib'
+const { sha3_256 } = util
 
 export class TraceCache {
 
@@ -105,7 +105,7 @@ export class TraceCache {
       'address': address,
       'key': key,
       'value': value,
-      'hashedKey': helper.sha3_256(key)
+      'hashedKey': sha3_256(key)
     }
     this.storageChanges.push(index)
   }
diff --git a/libs/remix-debug/src/trace/traceHelper.ts b/libs/remix-debug/src/trace/traceHelper.ts
index 634232a78c..cc3d3da253 100644
--- a/libs/remix-debug/src/trace/traceHelper.ts
+++ b/libs/remix-debug/src/trace/traceHelper.ts
@@ -1,6 +1,6 @@
 'use strict'
 import { helpers } from '@remix-project/remix-lib'
-const ui = helpers.ui
+const { ui } = helpers
 
   // vmTraceIndex has to point to a CALL, CODECALL, ...
 export function resolveCalledAddress (vmTraceIndex, trace) {
diff --git a/libs/remix-debug/src/trace/traceManager.ts b/libs/remix-debug/src/trace/traceManager.ts
index 2c06e7bb83..8be41a40df 100644
--- a/libs/remix-debug/src/trace/traceManager.ts
+++ b/libs/remix-debug/src/trace/traceManager.ts
@@ -1,11 +1,9 @@
 'use strict'
-const TraceAnalyser = require('./traceAnalyser')
-const TraceCache = require('./traceCache')
-const TraceStepManager = require('./traceStepManager')
-
-const traceHelper = require('./traceHelper')
-const remixLib = require('@remix-project/remix-lib')
-const util = remixLib.util
+import { TraceAnalyser } from './traceAnalyser'
+import { TraceCache } from './traceCache'
+import { TraceStepManager } from './traceStepManager'
+import { isCreateInstruction } from './traceHelper'
+import { util } from '@remix-project/remix-lib'
 
 export class TraceManager {
 
@@ -241,7 +239,7 @@ export class TraceManager {
   }
 
   isCreationStep (stepIndex) {
-    return traceHelper.isCreateInstruction(this.trace[stepIndex])
+    return isCreateInstruction(this.trace[stepIndex])
   }
 
   // step section
diff --git a/libs/remix-debug/src/trace/traceStepManager.ts b/libs/remix-debug/src/trace/traceStepManager.ts
index 6dfaabaea4..ee92704234 100644
--- a/libs/remix-debug/src/trace/traceStepManager.ts
+++ b/libs/remix-debug/src/trace/traceStepManager.ts
@@ -1,8 +1,7 @@
 'use strict'
 
-const traceHelper = require('./traceHelper')
-const remixLib = require('@remix-project/remix-lib')
-const util = remixLib.util
+import { isCallInstruction, isCallToPrecompiledContract, isReturnInstruction } from './traceHelper'
+import { util } from '@remix-project/remix-lib'
 
 export class TraceStepManager {
 
@@ -14,12 +13,12 @@ export class TraceStepManager {
 
   isCallInstruction (index) {
     const state = this.traceAnalyser.trace[index]
-    return traceHelper.isCallInstruction(state) && !traceHelper.isCallToPrecompiledContract(index, this.traceAnalyser.trace)
+    return isCallInstruction(state) && !isCallToPrecompiledContract(index, this.traceAnalyser.trace)
   }
 
   isReturnInstruction (index) {
     const state = this.traceAnalyser.trace[index]
-    return traceHelper.isReturnInstruction(state)
+    return isReturnInstruction(state)
   }
 
   findStepOverBack (currentStep) {