From 4a9bd47683052e1597fbd7729c9f42fa4fa462e6 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 5 Jan 2023 12:13:30 +0100
Subject: [PATCH] stop using require with ethereumjs/ deps

---
 apps/remix-ide/src/blockchain/providers/injected.js | 2 +-
 apps/remix-ide/src/blockchain/providers/node.js     | 2 +-
 apps/remix-ide/src/blockchain/providers/vm.js       | 2 +-
 apps/remix-ide/src/lib/helper.js                    | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/remix-ide/src/blockchain/providers/injected.js b/apps/remix-ide/src/blockchain/providers/injected.js
index 92277fd97c..6e994b9a00 100644
--- a/apps/remix-ide/src/blockchain/providers/injected.js
+++ b/apps/remix-ide/src/blockchain/providers/injected.js
@@ -1,5 +1,5 @@
 const Web3 = require('web3')
-const { hashPersonalMessage } = require('@ethereumjs/util')
+import { hashPersonalMessage } from '@ethereumjs/util'
 
 class InjectedProvider {
   constructor (executionContext) {
diff --git a/apps/remix-ide/src/blockchain/providers/node.js b/apps/remix-ide/src/blockchain/providers/node.js
index 8425b0fbc2..b5ebd6ecc0 100644
--- a/apps/remix-ide/src/blockchain/providers/node.js
+++ b/apps/remix-ide/src/blockchain/providers/node.js
@@ -1,5 +1,5 @@
 const Web3 = require('web3')
-const { hashPersonalMessage } = require('@ethereumjs/util')
+import { hashPersonalMessage } from '@ethereumjs/util'
 const Personal = require('web3-eth-personal')
 
 class NodeProvider {
diff --git a/apps/remix-ide/src/blockchain/providers/vm.js b/apps/remix-ide/src/blockchain/providers/vm.js
index 070bc7ee99..25fc4cef36 100644
--- a/apps/remix-ide/src/blockchain/providers/vm.js
+++ b/apps/remix-ide/src/blockchain/providers/vm.js
@@ -1,5 +1,5 @@
 const Web3 = require('web3')
-const { privateToAddress, hashPersonalMessage } = require('@ethereumjs/util')
+import { privateToAddress, hashPersonalMessage } from '@ethereumjs/util'
 import BN from 'bn.js'
 const { extend } = require('@remix-project/remix-simulator')
 class VMProvider {
diff --git a/apps/remix-ide/src/lib/helper.js b/apps/remix-ide/src/lib/helper.js
index 5fdea63b58..d332c7e937 100644
--- a/apps/remix-ide/src/lib/helper.js
+++ b/apps/remix-ide/src/lib/helper.js
@@ -1,7 +1,7 @@
 var async = require('async')
-const ethJSUtil = require('@ethereumjs/util')
+import { toChecksumAddress } from '@ethereumjs/util'
 
-module.exports = {
+export default  {
   shortenAddress: function (address, etherBalance) {
     var len = address.length
     return address.slice(0, 5) + '...' + address.slice(len - 5, len) + (etherBalance ? ' (' + etherBalance.toString() + ' ether)' : '')
@@ -14,7 +14,7 @@ module.exports = {
     if (address.indexOf('0x') === -1) {
       address = '0x' + address
     }
-    return ethJSUtil.toChecksumAddress(address)
+    return toChecksumAddress(address)
   },
   shortenHexData: function (data) {
     if (!data) return ''