Merge branch 'master' into bunsenstraat-patch-4

3 years ago · 44b5f523b6
parent 015059b80f af3f8c9f38
commit 44b5f523b6
37 changed files with 142 additions and 163 deletions
--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@ -176,7 +176,6 @@ const stateCheck = {
  }
 }
 */
-
 const ballotABI = `[
 {
  "inputs": [
--- a/apps/remix-ide-e2e/src/types/index.d.ts
+++ b/apps/remix-ide-e2e/src/types/index.d.ts
@ -1,6 +1,6 @@
 // Merge custom command types with nightwatch types
-
-import { NightwatchBrowser } from 'nightwatch'
+/* eslint-disable no-use-before-define */
+import { NightwatchBrowser } from 'nightwatch' // eslint-disable-line @typescript-eslint/no-unused-vars

 declare module 'nightwatch' {
    export interface NightwatchCustomCommands {
--- a/apps/remix-ide/src/blockchain/execution-context.js
+++ b/apps/remix-ide/src/blockchain/execution-context.js
@ -76,7 +76,6 @@ export class ExecutionContext {
        if (err) name = 'Unknown'
        // https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md
        else if (id === 1) name = 'Main'
-        else if (id === 2) name = 'Morden (deprecated)'
        else if (id === 3) name = 'Ropsten'
        else if (id === 4) name = 'Rinkeby'
        else if (id === 5) name = 'Goerli'
--- a/libs/remix-analyzer/.eslintrc
+++ b/libs/remix-analyzer/.eslintrc
@ -4,7 +4,8 @@
        "@typescript-eslint/no-explicit-any": "off",
        "@typescript-eslint/no-unused-vars": "off",
        "no-unused-vars": "off",
-        "dot-notation": "off"
+        "dot-notation": "off",
+        "no-use-before-define": "off"
    }, 
    "ignorePatterns": ["!**/*"] 
 }
--- a/libs/remix-astwalker/.eslintrc
+++ b/libs/remix-astwalker/.eslintrc
@ -3,7 +3,8 @@
    "rules": {
        "@typescript-eslint/no-explicit-any": "off",
        "@typescript-eslint/prefer-namespace-keyword": "off",
-        "no-unused-vars": "off"
+        "no-unused-vars": "off",
+        "no-use-before-define": "off"
    }, 
    "ignorePatterns": ["!**/*"] 
 }
--- a/libs/remix-astwalker/src/astWalker.ts
+++ b/libs/remix-astwalker/src/astWalker.ts
@ -39,6 +39,7 @@ export function isYulAstNode (node: Record<string, unknown>): boolean {
 * in each case, if the event emits false it does not descend into children.
 * If no event for the current type, children are visited.
 */
+// eslint-disable-next-line no-redeclare
 export class AstWalker extends EventEmitter {
  manageCallback (
    node: AstNode,
--- a/libs/remix-astwalker/src/sourceMappings.ts
+++ b/libs/remix-astwalker/src/sourceMappings.ts
@ -58,6 +58,7 @@ export function sourceLocationFromSrc (src: string): Location {
 * Routines for retrieving solc AST object(s) using some criteria, usually
 * includng "src' information.
 */
+// eslint-disable-next-line no-redeclare
 export class SourceMappings {
  readonly source: string;
  readonly lineBreaks: Array<number>;
--- a/libs/remix-lib/.eslintrc
+++ b/libs/remix-lib/.eslintrc
@ -3,7 +3,8 @@
    "rules": {
        "standard/no-callback-literal": "off",
        "no-unused-vars": "off",
-        "dot-notation": "off"
+        "dot-notation": "off",
+        "no-use-before-define": "off"
    }, 
    "env": {
        "browser": true,
--- a/libs/remix-simulator/test/blocks.ts
+++ b/libs/remix-simulator/test/blocks.ts
@ -115,8 +115,7 @@ describe('blocks', () => {
      assert.deepEqual(numberTransactions, correctBlock.uncles.length)
    })
  })
-
-  /*
+/*
  describe('eth_getStorageAt', () => {
    it('should get storage at position at given address', async () => {
      const abi: any = [
@ -201,30 +200,29 @@ describe('blocks', () => {
        }
      ]

-  //     const code = '0x608060405234801561001057600080fd5b506040516020806102018339810180604052602081101561003057600080fd5b810190808051906020019092919050505080600081905550506101a9806100586000396000f3fe60806040526004361061005c576000357c0100000000000000000000000000000000000000000000000000000000900480632a1afcd91461006157806360fe47b11461008c5780636d4ce63c146100c7578063ce01e1ec146100f2575b600080fd5b34801561006d57600080fd5b5061007661012d565b6040518082815260200191505060405180910390f35b34801561009857600080fd5b506100c5600480360360208110156100af57600080fd5b8101908080359060200190929190505050610133565b005b3480156100d357600080fd5b506100dc61013d565b6040518082815260200191505060405180910390f35b3480156100fe57600080fd5b5061012b6004803603602081101561011557600080fd5b8101908080359060200190929190505050610146565b005b60005481565b8060008190555050565b60008054905090565b80600081905550807f63a242a632efe33c0e210e04e4173612a17efa4f16aa4890bc7e46caece80de060405160405180910390a25056fea165627a7a7230582063160eb16dc361092a85ced1a773eed0b63738b83bea1e1c51cf066fa90e135d0029'
+      const code = '0x608060405234801561001057600080fd5b506040516020806102018339810180604052602081101561003057600080fd5b810190808051906020019092919050505080600081905550506101a9806100586000396000f3fe60806040526004361061005c576000357c0100000000000000000000000000000000000000000000000000000000900480632a1afcd91461006157806360fe47b11461008c5780636d4ce63c146100c7578063ce01e1ec146100f2575b600080fd5b34801561006d57600080fd5b5061007661012d565b6040518082815260200191505060405180910390f35b34801561009857600080fd5b506100c5600480360360208110156100af57600080fd5b8101908080359060200190929190505050610133565b005b3480156100d357600080fd5b506100dc61013d565b6040518082815260200191505060405180910390f35b3480156100fe57600080fd5b5061012b6004803603602081101561011557600080fd5b8101908080359060200190929190505050610146565b005b60005481565b8060008190555050565b60008054905090565b80600081905550807f63a242a632efe33c0e210e04e4173612a17efa4f16aa4890bc7e46caece80de060405160405180910390a25056fea165627a7a7230582063160eb16dc361092a85ced1a773eed0b63738b83bea1e1c51cf066fa90e135d0029'

-  //     const contract = new web3.eth.Contract(abi)
-  //     const accounts = await web3.eth.getAccounts()
+      const contract = new web3.eth.Contract(abi)
+      const accounts = await web3.eth.getAccounts()

-  //     const contractInstance: any = await contract.deploy({ data: code, arguments: [100] }).send({ from: accounts[0], gas: 400000 })
-  //     contractInstance.currentProvider = web3.eth.currentProvider
-  //     contractInstance.givenProvider = web3.eth.currentProvider
+      const contractInstance: any = await contract.deploy({ data: code, arguments: [100] }).send({ from: accounts[0], gas: 400000 })
+      contractInstance.currentProvider = web3.eth.currentProvider
+      contractInstance.givenProvider = web3.eth.currentProvider

-  //     await contractInstance.methods.set(100).send({ from: accounts[0].toLowerCase(), gas: 400000 })
-  //     let storage = await web3.eth.getStorageAt(contractInstance.options.address, 0)
-  //     assert.deepEqual(storage, '0x64')
+      await contractInstance.methods.set(100).send({ from: accounts[0].toLowerCase(), gas: 400000 })
+      let storage = await web3.eth.getStorageAt(contractInstance.options.address, 0)
+      assert.deepEqual(storage, '0x64')

-  //     await contractInstance.methods.set(200).send({ from: accounts[0], gas: 400000 })
-  //     storage = await web3.eth.getStorageAt(contractInstance.options.address, 0)
-  //     assert.deepEqual(storage, '0x64')
+      await contractInstance.methods.set(200).send({ from: accounts[0], gas: 400000 })
+      storage = await web3.eth.getStorageAt(contractInstance.options.address, 0)
+      assert.deepEqual(storage, '0x64')

      await contractInstance.methods.set(200).send({ from: accounts[0], gas: 400000 })
      storage = await web3.eth.getStorageAt(contractInstance.options.address, 0)
      assert.deepEqual(storage, '0xc8')
    })
  })
-  */
-
+*/
  describe('eth_call', () => {
    it('should get a value', async () => {
      const abi: any = [
--- a/libs/remix-solidity/.eslintrc
+++ b/libs/remix-solidity/.eslintrc
@ -2,7 +2,8 @@
    "extends": "../../.eslintrc", 
    "rules": {
        "dot-notation": "off",
-        "no-unused-vars": "off"
+        "no-unused-vars": "off",
+        "no-use-before-define": "off"
    }, 
    "env": {
        "browser": true,
--- a/libs/remix-tests/.eslintrc
+++ b/libs/remix-tests/.eslintrc
@ -2,7 +2,8 @@
    "extends": "../../.eslintrc", 
    "rules": {
        "dot-notation": "off",
-        "no-unused-vars": "off"
+        "no-unused-vars": "off",
+        "no-use-before-define": "off"
    }, 
    "env": {
        "browser": true,
--- a/libs/remix-tests/jest.config.js
+++ b/libs/remix-tests/jest.config.js
@ -6,7 +6,7 @@ module.exports = {
    transform: {
      '^.+\\.[tj]sx?$': 'ts-jest',
    },
-    transformIgnorePatterns: ["/node_modules/", "\\.pnp\\.[^\\\/]+$"],
+    transformIgnorePatterns: ["/node_modules/", "/dist/", "\\.pnp\\.[^\\\/]+$"],
    rootDir: "./",
    testTimeout: 40000,
    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html', 'json'],
--- a/libs/remix-tests/src/types.ts
+++ b/libs/remix-tests/src/types.ts
@ -58,13 +58,12 @@ export interface CompilerConfiguration {
  usingWorker?: boolean,
  runs: number
 }
-
 export interface CompilationErrors {
  name: string,
  errors: Array<Error>,
  message: string
 }
-
+// eslint-disable-next-line no-redeclare
 export class CompilationErrors extends Error {
  constructor (errors: Array<any>) {
    const mapError = errors.map((e) => { return e.formattedMessage || e.message })
--- a/libs/remix-ui/debugger-ui/src/lib/idebugger-api.ts
+++ b/libs/remix-ui/debugger-ui/src/lib/idebugger-api.ts
@ -1,10 +1,6 @@

 import type { CompilationResult, CompilationSource } from '@remix-project/remix-solidity-ts' // eslint-disable-line

-export interface DebuggerUIProps {
-    debuggerAPI: IDebuggerApi
-}
-
 export interface LineColumnLocation {
    start: {
        line: number, column: number
@ -68,3 +64,7 @@ export interface IDebuggerApi {
    web3: () => any // returns an instance of web3.js
    showMessage (title: string, message: string): void
 }
+
+export interface DebuggerUIProps {
+    debuggerAPI: IDebuggerApi
+}
--- a/libs/remix-ui/debugger-ui/src/types/index.ts
+++ b/libs/remix-ui/debugger-ui/src/types/index.ts
@ -1,3 +1,5 @@
+/* eslint-disable no-undef */
+
 export interface ExtractData {
    children?: Array<{key: number | string, value: ExtractData}>
    self?: string | number,
@ -13,7 +15,7 @@ export interface ExtractData {
 }

 export type ExtractFunc = (json: any, parent?: any) => ExtractData
-
+export type FormatSelfFunc = (key: string | number, data: ExtractData) => JSX.Element
 export interface DropdownPanelProps {
    dropdownName: string,
    dropdownMessage?: string,
@ -32,5 +34,3 @@ export interface DropdownPanelProps {
    headStyle?: React.CSSProperties,
    hexHighlight?: boolean // highlight non zero value of hex value
 }
-
-export type FormatSelfFunc = (key: string | number, data: ExtractData) => JSX.Element
--- a/libs/remix-ui/file-explorer/src/lib/file-explorer.tsx
+++ b/libs/remix-ui/file-explorer/src/lib/file-explorer.tsx
@ -636,7 +636,7 @@ export const FileExplorer = (props: FileExplorerProps) => {
      return { ...prevState, focusModal: { ...state.focusModal, hide: true } }
    })
  }
-
+  // eslint-disable-next-line no-undef
  const modal = (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => {
    setState(prevState => {
      return {
--- a/libs/remix-ui/file-explorer/src/lib/types/index.ts
+++ b/libs/remix-ui/file-explorer/src/lib/types/index.ts
@ -1,4 +1,5 @@
 import { customAction } from '@remixproject/plugin-api/lib/file-system/file-panel'
+export type MenuItems = action[] // eslint-disable-line no-use-before-define

 /* eslint-disable-next-line */
 export interface FileExplorerProps {
@ -34,7 +35,6 @@ export interface FileExplorerMenuProps {

 export type action = { name: string, type: string[], path: string[], extension: string[], pattern: string[], id: string, multiselect: boolean, label: string }

-export type MenuItems = action[]
 export interface FileExplorerContextMenuProps {
    actions: action[],
    createNewFile: (folder?: string) => void,
--- a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
+++ b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
@ -4,6 +4,7 @@ import { ModalDialogProps } from './types' // eslint-disable-line
 import './remix-ui-modal-dialog.css'

 declare global {
+  // eslint-disable-next-line no-unused-vars
  interface Window { testmode: boolean; }
 }

--- a/libs/remix-ui/modal-dialog/src/lib/types/index.ts
+++ b/libs/remix-ui/modal-dialog/src/lib/types/index.ts
@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 export interface ModalDialogProps {
  id?: string
  title?: string,
--- a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx
@ -1,4 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars, no-use-before-define
 import React from 'react'
 import '../remix-ui-plugin-manager.css'
 interface PluginCardProps {
--- a/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCardContainer.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCardContainer.tsx
@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Profile } from '@remixproject/plugin-utils'
-import React from 'react'
+import React from 'react' // eslint-disable-line no-use-before-define
 import { PluginManagerComponent } from '../../types'
 import ActivePluginCard from './ActivePluginCard'
 import ModuleHeading from './moduleHeading'
--- a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx
@ -1,5 +1,5 @@
 import { Profile } from '@remixproject/plugin-utils'
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-use-before-define
 import React from 'react'
 import '../remix-ui-plugin-manager.css'
 interface PluginCardProps {
--- a/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCardContainer.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCardContainer.tsx
@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Profile } from '@remixproject/plugin-utils'
-import React from 'react'
+import React from 'react' // eslint-disable-line no-use-before-define
 import { PluginManagerComponent, PluginManagerProfile } from '../../types'
 import InactivePluginCard from './InactivePluginCard'
 import ModuleHeading from './moduleHeading'
--- a/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/LocalPluginForm.tsx
@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import React, { useEffect, useReducer, useState } from 'react'
+import React, { useEffect, useReducer, useState } from 'react' // eslint-disable-line no-use-before-define
 import { ModalDialog } from '@remix-ui/modal-dialog'
 import { Toaster } from '@remix-ui/toaster'
 import { IframePlugin, WebsocketPlugin } from '@remixproject/engine-web'
--- a/libs/remix-ui/plugin-manager/src/lib/components/moduleHeading.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/moduleHeading.tsx
@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-vars,no-use-before-define */
 import React from 'react'

 interface ModuleHeadingProps {
--- a/libs/remix-ui/plugin-manager/src/lib/components/permissionsSettings.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/permissionsSettings.tsx
@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import React, { Fragment, useState } from 'react'
+import React, { Fragment, useState } from 'react' // eslint-disable-line no-use-before-define
 /* eslint-disable-line */
 import { ModalDialog } from '@remix-ui/modal-dialog'
 import useLocalStorage from '../custom-hooks/useLocalStorage'
--- a/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/components/rootView.tsx
@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import React, { Fragment, ReactNode, useEffect, useState } from 'react'
+import React, { Fragment, ReactNode, useEffect, useState } from 'react' // eslint-disable-line no-use-before-define
 import { PluginManagerComponent, PluginManagerSettings } from '../../types'
 import PermisssionsSettings from './permissionsSettings'
 import { Profile } from '@remixproject/plugin-utils'
--- a/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.tsx
+++ b/libs/remix-ui/plugin-manager/src/lib/remix-ui-plugin-manager.tsx
@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Profile } from '@remixproject/plugin-utils'
-import React, { useState } from 'react'
+import React, { useState } from 'react' // eslint-disable-line no-use-before-define
 import { RemixUiPluginManagerProps } from '../types'
 import ActivePluginCardContainer from './components/ActivePluginCardContainer'
 import InactivePluginCardContainer from './components/InactivePluginCardContainer'
--- a/libs/remix-ui/plugin-manager/src/types.d.ts
+++ b/libs/remix-ui/plugin-manager/src/types.d.ts
@ -32,7 +32,7 @@ export class RemixAppManager extends PluginManager {
  constructor()
  event: EventEmitter
  pluginsDirectory: string
-  pluginLoader: PluginLoader
+  pluginLoader: PluginLoader // eslint-disable-line no-use-before-define
  permissionHandler: PermissionHandler
  getAll(): import('@remixproject/plugin-utils').Profile<any>[]
  getIds(): string[]
@ -70,11 +70,11 @@ export class PluginManagerComponent extends ViewPlugin extends Plugin implements
  constructor(appManager: RemixAppManager, engine: Engine)
  appManager: RemixAppManager
  pluginSettings: PluginManagerSettings
-  app: PluginApi<any>
+  app: PluginApi<any> // eslint-disable-line no-undef
  engine: Engine
  htmlElement: HTMLDivElement
  views: { root: null, items: {} }
-  localPlugin: LocalPlugin
+  localPlugin: LocalPlugin // eslint-disable-line no-use-before-define
  pluginNames: string[]
  inactivePlugins: Profile[]
  activePlugins: Profile[]
@ -133,7 +133,7 @@ declare class LocalPlugin {
 }

 export interface PluginManagerContextProviderProps {
-  children: React.ReactNode
+  children: React.ReactNode // eslint-disable-line no-undef
  pluginComponent: PluginManagerComponent
 }

@ -153,7 +153,7 @@ declare class PluginLoader {
    set(plugin: any, actives: any): void
    get(): any
 }
-
+// eslint-disable-next-line no-redeclare
 export type PluginManagerSettings = {
  openDialog: () => void
  onValidation: () => void
@ -197,6 +197,7 @@ export type PluginManagerProfile = Profile & {
  type: 'iframe' | 'ws'
  hash: string
 }
+// eslint-disable-next-line no-redeclare
 export type LocalPlugin = {
  create: () => Profile
  updateName: (target: string) => void
--- a/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx
+++ b/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx
@ -79,7 +79,7 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => {
    resetStorage()
  }

-  const modal = async (title: string, message: string | JSX.Element) => {
+  const modal = async (title: string, message: string | JSX.Element) => { // eslint-disable-line no-undef
    await setState(prevState => {
      return {
        ...prevState,
--- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
@ -73,7 +73,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
    setCurrentVersion(value)
    api.setCompilerParameters({ version: value })
  }
-
+  // eslint-disable-next-line no-undef
  const modal = async (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => {
    await setState(prevState => {
      return {
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@ -10,8 +10,8 @@ export interface CompilerContainerProps {
  api: ICompilerApi,
  compileTabLogic: CompileTabLogic,
  isHardhatProject: boolean,
-  tooltip: (message: string | JSX.Element) => void,
-  modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
+  tooltip: (message: string | JSX.Element) => void, // eslint-disable-line no-undef
+  modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void, // eslint-disable-line no-undef
  compiledFileName: string,
  updateCurrentVersion: any,
  configurationSettings: ConfigurationSettings
@ -21,6 +21,6 @@ export interface ContractSelectionProps {
  contractMap: {
    file: string
  } | Record<string, any>,
-  modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
+  modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void, // eslint-disable-line no-undef
  contractsDetails: Record<string, any>
 }
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@ -1,4 +1,4 @@
-import React, { useEffect, useState, useReducer } from 'react'
+import React, { useEffect, useState, useReducer } from 'react' // eslint-disable-line
 import Button from './Button/StaticAnalyserButton' // eslint-disable-line
 import { util } from '@remix-project/remix-lib'
 import _ from 'lodash'
--- a/libs/remix-ui/tree-view/src/types/index.ts
+++ b/libs/remix-ui/tree-view/src/types/index.ts
@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 export interface TreeViewProps {
    children?: React.ReactNode,
    id?: string
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@ -292,7 +292,7 @@ export const Workspace = (props: WorkspaceProps) => {
      return { ...prevState, modal: { ...state.modal, hide: true, message: null } }
    })
  }
-
+  // eslint-disable-next-line no-undef
  const modal = async (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel: string, cancelFn: () => void) => {
    await setState(prevState => {
      return {
--- a/package-lock.json
+++ b/package-lock.json
@ -10488,12 +10488,6 @@
      "integrity": "sha512-tFfcE+DSTzWAgifkjik9AySNqIyNoYwmR+uecPwwD/XRNfvOjmC/FjCxpiUGDkDVDphPfCUecSQVFw+lN3M3kQ==",
      "dev": true
    },
-    "@types/eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==",
-      "dev": true
-    },
    "@types/estree": {
      "version": "0.0.39",
      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
@ -11022,61 +11016,74 @@
      "dev": true
    },
    "@typescript-eslint/eslint-plugin": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz",
-      "integrity": "sha512-PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.32.0.tgz",
+      "integrity": "sha512-+OWTuWRSbWI1KDK8iEyG/6uK2rTm3kpS38wuVifGUTDB6kjEuNrzBI1MUtxnkneuWG/23QehABe2zHHrj+4yuA==",
      "dev": true,
      "requires": {
-        "@typescript-eslint/experimental-utils": "3.10.1",
-        "debug": "^4.1.1",
+        "@typescript-eslint/experimental-utils": "4.32.0",
+        "@typescript-eslint/scope-manager": "4.32.0",
+        "debug": "^4.3.1",
        "functional-red-black-tree": "^1.0.1",
-        "regexpp": "^3.0.0",
-        "semver": "^7.3.2",
-        "tsutils": "^3.17.1"
+        "ignore": "^5.1.8",
+        "regexpp": "^3.1.0",
+        "semver": "^7.3.5",
+        "tsutils": "^3.21.0"
      },
      "dependencies": {
        "@typescript-eslint/experimental-utils": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz",
-          "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==",
+          "version": "4.32.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.32.0.tgz",
+          "integrity": "sha512-WLoXcc+cQufxRYjTWr4kFt0DyEv6hDgSaFqYhIzQZ05cF+kXfqXdUh+//kgquPJVUBbL3oQGKQxwPbLxHRqm6A==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.7",
+            "@typescript-eslint/scope-manager": "4.32.0",
+            "@typescript-eslint/types": "4.32.0",
+            "@typescript-eslint/typescript-estree": "4.32.0",
+            "eslint-scope": "^5.1.1",
+            "eslint-utils": "^3.0.0"
+          }
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "4.32.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz",
+          "integrity": "sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==",
          "dev": true,
          "requires": {
-            "@types/json-schema": "^7.0.3",
-            "@typescript-eslint/types": "3.10.1",
-            "@typescript-eslint/typescript-estree": "3.10.1",
-            "eslint-scope": "^5.0.0",
-            "eslint-utils": "^2.0.0"
+            "@typescript-eslint/types": "4.32.0",
+            "@typescript-eslint/visitor-keys": "4.32.0"
          }
        },
        "@typescript-eslint/types": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz",
-          "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==",
+          "version": "4.32.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.32.0.tgz",
+          "integrity": "sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==",
          "dev": true
        },
        "@typescript-eslint/typescript-estree": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz",
-          "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==",
+          "version": "4.32.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz",
+          "integrity": "sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "3.10.1",
-            "@typescript-eslint/visitor-keys": "3.10.1",
-            "debug": "^4.1.1",
-            "glob": "^7.1.6",
+            "@typescript-eslint/types": "4.32.0",
+            "@typescript-eslint/visitor-keys": "4.32.0",
+            "debug": "^4.3.1",
+            "globby": "^11.0.3",
            "is-glob": "^4.0.1",
-            "lodash": "^4.17.15",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
+            "semver": "^7.3.5",
+            "tsutils": "^3.21.0"
          }
        },
        "@typescript-eslint/visitor-keys": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz",
-          "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==",
+          "version": "4.32.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz",
+          "integrity": "sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==",
          "dev": true,
          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
+            "@typescript-eslint/types": "4.32.0",
+            "eslint-visitor-keys": "^2.0.0"
          }
        },
        "debug": {
@ -11088,21 +11095,6 @@
            "ms": "2.1.2"
          }
        },
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        },
        "lru-cache": {
          "version": "6.0.0",
          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@ -11150,60 +11142,56 @@
      }
    },
    "@typescript-eslint/parser": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz",
-      "integrity": "sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.32.0.tgz",
+      "integrity": "sha512-lhtYqQ2iEPV5JqV7K+uOVlPePjClj4dOw7K4/Z1F2yvjIUvyr13yJnDzkK6uon4BjHYuHy3EG0c2Z9jEhFk56w==",
      "dev": true,
      "requires": {
-        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.10.1",
-        "@typescript-eslint/types": "3.10.1",
-        "@typescript-eslint/typescript-estree": "3.10.1",
-        "eslint-visitor-keys": "^1.1.0"
+        "@typescript-eslint/scope-manager": "4.32.0",
+        "@typescript-eslint/types": "4.32.0",
+        "@typescript-eslint/typescript-estree": "4.32.0",
+        "debug": "^4.3.1"
      },
      "dependencies": {
-        "@typescript-eslint/experimental-utils": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz",
-          "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==",
+        "@typescript-eslint/scope-manager": {
+          "version": "4.32.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz",
+          "integrity": "sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==",
          "dev": true,
          "requires": {
-            "@types/json-schema": "^7.0.3",
-            "@typescript-eslint/types": "3.10.1",
-            "@typescript-eslint/typescript-estree": "3.10.1",
-            "eslint-scope": "^5.0.0",
-            "eslint-utils": "^2.0.0"
+            "@typescript-eslint/types": "4.32.0",
+            "@typescript-eslint/visitor-keys": "4.32.0"
          }
        },
        "@typescript-eslint/types": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz",
-          "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==",
+          "version": "4.32.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.32.0.tgz",
+          "integrity": "sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==",
          "dev": true
        },
        "@typescript-eslint/typescript-estree": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz",
-          "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==",
+          "version": "4.32.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz",
+          "integrity": "sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw==",
          "dev": true,
          "requires": {
-            "@typescript-eslint/types": "3.10.1",
-            "@typescript-eslint/visitor-keys": "3.10.1",
-            "debug": "^4.1.1",
-            "glob": "^7.1.6",
+            "@typescript-eslint/types": "4.32.0",
+            "@typescript-eslint/visitor-keys": "4.32.0",
+            "debug": "^4.3.1",
+            "globby": "^11.0.3",
            "is-glob": "^4.0.1",
-            "lodash": "^4.17.15",
-            "semver": "^7.3.2",
-            "tsutils": "^3.17.1"
+            "semver": "^7.3.5",
+            "tsutils": "^3.21.0"
          }
        },
        "@typescript-eslint/visitor-keys": {
-          "version": "3.10.1",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz",
-          "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==",
+          "version": "4.32.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz",
+          "integrity": "sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==",
          "dev": true,
          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
+            "@typescript-eslint/types": "4.32.0",
+            "eslint-visitor-keys": "^2.0.0"
          }
        },
        "debug": {
@ -11215,21 +11203,6 @@
            "ms": "2.1.2"
          }
        },
-        "eslint-utils": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
-          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        },
        "lru-cache": {
          "version": "6.0.0",
          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
--- a/package.json
+++ b/package.json
@ -223,8 +223,8 @@
    "@types/react-router-dom": "^5.3.0",
    "@types/tape": "^4.13.0",
    "@types/ws": "^7.2.4",
-    "@typescript-eslint/eslint-plugin": "^3.3.0",
-    "@typescript-eslint/parser": "^3.3.0",
+    "@typescript-eslint/eslint-plugin": "^4.32.0",
+    "@typescript-eslint/parser": "^4.32.0",
    "ace-mode-lexon": "^1.*.*",
    "ace-mode-move": "0.0.1",
    "ace-mode-solidity": "^0.1.0",