Merge branch 'master' of https://github.com/ethereum/remix-project into git4

apps/circuit-compiler/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json",
+}

apps/circuit-compiler/src/app/contexts/index.ts

@@ -1,4 +1,4 @@
-import {createContext} from 'react'
+import { createContext } from 'react'
-import {ICircuitAppContext} from '../types'
+import { ICircuitAppContext } from '../types'
 
 export const CircuitAppContext = createContext<ICircuitAppContext>({} as ICircuitAppContext)

apps/circuit-compiler/src/app/reducers/state.ts

@@ -1,4 +1,4 @@
-import {Actions, AppState} from '../types'
+import { Actions, AppState } from '../types'
 import { compiler_list } from 'circom_wasm'
 
 export const appInitialState: AppState = {

apps/circuit-compiler/src/app/services/circomPluginClient.ts

@@ -339,7 +339,7 @@ export class CircomPluginClient extends PluginClient {
 
           absFilePath = include.startsWith('circomlib') ? absFilePath.substring(1) : absFilePath
           if (!blackPath.includes(absFilePath)) {
-            if(!includeName.startsWith('circomlib')) {
+            if (!includeName.startsWith('circomlib')) {
               dependencyContent = dependencyContent.replace(`${includeName}`, `${absFilePath}`)
               return absFilePath
             }

apps/circuit-compiler/src/app/types/index.ts

@@ -1,5 +1,5 @@
 import { compiler_list } from 'circom_wasm'
-import {Dispatch} from 'react'
+import { Dispatch } from 'react'
 import type { CircomPluginClient } from '../services/circomPluginClient'
 
 export type CompilerStatus = "compiling" | "generating" | "computing" | "idle" | "errored" | "warning"

apps/debugger/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json",
+}

apps/doc-gen/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json",
+}

apps/doc-gen/src/app/docgen-client.ts

@@ -50,7 +50,7 @@ export class DocGenClient extends PluginClient {
       }
       const segmentedPathList = normalizeContractPath(fileName)
       this.fileName = segmentedPathList[segmentedPathList.length - 1]
-      this.contractPath =  segmentedPathList[0]
+      this.contractPath = segmentedPathList[0]
       this.eventEmitter.emit('compilationFinished', this.build, this.fileName)
     })
   }

apps/doc-gen/src/app/docgen/common/properties.ts

@@ -36,47 +36,47 @@ export function fullName ({ item, contract }: DocItemContext): string {
 
 export function signature ({ item }: DocItemContext): string | undefined {
   switch (item.nodeType) {
-    case 'ContractDefinition':
+  case 'ContractDefinition':
-      return undefined;
+    return undefined;
-
+
-    case 'FunctionDefinition': {
+  case 'FunctionDefinition': {
-      const { kind, name } = item;
+    const { kind, name } = item;
-      const params = item.parameters.parameters;
+    const params = item.parameters.parameters;
-      const returns = item.returnParameters.parameters;
+    const returns = item.returnParameters.parameters;
-      const head = (kind === 'function' || kind === 'freeFunction') ? [kind, name].join(' ') : kind;
+    const head = (kind === 'function' || kind === 'freeFunction') ? [kind, name].join(' ') : kind;
-      const res = [
+    const res = [
-        `${head}(${params.map(formatVariable).join(', ')})`,
+      `${head}(${params.map(formatVariable).join(', ')})`,
-        item.visibility,
+      item.visibility,
-      ];
+    ];
-      if (item.stateMutability !== 'nonpayable') {
+    if (item.stateMutability !== 'nonpayable') {
-        res.push(item.stateMutability);
+      res.push(item.stateMutability);
-      }
-      if (item.virtual) {
-        res.push('virtual');
-      }
-      if (returns.length > 0) {
-        res.push(`returns (${returns.map(formatVariable).join(', ')})`);
-      }
-      return res.join(' ');
     }
-
+    if (item.virtual) {
-    case 'EventDefinition': {
+      res.push('virtual');
-      const params = item.parameters.parameters;
-      return `event ${item.name}(${params.map(formatVariable).join(', ')})`;
     }
-
+    if (returns.length > 0) {
-    case 'ErrorDefinition': {
+      res.push(`returns (${returns.map(formatVariable).join(', ')})`);
-      const params = item.parameters.parameters;
-      return `error ${item.name}(${params.map(formatVariable).join(', ')})`;
     }
+    return res.join(' ');
+  }
 
-    case 'ModifierDefinition': {
+  case 'EventDefinition': {
-      const params = item.parameters.parameters;
+    const params = item.parameters.parameters;
-      return `modifier ${item.name}(${params.map(formatVariable).join(', ')})`;
+    return `event ${item.name}(${params.map(formatVariable).join(', ')})`;
-    }
+  }
+
+  case 'ErrorDefinition': {
+    const params = item.parameters.parameters;
+    return `error ${item.name}(${params.map(formatVariable).join(', ')})`;
+  }
+
+  case 'ModifierDefinition': {
+    const params = item.parameters.parameters;
+    return `modifier ${item.name}(${params.map(formatVariable).join(', ')})`;
+  }
 
-    case 'VariableDeclaration':
+  case 'VariableDeclaration':
-      return formatVariable(item);
+    return formatVariable(item);
   }
 }
 

apps/doc-gen/src/app/docgen/templates.ts

@@ -3,7 +3,7 @@ import { mapKeys } from './utils/map-keys';
 import { DocItemContext } from './site';
 
 import * as defaultProperties from './common/properties';
-import * as themeHelpers from  './themes/markdown/helpers'
+import * as themeHelpers from './themes/markdown/helpers'
 
 const common = require('./themes/markdown/common.hbs');
 const contract = require('./themes/markdown/contract.hbs');
@@ -45,7 +45,6 @@ export async function loadTemplates(defaultTheme: string, root: string, userTemp
     properties: { ...defaultProperties },
   };
 
-
   // Add partials and helpers from all themes, prefixed with the theme name.
   for (const [themeName, theme] of Object.entries(themes)) {
     const addPrefix = (k: string) => `${themeName}/${k}`;

apps/doc-gen/src/app/docgen/utils/memoized-getter.ts

@@ -6,17 +6,17 @@ export function defineGetterMemoized<K extends keyof any, T, O extends { [k in K
     enumerable: true,
     get() {
       switch (state) {
-        case 'done': 
+      case 'done':
-          return value;
+        return value;
 
-        case 'doing':
+      case 'doing':
-          throw new Error("Detected recursion");
+        throw new Error("Detected recursion");
 
-        case 'todo':
+      case 'todo':
-          state = 'doing';
+        state = 'doing';
-          value = getter();
+        value = getter();
-          state = 'done';
+        state = 'done';
-          return value;
+        return value;
       }
     }
   });

apps/doc-gen/src/app/docgen/utils/natspec.ts

@@ -34,10 +34,10 @@ export function parseNatspec(item: DocItemWithContext): NatSpec {
   const docString = docSource !== undefined
     ? cleanUpDocstringFromSource(docSource)
     : 'documentation' in item && item.documentation
-    ? typeof item.documentation === 'string'
+      ? typeof item.documentation === 'string'
-    ? item.documentation
+        ? item.documentation
-    : cleanUpDocstringFromSolc(item.documentation.text)
+        : cleanUpDocstringFromSolc(item.documentation.text)
-    : '';
+      : '';
 
   const tagMatches = execAll(
     /^(?:@(\w+|custom:[a-z][a-z-]*) )?((?:(?!^@(?:\w+|custom:[a-z][a-z-]*) )[^])*)/m,

apps/doc-gen/src/app/docgen/utils/normalizeContractPath.ts

@@ -4,7 +4,7 @@ export function normalizeContractPath(contractPath: string): string[]{
   const filename = paths[paths.length - 1]
   let folders = ''
   for (let i = 0; i < paths.length - 1; i++) {
-    if(i !== paths.length -1) {
+    if (i !== paths.length -1) {
       folders += `${paths[i]}/`
     }
   }

apps/doc-viewer/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json",
+}

apps/etherscan/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json",
+}

apps/etherscan/src/app/EtherscanPluginClient.ts

@@ -1,7 +1,7 @@
-import {PluginClient} from '@remixproject/plugin'
+import { PluginClient } from '@remixproject/plugin'
 import { createClient } from '@remixproject/plugin-webview'
-import {verify, EtherScanReturn} from './utils/verify'
+import { verify, EtherScanReturn } from './utils/verify'
-import {getReceiptStatus, getEtherScanApi, getNetworkName, getProxyContractReceiptStatus} from './utils'
+import { getReceiptStatus, getEtherScanApi, getNetworkName, getProxyContractReceiptStatus } from './utils'
 import EventManager from 'events'
 
 export class EtherscanPluginClient extends PluginClient {
@@ -46,7 +46,7 @@ export class EtherscanPluginClient extends PluginClient {
 
   async receiptStatus(receiptGuid: string, apiKey: string, isProxyContract: boolean) {
     try {
-      const {network, networkId} = await getNetworkName(this)
+      const { network, networkId } = await getNetworkName(this)
       if (network === 'vm') {
         throw new Error('Cannot check the receipt status in the selected network')
       }

apps/etherscan/src/app/utils/verify.ts

@@ -146,9 +146,9 @@ export const verify = async (
         title: result,
       })
       const returnValue = {
-          message: result,
+        message: result,
-          succeed: false,
+        succeed: false,
-          isProxyContract
+        isProxyContract
       }
       resetAfter10Seconds(client, setResults)
       return returnValue

apps/learneth/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json",
+}

apps/learneth/src/redux/hooks.ts

@@ -1,5 +1,5 @@
-import {useDispatch, type TypedUseSelectorHook, useSelector} from 'react-redux'
+import { useDispatch, type TypedUseSelectorHook, useSelector } from 'react-redux'
-import {type AppDispatch, type RootState} from './store'
+import { type AppDispatch, type RootState } from './store'
 
 export const useAppDispatch: () => AppDispatch = useDispatch
 export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector

apps/learneth/src/redux/models/loading.ts

@@ -1,11 +1,11 @@
-import {type ModelType} from '../store'
+import { type ModelType } from '../store'
 
 const Model: ModelType = {
   namespace: 'loading',
-  state: {screen: true},
+  state: { screen: true },
   reducers: {
-    save(state, {payload}) {
+    save(state, { payload }) {
-      return {...state, ...payload}
+      return { ...state, ...payload }
     },
   },
   effects: {},

apps/learneth/src/redux/models/remixide.ts

@@ -1,7 +1,7 @@
-import {toast} from 'react-toastify'
+import { toast } from 'react-toastify'
-import {type ModelType} from '../store'
+import { type ModelType } from '../store'
 import remixClient from '../../remix-client'
-import {router} from '../../App'
+import { router } from '../../App'
 
 function getFilePath(file: string): string {
   const name = file.split('/')
@@ -17,12 +17,12 @@ const Model: ModelType = {
     // theme: '',
   },
   reducers: {
-    save(state, {payload}) {
+    save(state, { payload }) {
-      return {...state, ...payload}
+      return { ...state, ...payload }
     },
   },
   effects: {
-    *connect(_, {put}) {
+    *connect(_, { put }) {
       toast.info('connecting to the REMIX IDE')
 
       yield put({
@@ -45,7 +45,7 @@ const Model: ModelType = {
 
       yield router.navigate('/home')
     },
-    *displayFile({payload: step}, {select, put}) {
+    *displayFile({ payload: step }, { select, put }) {
       let content = ''
       let path = ''
       if (step.solidity?.file) {
@@ -73,7 +73,7 @@ const Model: ModelType = {
         },
       })
 
-      const {detail, selectedId} = yield select((state) => state.workshop)
+      const { detail, selectedId } = yield select((state) => state.workshop)
 
       const workshop = detail[selectedId]
       console.log('loading ', step, workshop)
@@ -87,7 +87,7 @@ const Model: ModelType = {
         yield remixClient.call('fileManager', 'switchFile', `${path}`)
         yield put({
           type: 'remixide/save',
-          payload: {errorLoadingFile: false},
+          payload: { errorLoadingFile: false },
         })
         toast.dismiss()
       } catch (error) {
@@ -95,7 +95,7 @@ const Model: ModelType = {
         toast.error('File could not be loaded. Please try again.')
         yield put({
           type: 'remixide/save',
-          payload: {errorLoadingFile: true},
+          payload: { errorLoadingFile: true },
         })
       }
       yield put({
@@ -105,7 +105,7 @@ const Model: ModelType = {
         },
       })
     },
-    *testStep({payload: step}, {select, put}) {
+    *testStep({ payload: step }, { select, put }) {
       yield put({
         type: 'loading/save',
         payload: {
@@ -116,9 +116,9 @@ const Model: ModelType = {
       try {
         yield put({
           type: 'remixide/save',
-          payload: {success: false},
+          payload: { success: false },
         })
-        const {detail, selectedId} = yield select((state) => state.workshop)
+        const { detail, selectedId } = yield select((state) => state.workshop)
 
         const workshop = detail[selectedId]
 
@@ -141,7 +141,7 @@ const Model: ModelType = {
         if (!result) {
           yield put({
             type: 'remixide/save',
-            payload: {errors: ['Compiler failed to test this file']},
+            payload: { errors: ['Compiler failed to test this file']},
           })
         } else {
           const success = result.totalFailing === 0
@@ -149,7 +149,7 @@ const Model: ModelType = {
           if (success) {
             yield put({
               type: 'remixide/save',
-              payload: {errors: [], success: true},
+              payload: { errors: [], success: true },
             })
           } else {
             yield put({
@@ -164,7 +164,7 @@ const Model: ModelType = {
         console.log('TESTING ERROR', err)
         yield put({
           type: 'remixide/save',
-          payload: {errors: [String(err)]},
+          payload: { errors: [String(err)]},
         })
       }
       yield put({
@@ -174,7 +174,7 @@ const Model: ModelType = {
         },
       })
     },
-    *showAnswer({payload: step}, {select, put}) {
+    *showAnswer({ payload: step }, { select, put }) {
       yield put({
         type: 'loading/save',
         payload: {
@@ -189,7 +189,7 @@ const Model: ModelType = {
         const content = step.answer.content
         let path = getFilePath(step.answer.file)
 
-        const {detail, selectedId} = yield select((state) => state.workshop)
+        const { detail, selectedId } = yield select((state) => state.workshop)
 
         const workshop = detail[selectedId]
         path = `.learneth/${workshop.name}/${step.name}/${path}`
@@ -198,7 +198,7 @@ const Model: ModelType = {
       } catch (err) {
         yield put({
           type: 'remixide/save',
-          payload: {errors: [String(err)]},
+          payload: { errors: [String(err)]},
         })
       }
 
@@ -210,7 +210,7 @@ const Model: ModelType = {
         },
       })
     },
-    *testSolidityCompiler(_, {put, select}) {
+    *testSolidityCompiler(_, { put, select }) {
       try {
         yield remixClient.call('solidity', 'getCompilationResult')
       } catch (err) {

apps/learneth/src/redux/models/workshop.ts

@@ -1,10 +1,10 @@
 import axios from 'axios'
-import {toast} from 'react-toastify'
+import { toast } from 'react-toastify'
 import groupBy from 'lodash/groupBy'
 import pick from 'lodash/pick'
-import {type ModelType} from '../store'
+import { type ModelType } from '../store'
 import remixClient from '../../remix-client'
-import {router} from '../../App'
+import { router } from '../../App'
 
 // const apiUrl = 'http://localhost:3001';
 const apiUrl = 'https://static.220.14.12.49.clients.your-server.de:3000'
@@ -17,12 +17,12 @@ const Model: ModelType = {
     selectedId: '',
   },
   reducers: {
-    save(state, {payload}) {
+    save(state, { payload }) {
-      return {...state, ...payload}
+      return { ...state, ...payload }
     },
   },
   effects: {
-    *init(_, {put}) {
+    *init(_, { put }) {
       const cache = localStorage.getItem('workshop.state')
 
       if (cache) {
@@ -41,7 +41,7 @@ const Model: ModelType = {
         })
       }
     },
-    *loadRepo({payload}, {put, select}) {
+    *loadRepo({ payload }, { put, select }) {
       toast.info(`loading ${payload.name}/${payload.branch}`)
 
       yield put({
@@ -51,18 +51,18 @@ const Model: ModelType = {
         },
       })
 
-      const {list, detail} = yield select((state) => state.workshop)
+      const { list, detail } = yield select((state) => state.workshop)
 
       const url = `${apiUrl}/clone/${encodeURIComponent(payload.name)}/${payload.branch}?${Math.random()}`
       console.log('loading ', url)
-      const {data} = yield axios.get(url)
+      const { data } = yield axios.get(url)
       const repoId = `${payload.name}-${payload.branch}`
 
       for (let i = 0; i < data.ids.length; i++) {
         const {
           steps,
           metadata: {
-            data: {steps: metadataSteps},
+            data: { steps: metadataSteps },
           },
         } = data.entities[data.ids[i]]
 
@@ -130,8 +130,8 @@ const Model: ModelType = {
       })
 
       if (payload.id) {
-        const {detail, selectedId} = workshopState
+        const { detail, selectedId } = workshopState
-        const {ids, entities} = detail[selectedId]
+        const { ids, entities } = detail[selectedId]
         for (let i = 0; i < ids.length; i++) {
           const entity = entities[ids[i]]
           if (entity.metadata.data.id === payload.id || i + 1 === payload.id) {
@@ -141,7 +141,7 @@ const Model: ModelType = {
         }
       }
     },
-    *resetAll(_, {put}) {
+    *resetAll(_, { put }) {
       yield put({
         type: 'workshop/save',
         payload: {

apps/learneth/src/redux/store.ts

@@ -1,6 +1,6 @@
-import {configureStore, createSlice, type PayloadAction, type Reducer} from '@reduxjs/toolkit'
+import { configureStore, createSlice, type PayloadAction, type Reducer } from '@reduxjs/toolkit'
 import createSagaMiddleware from 'redux-saga'
-import {call, put, takeEvery, delay, select, all, fork, type ForkEffect} from 'redux-saga/effects'
+import { call, put, takeEvery, delay, select, all, fork, type ForkEffect } from 'redux-saga/effects'
 
 // @ts-expect-error
 const context = require.context('./models', false, /\.ts$/)
@@ -39,7 +39,7 @@ function createReducer(model: ModelType): Reducer {
 }
 
 const rootReducer = models.reduce((prev: any, model: ModelType) => {
-  return {...prev, [model.namespace]: createReducer(model)}
+  return { ...prev, [model.namespace]: createReducer(model) }
 }, {})
 
 function watchEffects(model: ModelType): ForkEffect {

apps/learneth/src/remix-client.ts

@@ -1,7 +1,7 @@
-import {PluginClient} from '@remixproject/plugin'
+import { PluginClient } from '@remixproject/plugin'
-import {createClient} from '@remixproject/plugin-webview'
+import { createClient } from '@remixproject/plugin-webview'
-import {store} from './redux/store'
+import { store } from './redux/store'
-import {router} from './App'
+import { router } from './App'
 
 class RemixClient extends PluginClient {
   constructor() {

apps/remix-ide/src/app/editor/editor.js

@@ -54,7 +54,8 @@ class Editor extends Plugin {
       ts: 'typescript',
       move: 'move',
       circom: 'circom',
-      nr: 'rust'
+      nr: 'rust',
+      toml: 'toml'
     }
 
     this.activated = false

apps/remix-ide/src/app/files/dgitProvider.ts

@@ -571,7 +571,7 @@ class DGitProvider extends Plugin {
         const result = await this.call('isogit', 'clone', cmd)
         this.call('fs', 'openWindow', folder)
         return result
-      } catch (e) {
+      } catch (e){
         this.call('notification', 'alert', {
           id: 'dgitAlert',
           message: 'Unexpected error while cloning the repository: \n' + e.toString(),
@@ -708,9 +708,8 @@ class DGitProvider extends Plugin {
                 this.call('terminal', 'log', {
                   type: 'error',
                   value: `Could not checkout submodule to ${result[0]}`
-                })
+                })} else {
-              } else {
+                this.call('terminal', 'logHtml',`Checked out submodule ${dir} to ${result[0]}`)
-                this.call('terminal', 'logHtml', `Checked out submodule ${dir} to ${result[0]}`)
               }
             }
 

apps/remix-ide/src/remixAppManager.js

@@ -76,7 +76,8 @@ let requiredModules = [ // services + layout views + system views
   'home',
   'doc-viewer',
   'doc-gen',
-  'remix-templates'
+  'remix-templates',
+  'solhint'
 ]
 
 

apps/solhint/.eslintrc

@@ -0,0 +1,18 @@
+{
+  "extends": "../../.eslintrc.json",
+  "overrides": [
+    {
+      "files": [
+        "*.ts",
+        "*.tsx",
+        "*.js",
+        "*.jsx"
+      ],
+      "rules": {
+        "@nrwl/nx/enforce-module-boundaries": [
+          "off"
+        ]
+      }
+    }
+  ]
+}

apps/solhint/src/app/SolhintPluginClient.ts

@@ -1,6 +1,7 @@
 import { PluginClient } from '@remixproject/plugin'
 import { createClient } from '@remixproject/plugin-webview'
 import EventEmitter from 'events'
+// eslint-disable @nrwl/nx/enforce-module-boundaries
 import { processStr } from 'solhint'
 import { applyExtends } from 'solhint/lib/config/config-file'
 import bestPractises from 'solhint/lib/rules/best-practises'
@@ -44,7 +45,7 @@ export class SolHint extends PluginClient {
   }
 
   async lintOnCompilation() {
-    if(!this.triggerLinter) return
+    if (!this.triggerLinter) return
     this.on('solidity', 'compilationFinished', async (fileName, source, languageVersion, data) => {
       const hints = await this.lint(fileName)
       console.log('after compile', { hints })

apps/solhint/src/index.d.ts

@@ -0,0 +1,5 @@
+declare module 'solhint' {
+  export function processStr (inputStr: any, config?: any, fileName?: string)
+  export function processFile (file: any, config: any)
+  export function processPath (path: any, config: any)
+}

apps/solidity-compiler/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json"
+}

apps/vyper/src/app/utils/types.ts

@@ -1,4 +1,4 @@
-import {CompilationResult, ABIDescription} from '@remixproject/plugin-api'
+import { CompilationResult, ABIDescription } from '@remixproject/plugin-api'
 
 export interface VyperCompilationResult {
   status: 'success'
@@ -18,7 +18,6 @@ export interface VyperCompilationError {
   message: string
 }
 
-
 export type VyperCompilationResultType = {
   buildDependencies: any
   compilers: [
@@ -85,68 +84,68 @@ export type VyperCompilationResultType = {
 }
 
 export interface PackageManifest {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  version:     string;
+  version: string;
-  properties:  PackageManifestProperties;
+  properties: PackageManifestProperties;
   definitions: Definitions;
 }
 
 export interface Definitions {
-  packageMeta:                 ByteString;
+  packageMeta: ByteString;
-  contractType:                ByteString;
+  contractType: ByteString;
-  contractInstance:            ContractInstance;
+  contractInstance: ContractInstance;
-  byteString:                  ByteString;
+  byteString: ByteString;
-  bytecodeObject:              BytecodeObject;
+  bytecodeObject: BytecodeObject;
-  linkReference:               LinkReference;
+  linkReference: LinkReference;
-  linkValue:                   LinkValue;
+  linkValue: LinkValue;
-  identifier:                  ByteString;
+  identifier: ByteString;
-  contractInstanceName:        ByteString;
+  contractInstanceName: ByteString;
-  deployment:                  Deployment;
+  deployment: Deployment;
   packageContractInstanceName: ByteString;
-  compilerInformation:         CompilerInformation;
+  compilerInformation: CompilerInformation;
-  address:                     Address;
+  address: Address;
-  transactionHash:             Address;
+  transactionHash: Address;
-  blockHash:                   Address;
+  blockHash: Address;
-  contentURI:                  ByteString;
+  contentURI: ByteString;
 }
 
 export interface Address {
-  title:       string;
+  title: string;
   description: string;
-  allOf:       AllOf[];
+  allOf: AllOf[];
 }
 
 export interface AllOf {
-  ref?:       string;
+  ref?: string;
   minLength?: number;
   maxLength?: number;
 }
 
 export interface ByteStringProperties {
-  contractName?:       ByteString;
+  contractName?: ByteString;
   deploymentBytecode?: Meta;
-  runtimeBytecode?:    Meta;
+  runtimeBytecode?: Meta;
-  abi?:                ByteString;
+  abi?: ByteString;
-  natspec?:            ByteString;
+  natspec?: ByteString;
-  compiler?:           Meta;
+  compiler?: Meta;
-  authors?:            ByteString;
+  authors?: ByteString;
-  license?:            ByteString;
+  license?: ByteString;
-  description?:        ByteString;
+  description?: ByteString;
-  keywords?:           ByteString;
+  keywords?: ByteString;
-  links?:              Links;
+  links?: Links;
 }
 
 export interface ByteString {
-  title:              string;
+  title: string;
-  description?:       string;
+  description?: string;
-  type:               TypeEnum;
+  type: TypeEnum;
-  pattern?:           string;
+  pattern?: string;
-  format?:            string;
+  format?: string;
-  items?:             Items;
+  items?: Items;
-  properties?:        ByteStringProperties;
+  properties?: ByteStringProperties;
   patternProperties?: { [key: string]: Meta };
 }
 
@@ -155,29 +154,29 @@ export interface Meta {
 }
 
 export interface Links {
-  title:                string;
+  title: string;
-  descriptions:         string;
+  descriptions: string;
-  type:                 TypeEnum;
+  type: TypeEnum;
   additionalProperties: AdditionalProperties;
 }
 
 export interface AdditionalProperties {
-  type:   TypeEnum;
+  type: TypeEnum;
   format: string;
 }
 
 export type TypeEnum = "string" | "array" | "object";
 
 export interface Items {
-  ref?:  string;
+  ref?: string;
   type?: TypeEnum;
 }
 
 export interface BytecodeObject {
-  title:      string
+  title: string
-  type:       TypeEnum
+  type: TypeEnum
   offsets: number[]
-  anyOf:      BytecodeObjectAnyOf[]
+  anyOf: BytecodeObjectAnyOf[]
   properties: BytecodeObjectProperties
   bytecode: string
   linkReferences?: { offset?: any; length?: number; name?: string}[]
@@ -188,56 +187,56 @@ export interface BytecodeObjectAnyOf {
 }
 
 export interface BytecodeObjectProperties {
-  bytecode:         Meta;
+  bytecode: Meta;
-  linkReferences:   Link;
+  linkReferences: Link;
   linkDependencies: Link;
 }
 
 export interface Link {
-  type:  TypeEnum;
+  type: TypeEnum;
   items: Meta;
 }
 
 export interface CompilerInformation {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  properties:  CompilerInformationProperties;
+  properties: CompilerInformationProperties;
 }
 
 export interface CompilerInformationProperties {
-  name:     Name;
+  name: Name;
-  version:  Name;
+  version: Name;
   settings: Name;
 }
 
 export interface Name {
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
 }
 
 export interface ContractInstance {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  properties:  ContractInstanceProperties;
+  properties: ContractInstanceProperties;
 }
 
 export interface ContractInstanceProperties {
-  contractType:     ByteString;
+  contractType: ByteString;
-  address:          Meta;
+  address: Meta;
-  transaction:      Meta;
+  transaction: Meta;
-  block:            Meta;
+  block: Meta;
-  runtimeBytecode:  Meta;
+  runtimeBytecode: Meta;
-  compiler:         Meta;
+  compiler: Meta;
   linkDependencies: ByteString;
 }
 
 export interface Deployment {
-  title:             string;
+  title: string;
-  type:              TypeEnum;
+  type: TypeEnum;
   patternProperties: DeploymentPatternProperties;
 }
 
@@ -246,36 +245,36 @@ export interface DeploymentPatternProperties {
 }
 
 export interface LinkReference {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  properties:  LinkReferenceProperties;
+  properties: LinkReferenceProperties;
 }
 
 export interface LinkReferenceProperties {
   offsets: Offsets;
-  length:  Length;
+  length: Length;
-  name:    Meta;
+  name: Meta;
 }
 
 export interface Length {
-  type:    string;
+  type: string;
   minimum: number;
 }
 
 export interface Offsets {
-  type:  TypeEnum;
+  type: TypeEnum;
   items: Length;
 }
 
 export interface LinkValue {
-  title:       string;
+  title: string;
   description: string;
-  type:        TypeEnum;
+  type: TypeEnum;
-  required:    string[];
+  required: string[];
-  properties:  LinkValueProperties;
+  properties: LinkValueProperties;
-  oneOf:       OneOf[];
+  oneOf: OneOf[];
 }
 
 export interface OneOf {
@@ -283,7 +282,7 @@ export interface OneOf {
 }
 
 export interface OneOfProperties {
-  type:  TypeClass;
+  type: TypeClass;
   value: PurpleValue;
 }
 
@@ -292,14 +291,14 @@ export interface TypeClass {
 }
 
 export interface PurpleValue {
-  ref?:   string;
+  ref?: string;
   anyOf?: Meta[];
 }
 
 export interface LinkValueProperties {
   offsets: Offsets;
-  type:    Name;
+  type: Name;
-  value:   FluffyValue;
+  value: FluffyValue;
 }
 
 export interface FluffyValue {
@@ -307,19 +306,19 @@ export interface FluffyValue {
 }
 
 export interface PackageManifestProperties {
-  manifestVersion:   ManifestVersion;
+  manifestVersion: ManifestVersion;
-  packageName:       ByteString;
+  packageName: ByteString;
-  meta:              Meta;
+  meta: Meta;
-  version:           Version;
+  version: Version;
-  sources:           Sources;
+  sources: Sources;
-  contractTypes:     ByteString;
+  contractTypes: ByteString;
-  deployments:       ByteString;
+  deployments: ByteString;
   buildDependencies: BuildDependencies;
 }
 
 export interface BuildDependencies {
-  title:             string;
+  title: string;
-  type:              TypeEnum;
+  type: TypeEnum;
   patternProperties: BuildDependenciesPatternProperties;
 }
 
@@ -328,16 +327,16 @@ export interface BuildDependenciesPatternProperties {
 }
 
 export interface ManifestVersion {
-  type:        TypeEnum;
+  type: TypeEnum;
-  title:       string;
+  title: string;
   description: string;
-  default:     string;
+  default: string;
-  enum:        string[];
+  enum: string[];
 }
 
 export interface Sources {
-  title:             string;
+  title: string;
-  type:              TypeEnum;
+  type: TypeEnum;
   patternProperties: SourcesPatternProperties;
 }
 
@@ -351,13 +350,13 @@ export interface Empty {
 
 export interface AnyOf {
   title?: string;
-  type?:  TypeEnum;
+  type?: TypeEnum;
-  ref?:   string;
+  ref?: string;
 }
 
 export interface Version {
   title: string;
-  type:  TypeEnum;
+  type: TypeEnum;
 }
 
 export type CompileFormat = {
@@ -448,7 +447,6 @@ deployments: {
   [contractName: string]: ContractInstanceObject
 }
 
-
 }
 
 export type CompilerInformationObject = {
@@ -496,45 +494,45 @@ export type ContractInstanceObject = {
 
 export type ASTSrc = {
   jumpCode: string;
-  length:   number;
+  length: number;
 }
 
 export type Child = {
-  astType:        string;
+  astType: string;
-  children:       Child[];
+  children: Child[];
   classification: number;
-  colOffset:      number;
+  colOffset: number;
-  endColOffset:   number;
+  endColOffset: number;
-  endLineno:      number;
+  endLineno: number;
-  lineno:         number;
+  lineno: number;
-  name?:          string;
+  name?: string;
-  src:            ChildSrc;
+  src: ChildSrc;
-  docStr?:        Child;
+  docStr?: Child;
 }
 
 export type ChildSrc = {
   jumpCode: string;
-  length:   number;
+  length: number;
-  start:    number;
+  start: number;
 }
 
 export type AST = {
-  astType:        string;
+  astType: string;
-  children:       Child[];
+  children: Child[];
   classification: number;
-  colOffset:      number;
+  colOffset: number;
-  endColOffset:   number;
+  endColOffset: number;
-  endLineno:      number;
+  endLineno: number;
-  lineno:         number;
+  lineno: number;
-  name:           string;
+  name: string;
-  src:            ASTSrc;
+  src: ASTSrc;
 }
 
 export type ABI = {
-  anonymous?:       boolean;
+  anonymous?: boolean;
-  inputs:           any[];
+  inputs: any[];
-  name?:            string;
+  name?: string;
-  type:             any
+  type: any
   stateMutability?: any;
-  outputs?:         any[];
+  outputs?: any[];
 }

apps/walletconnect/.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "../../.eslintrc.json",
+}

apps/walletconnect/src/services/WalletConnectRemixClient.ts

@@ -1,9 +1,9 @@
-import {PluginClient} from '@remixproject/plugin'
+import { PluginClient } from '@remixproject/plugin'
-import {createClient} from '@remixproject/plugin-webview'
+import { createClient } from '@remixproject/plugin-webview'
 import { createWeb3Modal, defaultConfig } from '@web3modal/ethers5/react'
 import { constants } from '../utils/constants'
 import EventManager from 'events'
-import {PROJECT_ID as projectId, METADATA as metadata} from './constant'
+import { PROJECT_ID as projectId, METADATA as metadata } from './constant'
 import { Chain, RequestArguments } from '../types'
 
 export class WalletConnectRemixClient extends PluginClient {
@@ -50,7 +50,7 @@ export class WalletConnectRemixClient extends PluginClient {
 
   subscribeToEvents() {
     this.web3modal.subscribeProvider(({ address, isConnected, chainId })=>{
-      if(isConnected){
+      if (isConnected){
         if (address !== this.currentAccount) {
           this.currentAccount = address
           this.emit('accountsChanged', [address])
@@ -59,7 +59,7 @@ export class WalletConnectRemixClient extends PluginClient {
           this.currentChain = chainId
           this.emit('chainChanged', chainId)
         }
-      }else{
+      } else {
         this.emit('accountsChanged', [])
         this.currentAccount = ''
         this.emit('chainChanged', 0)
@@ -114,16 +114,16 @@ export class WalletConnectRemixClient extends PluginClient {
         } else {
           try {
             const message = await provider.request(data)
-            return {jsonrpc: '2.0', result: message, id: data.id}
+            return { jsonrpc: '2.0', result: message, id: data.id }
           } catch (e) {
-            return {jsonrpc: '2.0', error: { message: e.message, code: -32603 }, id: data.id}
+            return { jsonrpc: '2.0', error: { message: e.message, code: -32603 }, id: data.id }
           }
         }
       }
     } else {
       const err = `Cannot make ${data.method} request. Remix client is not connected to walletconnect client`
       console.error(err)
-      return {jsonrpc: '2.0', error: { message: err, code: -32603 }, id: data.id}
+      return { jsonrpc: '2.0', error: { message: err, code: -32603 }, id: data.id }
     }
   }
 

libs/ghaction-helper/src/ethers.ts

@@ -2,7 +2,7 @@
 import { ethers } from 'ethers'
 import * as hhEtherMethods from './methods'
 
-for(const method in hhEtherMethods) Object.defineProperty(ethers, method, { value: hhEtherMethods[method]}) 
+for (const method in hhEtherMethods) Object.defineProperty(ethers, method, { value: hhEtherMethods[method] })
 
 export * from 'ethers'
 export { ethers }

libs/ghaction-helper/src/methods.ts

@@ -11,7 +11,7 @@ const providerConfig = {
   blockNumber: global.blockNumber || null
 }
 
-const config  = { defaultTransactionType: '0x0' }
+const config = { defaultTransactionType: '0x0' }
 global.remixProvider = new Provider(providerConfig)
 global.remixProvider.init()
 global.web3Provider = new ethers.providers.Web3Provider(global.remixProvider)
@@ -194,7 +194,7 @@ const getContractAt = async (contractNameOrABI: ethers.ContractInterface, addres
   //@ts-ignore
   const provider = web3Provider
 
-  if(typeof contractNameOrABI === 'string') {
+  if (typeof contractNameOrABI === 'string') {
     const result = await getArtifactsByContractName(contractNameOrABI)
 
     if (result) {

libs/remix-analyzer/test/analysis/staticAnalysisCommon-test.ts

@@ -1,4 +1,4 @@
-import { default as test} from "tape"
+import { default as test } from "tape"
 import * as common from '../../src/solidity-analyzer/modules/staticAnalysisCommon'
 const { localCall, thisLocalCall, libCall, externalDirect, superLocal, assignment, abiNamespaceCallNodes,
   inlineAssembly, unaryOperation, nowAst, blockTimestamp, stateVariableContractNode,
@@ -6,7 +6,6 @@ const { localCall, thisLocalCall, libCall, externalDirect, superLocal, assignmen
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   lowlevelCall, parameterFunction, parameterFunctionCall, inheritance, blockHashAccess, contractDefinition, funcDefForComplexParams } = require('./astBlocks')
 
-
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const compiledContractObj = require('./compilationDetails/CompiledContractObj.json')
 function escapeRegExp (str) {
@@ -89,7 +88,7 @@ test('staticAnalysisCommon.helpers.operator', function (t) {
 
 test('staticAnalysisCommon.helpers.nodeType', function (t) {
   t.plan(3)
-  const node = { nodeType: 'Identifier', name: 'now'}
+  const node = { nodeType: 'Identifier', name: 'now' }
   const node2 = { nodeType: 'FunctionCall', memberName: 'call' }
 
   t.ok(common.helpers.nodeType(node, common.nodeTypes.IDENTIFIER), 'should work for identifier')
@@ -140,7 +139,7 @@ test('staticAnalysisCommon.helpers.expressionTypeDescription', function (t) {
 
 test('staticAnalysisCommon.getType', function (t) {
   t.plan(3)
-  const node =  { "argumentTypes": null,
+  const node = { "argumentTypes": null,
     "id": 3,
     "name": "a",
     "nodeType": "Identifier",
@@ -357,9 +356,9 @@ test('staticAnalysisCommon.isStateVariable', function (t) {
 test('staticAnalysisCommon.isConstantFunction', function (t) {
   t.plan(3)
   t.ok(common.isConstantFunction(functionDefinition), 'should be const func definition')
-  functionDefinition.stateMutability =  'view'
+  functionDefinition.stateMutability = 'view'
   t.ok(common.isConstantFunction(functionDefinition), 'should be const func definition')
-  functionDefinition.stateMutability =  'nonpayable'
+  functionDefinition.stateMutability = 'nonpayable'
   t.notOk(common.isConstantFunction(functionDefinition), 'should not be const func definition')
 })
 

libs/remix-analyzer/test/analysis/staticAnalysisIntegration-test-0.5.0.ts

@@ -53,9 +53,6 @@ test('setup', function (t) {
   })
 });
 
-
-
-
 test('Integration test thisLocal module', function (t: test.Test) {
   t.plan(testFiles.length)
   const module: any = modules.thisLocal

libs/remix-analyzer/test/analysis/staticAnalysisIssues-test-0.4.24.ts

@@ -31,9 +31,9 @@ test('staticAnalysisIssues.functionParameterPassingError', function (t) {
   const statRunner: StatRunner = new StatRunner()
 
   t.doesNotThrow(() => {
-    statRunner.runWithModuleList(res, [{ name: new Module().name, mod: new Module()}])
+    statRunner.runWithModuleList(res, [{ name: new Module().name, mod: new Module() }])
   }, 'Analysis should not throw')
 
-  const reports = statRunner.runWithModuleList(res, [{ name: new Module().name, mod: new Module()}])
+  const reports = statRunner.runWithModuleList(res, [{ name: new Module().name, mod: new Module() }])
   t.ok(!reports.some((mod: AnalysisReport) => mod.report.some((rep: AnalysisReportObj) => rep.warning.includes('INTERNAL ERROR')), 'Should not have internal errors'))
 })

libs/remix-analyzer/test/analysis/staticAnalysisIssues-test-0.5.0.ts

@@ -6,7 +6,7 @@ import { default as StatRunner } from '../../src/solidity-analyzer'
 import solc from 'solc';
 import { CompilationResult, AnalysisReportObj, AnalysisReport } from '../../src/types'
 import { checksEffectsInteraction } from '../../src/solidity-analyzer/modules/'
-const {compilerInput  } = helpers.compiler
+const { compilerInput } = helpers.compiler
 const folder: string = 'solidity-v0.5'
 
 let compiler

libs/remix-astwalker/tests/resources/legacyAST.ts

@@ -1,4 +1,4 @@
-const node = { "legacyAST": { "children": [{ "attributes": { "literals": ["solidity", ">=", "0.5", ".0", "<", "0.6", ".0"] }, "id": 1, "name": "PragmaDirective", "src": "0:31:0" }, { "attributes": { "SourceUnit": 53, "absolutePath": "mortal.sol", "file": "mortal.sol", "scope": 26, "symbolAliases": [null], "unitAlias": "" }, "id": 2, "name": "ImportDirective", "src": "32:20:0" }, { "attributes": { "contractDependencies": [52], "contractKind": "contract", "documentation": null, "fullyImplemented": true, "linearizedBaseContracts": [25, 52], "name": "Greeter", "scope": 26 }, "children": [{ "attributes": { "arguments": null }, "children": [{ "attributes": { "contractScope": null, "name": "Mortal", "referencedDeclaration": 52, "type": "contract Mortal" }, "id": 3, "name": "UserDefinedTypeName", "src": "74:6:0" }], "id": 4, "name": "InheritanceSpecifier", "src": "74:6:0" }, { "attributes": { "constant": false, "name": "greeting", "scope": 25, "stateVariable": true, "storageLocation": "default", "type": "string", "value": null, "visibility": "internal" }, "children": [{ "attributes": { "name": "string", "type": "string" }, "id": 5, "name": "ElementaryTypeName", "src": "141:6:0" }], "id": 6, "name": "VariableDeclaration", "src": "141:15:0" }, { "attributes": { "documentation": null, "implemented": true, "isConstructor": true, "kind": "constructor", "modifiers": [null], "name": "", "scope": 25, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, "children": [{ "children": [{ "attributes": { "constant": false, "name": "_greeting", "scope": 16, "stateVariable": false, "storageLocation": "memory", "type": "string", "value": null, "visibility": "internal" }, "children": [{ "attributes": { "name": "string", "type": "string" }, "id": 7, "name": "ElementaryTypeName", "src": "225:6:0" }], "id": 8, "name": "VariableDeclaration", "src": "225:23:0" }], "id": 9, "name": "ParameterList", "src": "224:25:0" }, { "attributes": { "parameters": [null] }, "children": [], "id": 10, "name": "ParameterList", "src": "257:0:0" }, { "children": [{ "children": [{ "attributes": { "argumentTypes": null, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "operator": "=", "type": "string storage ref" }, "children": [{ "attributes": { "argumentTypes": null, "overloadedDeclarations": [null], "referencedDeclaration": 6, "type": "string storage ref", "value": "greeting" }, "id": 11, "name": "Identifier", "src": "267:8:0" }, { "attributes": { "argumentTypes": null, "overloadedDeclarations": [null], "referencedDeclaration": 8, "type": "string memory", "value": "_greeting" }, "id": 12, "name": "Identifier", "src": "278:9:0" }], "id": 13, "name": "Assignment", "src": "267:20:0" }], "id": 14, "name": "ExpressionStatement", "src": "267:20:0" }], "id": 15, "name": "Block", "src": "257:37:0" }], "id": 16, "name": "FunctionDefinition", "src": "213:81:0" }, { "attributes": { "documentation": null, "implemented": true, "isConstructor": false, "kind": "function", "modifiers": [null], "name": "greet", "scope": 25, "stateMutability": "view", "superFunction": null, "visibility": "public" }, "children": [{ "attributes": { "parameters": [null] }, "children": [], "id": 17, "name": "ParameterList", "src": "338:2:0" }, { "children": [{ "attributes": { "constant": false, "name": "", "scope": 24, "stateVariable": false, "storageLocation": "memory", "type": "string", "value": null, "visibility": "internal" }, "children": [{ "attributes": { "name": "string", "type": "string" }, "id": 18, "name": "ElementaryTypeName", "src": "362:6:0" }], "id": 19, "name": "VariableDeclaration", "src": "362:13:0" }], "id": 20, "name": "ParameterList", "src": "361:15:0" }, { "children": [{ "attributes": { "functionReturnParameters": 20 }, "children": [{ "attributes": { "argumentTypes": null, "overloadedDeclarations": [null], "referencedDeclaration": 6, "type": "string storage ref", "value": "greeting" }, "id": 21, "name": "Identifier", "src": "394:8:0" }], "id": 22, "name": "Return", "src": "387:15:0" }], "id": 23, "name": "Block", "src": "377:32:0" }], "id": 24, "name": "FunctionDefinition", "src": "324:85:0" }], "id": 25, "name": "ContractDefinition", "src": "54:357:0" }], "name": "SourceUnit", "attributes": { "absolutePath": "greeter.sol", "exportedSymbols": { "Greeter": [25] } }, "id": 26, "src": "0:412:0" } }
+const node = { "legacyAST": { "children": [{ "attributes": { "literals": ["solidity", ">=", "0.5", ".0", "<", "0.6", ".0"]}, "id": 1, "name": "PragmaDirective", "src": "0:31:0" }, { "attributes": { "SourceUnit": 53, "absolutePath": "mortal.sol", "file": "mortal.sol", "scope": 26, "symbolAliases": [null], "unitAlias": "" }, "id": 2, "name": "ImportDirective", "src": "32:20:0" }, { "attributes": { "contractDependencies": [52], "contractKind": "contract", "documentation": null, "fullyImplemented": true, "linearizedBaseContracts": [25, 52], "name": "Greeter", "scope": 26 }, "children": [{ "attributes": { "arguments": null }, "children": [{ "attributes": { "contractScope": null, "name": "Mortal", "referencedDeclaration": 52, "type": "contract Mortal" }, "id": 3, "name": "UserDefinedTypeName", "src": "74:6:0" }], "id": 4, "name": "InheritanceSpecifier", "src": "74:6:0" }, { "attributes": { "constant": false, "name": "greeting", "scope": 25, "stateVariable": true, "storageLocation": "default", "type": "string", "value": null, "visibility": "internal" }, "children": [{ "attributes": { "name": "string", "type": "string" }, "id": 5, "name": "ElementaryTypeName", "src": "141:6:0" }], "id": 6, "name": "VariableDeclaration", "src": "141:15:0" }, { "attributes": { "documentation": null, "implemented": true, "isConstructor": true, "kind": "constructor", "modifiers": [null], "name": "", "scope": 25, "stateMutability": "nonpayable", "superFunction": null, "visibility": "public" }, "children": [{ "children": [{ "attributes": { "constant": false, "name": "_greeting", "scope": 16, "stateVariable": false, "storageLocation": "memory", "type": "string", "value": null, "visibility": "internal" }, "children": [{ "attributes": { "name": "string", "type": "string" }, "id": 7, "name": "ElementaryTypeName", "src": "225:6:0" }], "id": 8, "name": "VariableDeclaration", "src": "225:23:0" }], "id": 9, "name": "ParameterList", "src": "224:25:0" }, { "attributes": { "parameters": [null]}, "children": [], "id": 10, "name": "ParameterList", "src": "257:0:0" }, { "children": [{ "children": [{ "attributes": { "argumentTypes": null, "isConstant": false, "isLValue": false, "isPure": false, "lValueRequested": false, "operator": "=", "type": "string storage ref" }, "children": [{ "attributes": { "argumentTypes": null, "overloadedDeclarations": [null], "referencedDeclaration": 6, "type": "string storage ref", "value": "greeting" }, "id": 11, "name": "Identifier", "src": "267:8:0" }, { "attributes": { "argumentTypes": null, "overloadedDeclarations": [null], "referencedDeclaration": 8, "type": "string memory", "value": "_greeting" }, "id": 12, "name": "Identifier", "src": "278:9:0" }], "id": 13, "name": "Assignment", "src": "267:20:0" }], "id": 14, "name": "ExpressionStatement", "src": "267:20:0" }], "id": 15, "name": "Block", "src": "257:37:0" }], "id": 16, "name": "FunctionDefinition", "src": "213:81:0" }, { "attributes": { "documentation": null, "implemented": true, "isConstructor": false, "kind": "function", "modifiers": [null], "name": "greet", "scope": 25, "stateMutability": "view", "superFunction": null, "visibility": "public" }, "children": [{ "attributes": { "parameters": [null]}, "children": [], "id": 17, "name": "ParameterList", "src": "338:2:0" }, { "children": [{ "attributes": { "constant": false, "name": "", "scope": 24, "stateVariable": false, "storageLocation": "memory", "type": "string", "value": null, "visibility": "internal" }, "children": [{ "attributes": { "name": "string", "type": "string" }, "id": 18, "name": "ElementaryTypeName", "src": "362:6:0" }], "id": 19, "name": "VariableDeclaration", "src": "362:13:0" }], "id": 20, "name": "ParameterList", "src": "361:15:0" }, { "children": [{ "attributes": { "functionReturnParameters": 20 }, "children": [{ "attributes": { "argumentTypes": null, "overloadedDeclarations": [null], "referencedDeclaration": 6, "type": "string storage ref", "value": "greeting" }, "id": 21, "name": "Identifier", "src": "394:8:0" }], "id": 22, "name": "Return", "src": "387:15:0" }], "id": 23, "name": "Block", "src": "377:32:0" }], "id": 24, "name": "FunctionDefinition", "src": "324:85:0" }], "id": 25, "name": "ContractDefinition", "src": "54:357:0" }], "name": "SourceUnit", "attributes": { "absolutePath": "greeter.sol", "exportedSymbols": { "Greeter": [25]} }, "id": 26, "src": "0:412:0" } }
 
 node['source'] = `contract test {
     int x;

libs/remix-astwalker/tests/resources/newAST.ts

@@ -291,7 +291,6 @@ const node: Node = {
   }
 }
 
-
 node.source = `contract test {
     int x;
 

libs/remix-core-plugin/src/lib/compiler-artefacts.ts

@@ -127,7 +127,7 @@ export class CompilerArtefacts extends Plugin {
   _getAllContractArtefactsfromOutput (compilerOutput, contractName) {
     const contractArtefacts = {}
     for (const filename in compilerOutput) {
-      if(Object.keys(compilerOutput[filename]).includes(contractName)) contractArtefacts[filename + ':' + contractName] = compilerOutput[filename][contractName]
+      if (Object.keys(compilerOutput[filename]).includes(contractName)) contractArtefacts[filename + ':' + contractName] = compilerOutput[filename][contractName]
     }
     return contractArtefacts
   }
@@ -141,10 +141,10 @@ export class CompilerArtefacts extends Plugin {
    */
   async _populateAllContractArtefactsFromFE (path, contractName, contractArtefacts) {
     const dirList = await this.call('fileManager', 'dirList', path)
-    if(dirList && dirList.length) {
+    if (dirList && dirList.length) {
       for (const dirPath of dirList) {
         // check if directory contains an 'artifacts' folder and a 'build-info' folder inside 'artifacts'
-        if(dirPath === path + '/artifacts' && await this.call('fileManager', 'exists', dirPath + '/build-info')) {
+        if (dirPath === path + '/artifacts' && await this.call('fileManager', 'exists', dirPath + '/build-info')) {
           const buildFileList = await this.call('fileManager', 'fileList', dirPath + '/build-info')
           // process each build-info file to populate the artefacts for contractName
           for (const buildFile of buildFileList) {
@@ -173,12 +173,12 @@ export class CompilerArtefacts extends Plugin {
       const nameArr = fullyQualifiedName.split(':')
       const filename = nameArr[0]
       const contract = nameArr[1]
-      if(Object.keys(contractsDataByFilename).includes(filename) && contractsDataByFilename[filename][contract]) 
+      if (Object.keys(contractsDataByFilename).includes(filename) && contractsDataByFilename[filename][contract])
         return contractsDataByFilename[filename][contract]
       else {
         const allContractsData = {}
         await this._populateAllContractArtefactsFromFE ('contracts', contract, allContractsData)
-        if(allContractsData[fullyQualifiedName]) return { fullyQualifiedName, artefact: allContractsData[fullyQualifiedName]}
+        if (allContractsData[fullyQualifiedName]) return { fullyQualifiedName, artefact: allContractsData[fullyQualifiedName] }
         else throw new Error(`Could not find artifacts for ${fullyQualifiedName}. Compile contract to generate artifacts.`)
       }
     } else {

libs/remix-core-plugin/src/lib/compiler-metadata.ts

@@ -78,19 +78,19 @@ export class CompilerMetadata extends Plugin {
       solcLongVersion,
       input
     })
-    const id =  createHash('md5').update(Buffer.from(json)).digest().toString('hex')
+    const id = createHash('md5').update(Buffer.from(json)).digest().toString('hex')
-    const buildFilename = this.joinPath(path, this.innerPath, 'build-info/' +  id + '.json')
+    const buildFilename = this.joinPath(path, this.innerPath, 'build-info/' + id + '.json')
     // If there are no file in buildInfoNames,it means compilation is running first time after loading Remix
     if (!this.buildInfoNames[filePath]) {
       // Check the existing build-info and delete all the previous build files for compiled file
       await this.removeStoredBuildInfo(input, path, filePath)
       this.buildInfoNames[filePath] = buildFilename
-      const buildData = {id, _format: format, solcVersion, solcLongVersion, input, output}
+      const buildData = { id, _format: format, solcVersion, solcLongVersion, input, output }
       await this.call('fileManager', 'writeFile', buildFilename, JSON.stringify(buildData, null, '\t'))
     } else if (this.buildInfoNames[filePath] && this.buildInfoNames[filePath] !== buildFilename) {
       await this.call('fileManager', 'remove', this.buildInfoNames[filePath])
       this.buildInfoNames[filePath] = buildFilename
-      const buildData = {id, _format: format, solcVersion, solcLongVersion, input, output}
+      const buildData = { id, _format: format, solcVersion, solcLongVersion, input, output }
       await this.call('fileManager', 'writeFile', buildFilename, JSON.stringify(buildData, null, '\t'))
     }
   }

libs/remix-core-plugin/src/lib/constants/uups.ts

@@ -140,7 +140,6 @@ export const UUPSupgradeAbi = {
   "type": "function"
 }
 
-
 export const UUPSupgradeToAndCallAbi = {
   "inputs": [
     {

libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts

@@ -109,7 +109,7 @@ export class OpenZeppelinProxy extends Plugin {
       data.dataHex = UUPSBytecode + constructorData.replace('0x', '')
       data.funAbi = UUPSfunAbi
       this.call('terminal', 'logHtml', `Deploying ERC1967 < 5.0.0 as proxy...`)
-    }else{
+    } else {
       this.call('terminal', 'logHtml', `Deploying ERC1967 >= 5.0.0 as proxy...`)
     }
     // re-use implementation contract's ABI for UI display in udapp and change name to proxy name.

libs/remix-debug/src/debugger/debugger.ts

@@ -97,7 +97,7 @@ export class Debugger {
             const instructionIndexes = lineGasCostObj.indexes.map((index) => { // translate from vmtrace index to instruction index
               return this.debugger.codeManager.getInstructionIndex(address, index)
             })
-            this.vmDebuggerLogic.event.trigger('lineGasCostChanged', [instructionIndexes, lineColumnPos.start.line ])
+            this.vmDebuggerLogic.event.trigger('lineGasCostChanged', [instructionIndexes, lineColumnPos.start.line])
             this.currentFile = rawLocation.file
             this.currentLine = lineColumnPos.start.line
           }

libs/remix-debug/src/init.ts

@@ -1,9 +1,9 @@
 'use strict'
 import Web3, { Web3PluginBase } from 'web3'
-import {toNumber} from 'web3-utils'
+import { toNumber } from 'web3-utils'
 
 export function extendWeb3 (web3) {
-  if(!web3.debug){
+  if (!web3.debug){
     web3.registerPlugin(new Web3DebugPlugin())
   }
 }

libs/remix-debug/src/solidity-decoder/internalCallTree.ts

@@ -391,7 +391,7 @@ function getGeneratedSources (tree, scopeId, contractObj) {
 
 async function registerFunctionParameters (tree, functionDefinition, step, scopeId, contractObj, sourceLocation, address) {
   tree.functionCallStack.push(step)
-  const functionDefinitionAndInputs = { functionDefinition, inputs: [] }
+  const functionDefinitionAndInputs = { functionDefinition, inputs: []}
   // means: the previous location was a function definition && JUMPDEST
   // => we are at the beginning of the function and input/output are setup
   try {

libs/remix-debug/src/trace/traceAnalyser.ts

@@ -1,5 +1,5 @@
 'use strict'
-import {  util } from '@remix-project/remix-lib'
+import { util } from '@remix-project/remix-lib'
 import { bytesToHex } from '@ethereumjs/util'
 const { toHexPaddedString } = util
 import * as traceHelper from './traceHelper'

libs/remix-debug/test.ts

@@ -37,7 +37,7 @@ const compilationData = JSON.parse(solc.compileStandardWrapper(JSON.stringify(in
 console.dir(Object.keys(compilationData))
 const compilation = {}
 compilation['data'] = compilationData
-compilation['source'] = {sources: inputJson.sources}
+compilation['source'] = { sources: inputJson.sources }
 console.dir(compilation)
 console.dir(compilation['data'].errors)
 

libs/remix-debug/test/codeManager.ts

@@ -5,7 +5,7 @@ import { CodeManager } from '../src/code/codeManager'
 const web3Test = require('./resources/testWeb3.ts')
 
 tape('CodeManager', function (t) {
-  const traceManager = new TraceManager({web3: web3Test})
+  const traceManager = new TraceManager({ web3: web3Test })
   const codeManager = new CodeManager(traceManager)
   const contractCode = web3Test.eth.getCode('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5')
   codeManager.codeResolver.cacheExecutingCode('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5', contractCode) // so a call to web3 is not necessary

libs/remix-debug/test/debugger.ts

@@ -156,7 +156,7 @@ contract Ballot {
   output = JSON.parse(output)
   const param = '0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000148656c6c6f20576f726c64210000000000000000000000000000000000000000'
   const web3 = await vmCall.getWeb3()
-  vmCall.sendTx(web3, {nonce: 0, privateKey: privateKey}, undefined, 0, output.contracts['test.sol']['Ballot'].evm.bytecode.object + param, (error, hash) => {
+  vmCall.sendTx(web3, { nonce: 0, privateKey: privateKey }, undefined, 0, output.contracts['test.sol']['Ballot'].evm.bytecode.object + param, (error, hash) => {
     console.log(error, hash)
     if (error) {
       throw error
@@ -279,10 +279,10 @@ function testDebugging (debugManager) {
 
   tape('breakPointManager', (t) => {
     t.plan(2)
-    const {traceManager, callTree, solidityProxy} = debugManager
+    const { traceManager, callTree, solidityProxy } = debugManager
-    const breakPointManager = new BreakpointManager({traceManager, callTree, solidityProxy})
+    const breakPointManager = new BreakpointManager({ traceManager, callTree, solidityProxy })
 
-    breakPointManager.add({fileName: 'test.sol', row: 39})
+    breakPointManager.add({ fileName: 'test.sol', row: 39 })
 
     breakPointManager.event.register('breakpointHit', function (sourceLocation, step) {
       t.equal(JSON.stringify(sourceLocation), JSON.stringify({ start: 1146, length: 6, file: 0, jump: '-' }))

libs/remix-debug/test/decoder/contracts/calldata.ts

@@ -11,4 +11,4 @@ module.exports = {
       uint p = 45;
     }
   }
-`}
+` }

libs/remix-debug/test/decoder/contracts/intLocal.ts

@@ -39,4 +39,4 @@ contract intLocal {
       uint8 ui81 = asd;
     }
   }
-`}
+` }

libs/remix-debug/test/decoder/contracts/miscLocal.ts

@@ -36,4 +36,4 @@ contract miscLocal {
            string memory smallstring = "test_test_test";
         }
   }
-`}
+` }

libs/remix-debug/test/decoder/contracts/structArrayLocal.ts

@@ -81,4 +81,4 @@ contract structArrayLocal {
         arrayStruct.c = enumdef.three;
     }
 }
-`}
+` }

libs/remix-debug/test/decoder/localsTests/calldata.ts

@@ -54,7 +54,7 @@ module.exports = async function (st, privateKey, contractBytecode, compilationRe
         callTree.event.register('callTreeReady', (scopes, scopeStarts) => {
           helper.decodeLocals(st, 140, traceManager, callTree, function (locals) {
             try {
-              const expected = {"p":{"value":"45","type":"uint256"},"foo":{"length":"1","value":[{"value":"3","type":"uint8"}],"type":"uint8[1]"},"boo":{"length":"1","value":[{"length":"2","value":[{"value":"R","type":"string"},{"value":"T","type":"string"}],"type":"string[2]"}],"type":"string[2][1]"}}
+              const expected = { "p":{ "value":"45","type":"uint256" },"foo":{ "length":"1","value":[{ "value":"3","type":"uint8" }],"type":"uint8[1]" },"boo":{ "length":"1","value":[{ "length":"2","value":[{ "value":"R","type":"string" },{ "value":"T","type":"string" }],"type":"string[2]" }],"type":"string[2][1]" } }
               st.deepEqual(locals, expected)
             } catch (e) {
               st.fail(e.message)
@@ -63,7 +63,6 @@ module.exports = async function (st, privateKey, contractBytecode, compilationRe
           })
         })
 
-
         traceManager.resolveTrace(tx).then(() => {
           debuggerEvent.trigger('newTraceLoaded', [traceManager.trace])
         }).catch((error) => {

libs/remix-debug/test/decoder/stateTests/mapping.ts

@@ -10,7 +10,7 @@ import { InternalCallTree } from '../../../src/solidity-decoder/internalCallTree
 import * as vmCall from '../../vmCall'
 import { StorageResolver } from '../../../src/storage/storageResolver'
 import { StorageViewer } from '../../../src/storage/storageViewer'
-import {  Address, bytesToHex } from '@ethereumjs/util'
+import { Address, bytesToHex } from '@ethereumjs/util'
 
 module.exports = async function testMappingStorage (st, cb) {
   const mappingStorage = require('../contracts/mappingStorage')
@@ -23,7 +23,7 @@ module.exports = async function testMappingStorage (st, cb) {
   }
   const compilationResults = new CompilerAbstract('json', output, sources)
   const web3 = await (vmCall as any).getWeb3();
-  (vmCall as any).sendTx(web3, {nonce: 0, privateKey: privateKey}, undefined, 0, output.contracts['test.sol']['SimpleMappingState'].evm.bytecode.object, function (error, hash) {
+  (vmCall as any).sendTx(web3, { nonce: 0, privateKey: privateKey }, undefined, 0, output.contracts['test.sol']['SimpleMappingState'].evm.bytecode.object, function (error, hash) {
     if (error) {
       console.log(error)
       st.end(error)
@@ -44,7 +44,7 @@ module.exports = async function testMappingStorage (st, cb) {
 }
 
 function testMapping (st, privateKey, contractAddress, output, compilationResults, web3, cb) {
-  (vmCall as any).sendTx(web3, {nonce: 1, privateKey: privateKey}, contractAddress, 0, '2fd0a83a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001074686973206973206120737472696e6700000000000000000000000000000000',
+  (vmCall as any).sendTx(web3, { nonce: 1, privateKey: privateKey }, contractAddress, 0, '2fd0a83a00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001074686973206973206120737472696e6700000000000000000000000000000000',
     function (error, hash) {
       if (error) {
         console.log(error)
@@ -74,7 +74,7 @@ function testMapping (st, privateKey, contractAddress, output, compilationResult
                 stepIndex: 268,
                 tx: tx,
                 address: contractAddress
-              }, new StorageResolver({web3}), traceManager)
+              }, new StorageResolver({ web3 }), traceManager)
               const stateVars = stateDecoder.extractStateVariables('SimpleMappingState', output.sources)
               stateDecoder.decodeState(stateVars, storageViewer).then((result) => {
                 st.equal(result['_num'].value, '1')

libs/remix-debug/test/helpers/compilerHelper.ts

@@ -13,8 +13,8 @@ export function compilerInput (contracts) {
       },
       outputSelection: {
         '*': {
-          '': [ 'ast' ],
+          '': ['ast'],
-          '*': [ 'abi', 'metadata', 'evm.legacyAssembly', 'evm.bytecode', 'evm.deployedBytecode', 'evm.methodIdentifiers', 'evm.gasEstimates' ]
+          '*': ['abi', 'metadata', 'evm.legacyAssembly', 'evm.bytecode', 'evm.deployedBytecode', 'evm.methodIdentifiers', 'evm.gasEstimates']
         }
       }
     }

libs/remix-debug/test/resources/ast.ts

@@ -1,14 +1,14 @@
 const node = {}
 
-node['ast'] = {"legacyAST":{"children":[{"attributes":{"fullyImplemented":true,"isLibrary":false,"linearizedBaseContracts":[5640396],"name":"test"},"children":[{"attributes":{"name":"x","type":"int256"},"children":[{"attributes":{"name":"int"},"id":5657860,"name":"ElementaryTypeName","src":"21:3:11"}],"id":5658100,"name":"VariableDeclaration","src":"21:5:11"},{"attributes":{"name":"y","type":"int256"},"children":[{"attributes":{"name":"int"},"id":5658180,"name":"ElementaryTypeName","src":"38:3:11"}],"id":5658268,"name":"VariableDeclaration","src":"38:5:11"},{"attributes":{"constant":false,"name":"set","public":true},"children":[{"children":[{"attributes":{"name":"_x","type":"int256"},"children":[{"attributes":{"name":"int"},"id":5658404,"name":"ElementaryTypeName","src":"68:3:11"}],"id":5658492,"name":"VariableDeclaration","src":"68:6:11"}],"id":5658572,"name":"ParameterList","src":"67:8:11"},{"children":[{"attributes":{"name":"_r","type":"int256"},"children":[{"attributes":{"name":"int"},"id":5658628,"name":"ElementaryTypeName","src":"85:3:11"}],"id":5658716,"name":"VariableDeclaration","src":"85:6:11"}],"id":5658796,"name":"ParameterList","src":"84:8:11"},{"children":[{"children":[{"attributes":{"operator":"=","type":"int256"},"children":[{"attributes":{"type":"int256","value":"x"},"id":5658900,"name":"Identifier","src":"108:1:11"},{"attributes":{"type":"int256","value":"_x"},"id":5658980,"name":"Identifier","src":"112:2:11"}],"id":5657492,"name":"Assignment","src":"108:6:11"}],"id":5659028,"name":"ExpressionStatement","src":"108:6:11"},{"children":[{"attributes":{"operator":"=","type":"int256"},"children":[{"attributes":{"type":"int256","value":"y"},"id":5659116,"name":"Identifier","src":"125:1:11"},{"attributes":{"string":null,"type":"int_const 10","value":"10"},"id":5659196,"name":"Literal","src":"129:2:11"}],"id":5659252,"name":"Assignment","src":"125:6:11"}],"id":5659316,"name":"ExpressionStatement","src":"125:6:11"},{"children":[{"attributes":{"operator":"=","type":"int256"},"children":[{"attributes":{"type":"int256","value":"_r"},"id":5659428,"name":"Identifier","src":"141:2:11"},{"attributes":{"type":"int256","value":"x"},"id":5639308,"name":"Identifier","src":"146:1:11"}],"id":5639356,"name":"Assignment","src":"141:6:11"}],"id":5639420,"name":"ExpressionStatement","src":"141:6:11"}],"id":5639516,"name":"Block","src":"97:57:11"}],"id":5639612,"name":"FunctionDefinition","src":"55:99:11"},{"attributes":{"constant":false,"name":"get","public":true},"children":[{"children":[],"id":5639764,"name":"ParameterList","src":"179:2:11"},{"children":[{"attributes":{"name":"x","type":"uint256"},"children":[{"attributes":{"name":"uint"},"id":5639820,"name":"ElementaryTypeName","src":"191:4:11"}],"id":5639908,"name":"VariableDeclaration","src":"191:6:11"},{"attributes":{"name":"y","type":"uint256"},"children":[{"attributes":{"name":"uint"},"id":5639988,"name":"ElementaryTypeName","src":"199:4:11"}],"id":5640076,"name":"VariableDeclaration","src":"199:6:11"}],"id":5640156,"name":"ParameterList","src":"190:16:11"},{"children":[],"id":5640212,"name":"Block","src":"212:17:11"}],"id":5640276,"name":"FunctionDefinition","src":"167:62:11"}],"id":5640396,"name":"ContractDefinition","src":"0:231:11"}],"name":"SourceUnit"}}
+node['ast'] = { "legacyAST":{ "children":[{ "attributes":{ "fullyImplemented":true,"isLibrary":false,"linearizedBaseContracts":[5640396],"name":"test" },"children":[{ "attributes":{ "name":"x","type":"int256" },"children":[{ "attributes":{ "name":"int" },"id":5657860,"name":"ElementaryTypeName","src":"21:3:11" }],"id":5658100,"name":"VariableDeclaration","src":"21:5:11" },{ "attributes":{ "name":"y","type":"int256" },"children":[{ "attributes":{ "name":"int" },"id":5658180,"name":"ElementaryTypeName","src":"38:3:11" }],"id":5658268,"name":"VariableDeclaration","src":"38:5:11" },{ "attributes":{ "constant":false,"name":"set","public":true },"children":[{ "children":[{ "attributes":{ "name":"_x","type":"int256" },"children":[{ "attributes":{ "name":"int" },"id":5658404,"name":"ElementaryTypeName","src":"68:3:11" }],"id":5658492,"name":"VariableDeclaration","src":"68:6:11" }],"id":5658572,"name":"ParameterList","src":"67:8:11" },{ "children":[{ "attributes":{ "name":"_r","type":"int256" },"children":[{ "attributes":{ "name":"int" },"id":5658628,"name":"ElementaryTypeName","src":"85:3:11" }],"id":5658716,"name":"VariableDeclaration","src":"85:6:11" }],"id":5658796,"name":"ParameterList","src":"84:8:11" },{ "children":[{ "children":[{ "attributes":{ "operator":"=","type":"int256" },"children":[{ "attributes":{ "type":"int256","value":"x" },"id":5658900,"name":"Identifier","src":"108:1:11" },{ "attributes":{ "type":"int256","value":"_x" },"id":5658980,"name":"Identifier","src":"112:2:11" }],"id":5657492,"name":"Assignment","src":"108:6:11" }],"id":5659028,"name":"ExpressionStatement","src":"108:6:11" },{ "children":[{ "attributes":{ "operator":"=","type":"int256" },"children":[{ "attributes":{ "type":"int256","value":"y" },"id":5659116,"name":"Identifier","src":"125:1:11" },{ "attributes":{ "string":null,"type":"int_const 10","value":"10" },"id":5659196,"name":"Literal","src":"129:2:11" }],"id":5659252,"name":"Assignment","src":"125:6:11" }],"id":5659316,"name":"ExpressionStatement","src":"125:6:11" },{ "children":[{ "attributes":{ "operator":"=","type":"int256" },"children":[{ "attributes":{ "type":"int256","value":"_r" },"id":5659428,"name":"Identifier","src":"141:2:11" },{ "attributes":{ "type":"int256","value":"x" },"id":5639308,"name":"Identifier","src":"146:1:11" }],"id":5639356,"name":"Assignment","src":"141:6:11" }],"id":5639420,"name":"ExpressionStatement","src":"141:6:11" }],"id":5639516,"name":"Block","src":"97:57:11" }],"id":5639612,"name":"FunctionDefinition","src":"55:99:11" },{ "attributes":{ "constant":false,"name":"get","public":true },"children":[{ "children":[],"id":5639764,"name":"ParameterList","src":"179:2:11" },{ "children":[{ "attributes":{ "name":"x","type":"uint256" },"children":[{ "attributes":{ "name":"uint" },"id":5639820,"name":"ElementaryTypeName","src":"191:4:11" }],"id":5639908,"name":"VariableDeclaration","src":"191:6:11" },{ "attributes":{ "name":"y","type":"uint256" },"children":[{ "attributes":{ "name":"uint" },"id":5639988,"name":"ElementaryTypeName","src":"199:4:11" }],"id":5640076,"name":"VariableDeclaration","src":"199:6:11" }],"id":5640156,"name":"ParameterList","src":"190:16:11" },{ "children":[],"id":5640212,"name":"Block","src":"212:17:11" }],"id":5640276,"name":"FunctionDefinition","src":"167:62:11" }],"id":5640396,"name":"ContractDefinition","src":"0:231:11" }],"name":"SourceUnit" } }
 
 node['ast'].ast = {
   absolutePath: 'sample.sol',
-  exportedSymbols: { test: [ 33 ] },
+  exportedSymbols: { test: [33]},
   id: 34,
   nodeType: 'SourceUnit',
   nodes:
-    [ { 
+    [{
       abstract: false,
       baseContracts: [],
       contractDependencies: [],
@@ -16,11 +16,11 @@ node['ast'].ast = {
       documentation: null,
       fullyImplemented: true,
       id: 33,
-      linearizedBaseContracts: [ 33 ],
+      linearizedBaseContracts: [33],
       name: 'test',
       nodeType: 'ContractDefinition',
       nodes:
-        [ { constant: false,
+        [{ constant: false,
           id: 2,
           name: 'x',
           nodeType: 'VariableDeclaration',
@@ -54,14 +54,14 @@ node['ast'].ast = {
                   name: 'int',
                   nodeType: 'ElementaryTypeName',
                   src: '31:3:0',
-                  typeDescriptions: [Object] },
+                  typeDescriptions: [Object]},
           value: null,
           visibility: 'internal' },
         { body: { id: 23,
           nodeType: 'Block',
           src: '96:55:0',
           statements:
-            [ { expression:
+            [{ expression:
                 { argumentTypes: null,
                   id: 13,
                   isConstant: false,
@@ -69,7 +69,7 @@ node['ast'].ast = {
                   isPure: false,
                   lValueRequested: false,
                   leftHandSide:
-                    {   argumentTypes: null,
+                    { argumentTypes: null,
                       id: 11,
                       name: 'x',
                       nodeType: 'Identifier',
@@ -106,7 +106,7 @@ node['ast'].ast = {
                   operator: '=',
                   rightHandSide: [Object],
                   src: '122:6:0',
-                  typeDescriptions: [Object] },
+                  typeDescriptions: [Object]},
             id: 18,
             nodeType: 'ExpressionStatement',
             src: '122:6:0' },
@@ -122,10 +122,10 @@ node['ast'].ast = {
                   operator: '=',
                   rightHandSide: [Object],
                   src: '138:6:0',
-                  typeDescriptions: [Object] },
+                  typeDescriptions: [Object]},
             id: 22,
             nodeType: 'ExpressionStatement',
-            src: '138:6:0' } ]
+            src: '138:6:0' }]
         },
         documentation: null,
         functionSelector: 'e5c19b2d',
@@ -149,7 +149,7 @@ node['ast'].ast = {
         stateMutability: 'nonpayable',
         virtual: false,
         visibility: 'public' },
-        { body: { id: 31, nodeType: 'Block', src: '214:17:0', statements: [] },
+        { body: { id: 31, nodeType: 'Block', src: '214:17:0', statements: []},
           documentation: null,
           functionSelector: '6d4ce63c',
           id: 32,
@@ -173,14 +173,13 @@ node['ast'].ast = {
           src: '163:68:0',
           stateMutability: 'nonpayable',
           virtual: false,
-          visibility: 'public' } ],
+          visibility: 'public' }],
       scope: 34,
       src: '0:233:0'
-    } ],
+    }],
   src: '0:233:0'
 }
 
-
 node['source'] = `contract test { 
     int x; 
     

libs/remix-debug/test/resources/testWeb3.ts

@@ -48,7 +48,7 @@ web3Override.eth.setProvider = function (provider) {}
 
 web3Override.eth.providers = { 'HttpProvider': function (url) {} }
 
-web3Override.eth.currentProvider = {'host': 'test provider'}
+web3Override.eth.currentProvider = { 'host': 'test provider' }
 
 if (typeof (module) !== 'undefined' && typeof (module.exports) !== 'undefined') {
   module.exports = web3Override

libs/remix-debug/test/sourceLocationTracker.ts

@@ -11,7 +11,7 @@ import { compilerInput } from './helpers/compilerHelper'
 tape('SourceLocationTracker', function (t) {
   t.test('SourceLocationTracker.getSourceLocationFromVMTraceIndex - simple contract', async function (st) {
 
-    const traceManager = new TraceManager({web3: web3Test})
+    const traceManager = new TraceManager({ web3: web3Test })
     const codeManager = new CodeManager(traceManager)
 
     let output = compiler.compile(compilerInput(contracts))
@@ -23,7 +23,7 @@ tape('SourceLocationTracker', function (t) {
 
     traceManager.resolveTrace(tx).then(async () => {
 
-      const sourceLocationTracker = new SourceLocationTracker(codeManager, {debugWithGeneratedSources: false})
+      const sourceLocationTracker = new SourceLocationTracker(codeManager, { debugWithGeneratedSources: false })
 
       try {
         const map = await sourceLocationTracker.getSourceLocationFromVMTraceIndex('0x0d3a18d64dfe4f927832ab58d6451cecc4e517c5', 0, output.contracts)
@@ -42,7 +42,7 @@ tape('SourceLocationTracker', function (t) {
 
   t.test('SourceLocationTracker.getSourceLocationFromVMTraceIndex - ABIEncoder V2 contract', async function (st) {
 
-    const traceManager = new TraceManager({web3: web3Test})
+    const traceManager = new TraceManager({ web3: web3Test })
     const codeManager = new CodeManager(traceManager)
 
     let output = compiler.compile(compilerInput(ABIEncoderV2))
@@ -54,8 +54,6 @@ tape('SourceLocationTracker', function (t) {
 
     traceManager.resolveTrace(tx).then(async () => {
 
-      
-      
       try {
         // with debugWithGeneratedSources: false
         const sourceLocationTracker = new SourceLocationTracker(codeManager, { debugWithGeneratedSources: false })

libs/remix-debug/test/traceManager.ts

@@ -7,7 +7,7 @@ tape('TraceManager', function (t) {
   let traceManager
 
   t.test('TraceManager.init', function (st) {
-    traceManager = new TraceManager({web3: web3Test})
+    traceManager = new TraceManager({ web3: web3Test })
     st.end()
   })
 

libs/remix-debug/test/vmCall.ts

@@ -4,7 +4,6 @@ import { Address } from '@ethereumjs/util'
 import { Web3 } from 'web3';
 const { Provider } = require('@remix-project/remix-simulator')
 
-
 async function getWeb3 () {
   const remixSimulatorProvider = new Provider({ fork: 'berlin' })
   await remixSimulatorProvider.init()

libs/remix-simulator/src/VmProxy.ts

@@ -1,11 +1,11 @@
-import {  util } from '@remix-project/remix-lib'
+import { util } from '@remix-project/remix-lib'
 const { toHexPaddedString, formatMemory } = util
 import { helpers } from '@remix-project/remix-lib'
-const  { normalizeHexAddress } = helpers.ui
+const { normalizeHexAddress } = helpers.ui
 import { ConsoleLogs, hash } from '@remix-project/remix-lib'
-import { toChecksumAddress, bytesToHex, Address, toBytes, bigIntToHex} from '@ethereumjs/util'
+import { toChecksumAddress, bytesToHex, Address, toBytes, bigIntToHex } from '@ethereumjs/util'
-import utils, {toBigInt} from 'web3-utils'
+import utils, { toBigInt } from 'web3-utils'
-import {isBigInt} from 'web3-validator'
+import { isBigInt } from 'web3-validator'
 import { ethers } from 'ethers'
 import { VMContext } from './vm-context'
 import type { EVMStateManagerInterface } from '@ethereumjs/common'

libs/remix-simulator/src/methods/blocks.ts

@@ -59,7 +59,7 @@ export class Blocks {
           nonce: bigIntToHex(tx.nonce),
           transactionIndex: this.TX_INDEX,
           value: bigIntToHex(tx.value),
-          to: receipt.to ?  receipt.to : null
+          to: receipt.to ? receipt.to : null
         }
       }
     })
@@ -113,7 +113,7 @@ export class Blocks {
           nonce: bigIntToHex(tx.nonce),
           transactionIndex: this.TX_INDEX,
           value: bigIntToHex(tx.value),
-          to: receipt.to ?  receipt.to : null
+          to: receipt.to ? receipt.to : null
         }
       }
     })

libs/remix-simulator/src/methods/transactions.ts

@@ -1,5 +1,5 @@
 import { toHex, toNumber, toBigInt } from 'web3-utils'
-import { toChecksumAddress, Address, bigIntToHex, bytesToHex} from '@ethereumjs/util'
+import { toChecksumAddress, Address, bigIntToHex, bytesToHex } from '@ethereumjs/util'
 import { processTx } from './txProcess'
 import { execution } from '@remix-project/remix-lib'
 import { ethers } from 'ethers'

libs/remix-simulator/src/provider.ts

@@ -26,7 +26,7 @@ export interface JSONRPCResponsePayload {
   jsonrpc: string;
 }
 
-export type JSONRPCResponseCallback = (err: Error, result?: JSONRPCResponsePayload) =>  void
+export type JSONRPCResponseCallback = (err: Error, result?: JSONRPCResponsePayload) => void
 
 export type State = Record<string, string>
 
@@ -83,7 +83,7 @@ export class Provider {
     }
   }
 
-  _send(payload: JSONRPCRequestPayload, callback: (err: Error, result?: JSONRPCResponsePayload) =>  void) {
+  _send(payload: JSONRPCRequestPayload, callback: (err: Error, result?: JSONRPCResponsePayload) => void) {
     // log.info('payload method is ', payload.method) // commented because, this floods the IDE console
     if (!this.initialized) {
       this.pendingRequests.push({ payload, callback })
@@ -109,13 +109,13 @@ export class Provider {
     callback(new Error('unknown method ' + payload.method))
   }
 
-  sendAsync (payload: JSONRPCRequestPayload, callback: (err: Error, result?: JSONRPCResponsePayload) =>  void) {
+  sendAsync (payload: JSONRPCRequestPayload, callback: (err: Error, result?: JSONRPCResponsePayload) => void) {
     return new Promise((resolve,reject)=>{
       const cb = (err, result) => {
-        if(typeof callback==='function'){
+        if (typeof callback==='function'){
           callback(err,result)
         }
-        if(err){
+        if (err){
           return reject(err)
         }
         return resolve(result)
@@ -146,7 +146,7 @@ export class Provider {
 }
 
 export function extend (web3) {
-  if(!web3.remix){
+  if (!web3.remix){
     web3.registerPlugin(new Web3TestPlugin())
   }
 }

libs/remix-simulator/src/vm-context.ts

@@ -59,7 +59,7 @@ class StateManagerCommonStorageDump extends DefaultStateManager {
   }
 
   shallowCopy(): StateManagerCommonStorageDump {
-    const copyState =  new StateManagerCommonStorageDump({
+    const copyState = new StateManagerCommonStorageDump({
       trie: this._trie.shallowCopy(false),
     })
     copyState.keyHashes = this.keyHashes
@@ -250,7 +250,6 @@ class CustomEthersStateManager extends StateManagerCommonStorageDump {
   }
 }
 
-
 export type CurrentVm = {
   vm: VM,
   web3vm: VmProxy,

libs/remix-simulator/test/blocks.ts

@@ -93,7 +93,7 @@ describe('blocks', () => {
     it('should get block given its hash', async () => {
       const correctBlock = await web3.eth.getBlock(0)
       const numberTransactions = await (new Promise((resolve, reject) => {
-        web3['_requestManager'].send({method: 'eth_getUncleCountByBlockHash', params: [correctBlock.hash]})
+        web3['_requestManager'].send({ method: 'eth_getUncleCountByBlockHash', params: [correctBlock.hash]})
           .then(numberTransactions => resolve(numberTransactions))
           .catch(err => reject(err))
       }))
@@ -105,7 +105,7 @@ describe('blocks', () => {
     it('should get block given its number', async () => {
       const correctBlock = await web3.eth.getBlock(0)
       const numberTransactions = await (new Promise((resolve, reject) => {
-        web3['_requestManager'].send({method: 'eth_getUncleCountByBlockHash', params: [0]})
+        web3['_requestManager'].send({ method: 'eth_getUncleCountByBlockHash', params: [0]})
           .then(numberTransactions => resolve(numberTransactions))
           .catch(err => reject(err))
       }))
@@ -201,7 +201,7 @@ describe('blocks', () => {
       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' })
+      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
 
@@ -307,7 +307,7 @@ describe('blocks', () => {
       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' })
+      const contractInstance: any = await contract.deploy({ data: code, arguments: [100]}).send({ from: accounts[0], gas: '400000' })
       contractInstance.currentProvider = web3.eth.currentProvider
 
       const value = await contractInstance.methods.get().call({ from: accounts[0] })

libs/remix-simulator/test/misc.ts

@@ -13,7 +13,7 @@ describe('Misc', () => {
 
   describe('web3_clientVersion', () => {
     it('should get correct remix simulator version', async () => {
-      web3['_requestManager'].send({ method: 'web3_clientVersion', params: [] })
+      web3['_requestManager'].send({ method: 'web3_clientVersion', params: []})
         .then(version => {
           const remixVersion = require('../package.json').version
           assert.equal(version, 'Remix Simulator/' + remixVersion)
@@ -24,7 +24,7 @@ describe('Misc', () => {
 
   describe('eth_protocolVersion', () => {
     it('should get protocol version', async () => {
-      web3['_requestManager'].send({ method: 'eth_protocolVersion', params: [] })
+      web3['_requestManager'].send({ method: 'eth_protocolVersion', params: []})
         .then(result => assert.equal(result, '0x3f'))
         .catch(err => { throw new Error(err) })
     })
@@ -53,7 +53,7 @@ describe('Misc', () => {
 
   describe('web3_sha3', () => {
     it('should get result of a sha3', async () => {
-      web3['_requestManager'].send({ method: 'web3_sha3', params: ['0x68656c6c6f20776f726c64'] })
+      web3['_requestManager'].send({ method: 'web3_sha3', params: ['0x68656c6c6f20776f726c64']})
         .then(result => assert.equal(result, '0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad'))
         .catch(err => { throw new Error(err)} )
     })
@@ -61,7 +61,7 @@ describe('Misc', () => {
 
   describe('eth_getCompilers', () => {
     it('should get list of compilers', async () => {
-      web3['_requestManager'].send({ method: 'eth_getCompilers', params: [] })
+      web3['_requestManager'].send({ method: 'eth_getCompilers', params: []})
         .then(result => assert.equal(result, 0))
         .catch(err => { throw new Error(err) })
     })
@@ -69,7 +69,7 @@ describe('Misc', () => {
 
   describe('eth_compileSolidity', () => {
     it('get unsupported result when requesting solidity compiler', async () => {
-      web3['_requestManager'].send({ method: 'eth_compileSolidity', params: [] })
+      web3['_requestManager'].send({ method: 'eth_compileSolidity', params: []})
         .then(result => assert.equal(result, 'unsupported'))
         .catch(err => { throw new Error(err) })
     })
@@ -77,7 +77,7 @@ describe('Misc', () => {
 
   describe('eth_compileLLL', () => {
     it('get unsupported result when requesting LLL compiler', async () => {
-      web3['_requestManager'].send({ method: 'eth_compileLLL', params: [] })
+      web3['_requestManager'].send({ method: 'eth_compileLLL', params: []})
         .then(result => assert.equal(result, 'unsupported'))
         .catch(err => { throw new Error(err) })
     })
@@ -85,7 +85,7 @@ describe('Misc', () => {
 
   describe('eth_compileSerpent', () => {
     it('get unsupported result when requesting serpent compiler', async () => {
-      web3['_requestManager'].send({ method: 'eth_compileSerpent', params: [] })
+      web3['_requestManager'].send({ method: 'eth_compileSerpent', params: []})
         .then(result => assert.equal(result, 'unsupported'))
         .catch(err => { throw new Error(err)} )
     })

libs/remix-simulator/test/transactions.ts

@@ -6,7 +6,7 @@ import * as assert from 'assert'
 
 describe('Transactions', () => {
   before(async function () {
-    const provider = new Provider({ fork: 'shanghai'})
+    const provider = new Provider({ fork: 'shanghai' })
     await provider.init()
     web3.setProvider(provider as any)
   })

libs/remix-solidity/src/compiler/compiler.ts

@@ -82,7 +82,7 @@ export class Compiler {
    */
 
   internalCompile(files: Source, missingInputs?: string[], timeStamp?: number): void {
-    if(timeStamp < this.state.compilationStartTime && this.state.compilerRetriggerMode == CompilerRetriggerMode.retrigger ) {
+    if (timeStamp < this.state.compilationStartTime && this.state.compilerRetriggerMode == CompilerRetriggerMode.retrigger ) {
       return
     }
     this.gatherImports(files, missingInputs, (error, input) => {

libs/remix-solidity/src/compiler/types.ts

@@ -161,7 +161,7 @@ export enum CompilerRetriggerMode {
 }
 
 export interface CompilerState {
-    compileJSON: ((input: SourceWithTarget, timeStamp?:  number) => void) | null,
+    compileJSON: ((input: SourceWithTarget, timeStamp?: number) => void) | null,
     worker: any,
     currentVersion: string| null| undefined,
     compilerLicense: string| null

libs/remix-tests/src/compiler.ts

@@ -91,7 +91,7 @@ export function compileFileOrFiles (filename: string, isDirectory: boolean, opts
   const filepath: string = (isDirectory ? filename : path.dirname(filename))
   const importsCallback = (url, cb) => {
     try {
-      if(fs.existsSync(url)) cb(null, fs.readFileSync(url, 'utf-8'))
+      if (fs.existsSync(url)) cb(null, fs.readFileSync(url, 'utf-8'))
       else {
         const urlResolver = new RemixURLResolver()
         urlResolver.resolve(url).then((result) => cb(null, result.content)).catch((error) => cb(error.message))

libs/remix-tests/tests/testRunner.cli.spec.ts

@@ -9,10 +9,10 @@ describe('testRunner: remix-tests CLI', function(){
   const executablePath = resolve(__dirname + '/../../../dist/libs/remix-tests/bin/remix-tests')
 
   const result = spawnSync('ls', { cwd: resolve(__dirname + '/../../../dist/libs/remix-tests') })
-  if(result) {
+  if (result) {
     const dirContent = result.stdout.toString()
     // Install dependencies if 'node_modules' is not already present
-    if(!dirContent.includes('node_modules')) {
+    if (!dirContent.includes('node_modules')) {
       execSync('yarn add @remix-project/remix-lib ../../libs/remix-lib', { cwd: resolve(__dirname + '/../../../dist/libs/remix-tests') })
       execSync('yarn add @remix-project/remix-url-resolver ../../libs/remix-url-resolver', { cwd: resolve(__dirname + '/../../../dist/libs/remix-tests') })
       execSync('yarn add @remix-project/remix-solidity ../../libs/remix-solidity', { cwd: resolve(__dirname + '/../../../dist/libs/remix-tests') })
@@ -21,7 +21,6 @@ describe('testRunner: remix-tests CLI', function(){
     }
   }
 
-
   describe('test various CLI options', function() {
     it('remix-tests version', () => {
       const res = spawnSync(executablePath, ['-V'])
@@ -79,8 +78,6 @@ Commands:
 
     })
 
-
-
     it('remix-tests running a test file with custom compiler version', () => {
       const res = spawnSync(executablePath, ['--compiler', '0.7.4', resolve(__dirname + '/examples_0/assert_ok_test.sol')])
       // match initial lines

libs/remix-tests/tests/testRunner.spec.ts

@@ -8,8 +8,6 @@ import { deployAll } from '../src/deployer'
 import { runTest, compilationInterface } from '../src/index'
 import { ResultsInterface, TestCbInterface, ResultCbInterface } from '../src/index'
 
-
-
 // deepEqualExcluding allows us to exclude specific keys whose values vary.
 // In this specific test, we'll use this helper to exclude `time` keys.
 // Assertions for the existence of these will be made at the correct places.
@@ -177,8 +175,6 @@ describe('testRunner', function () {
       })
     })
 
-
-
     describe('assert library NOTEQUAL method tests', function () {
       const filename: string = __dirname + '/examples_0/assert_notEqual_test.sol'
 

libs/remix-ui/editor/src/lib/remix-ui-editor.tsx

@@ -9,6 +9,7 @@ import { solidityTokensProvider, solidityLanguageConfig } from './syntaxes/solid
 import { cairoTokensProvider, cairoLanguageConfig } from './syntaxes/cairo'
 import { zokratesTokensProvider, zokratesLanguageConfig } from './syntaxes/zokrates'
 import { moveTokenProvider, moveLanguageConfig } from './syntaxes/move'
+import { tomlLanguageConfig, tomlTokenProvider } from './syntaxes/toml'
 import { monacoTypes } from '@remix-ui/editor'
 import { loadTypes } from './web-types'
 import { retrieveNodesAtPosition } from './helpers/retrieveNodesAtPosition'
@@ -359,6 +360,8 @@ export const EditorUI = (props: EditorUIProps) => {
       monacoRef.current.editor.setModelLanguage(file.model, 'remix-move')
     } else if (file.language === 'circom') {
       monacoRef.current.editor.setModelLanguage(file.model, 'remix-circom')
+    } else if (file.language === 'toml') {
+      monacoRef.current.editor.setModelLanguage(file.model, 'remix-toml')
     }
   }, [props.currentFile, props.isDiff])
 
@@ -911,6 +914,7 @@ export const EditorUI = (props: EditorUIProps) => {
     monacoRef.current.languages.register({ id: 'remix-zokrates' })
     monacoRef.current.languages.register({ id: 'remix-move' })
     monacoRef.current.languages.register({ id: 'remix-circom' })
+    monacoRef.current.languages.register({ id: 'remix-toml' })
 
     // Allow JSON schema requests
     monacoRef.current.languages.json.jsonDefaults.setDiagnosticsOptions({ enableSchemaRequest: true })
@@ -931,6 +935,9 @@ export const EditorUI = (props: EditorUIProps) => {
     monacoRef.current.languages.setMonarchTokensProvider('remix-circom', circomTokensProvider as any)
     monacoRef.current.languages.setLanguageConfiguration('remix-circom', circomLanguageConfig(monacoRef.current) as any)
 
+    monacoRef.current.languages.setMonarchTokensProvider('remix-toml', tomlTokenProvider as any)
+    monacoRef.current.languages.setLanguageConfiguration('remix-toml', tomlLanguageConfig as any)
+
     monacoRef.current.languages.registerDefinitionProvider('remix-solidity', new RemixDefinitionProvider(props, monaco))
     monacoRef.current.languages.registerDocumentHighlightProvider('remix-solidity', new RemixHighLightProvider(props, monaco))
     monacoRef.current.languages.registerReferenceProvider('remix-solidity', new RemixReferenceProvider(props, monaco))

libs/remix-ui/editor/src/lib/syntaxes/toml.ts

@@ -0,0 +1,62 @@
+/* eslint-disable no-useless-escape */
+export const tomlLanguageConfig = {
+  comments: {
+    lineComment: "#",
+  },
+  brackets: [
+    ["{", "}"],
+    ["[", "]"],
+    ["(", ")"],
+  ],
+  autoClosingPairs: [
+    { open: "{", close: "}" },
+    { open: "[", close: "]" },
+    { open: "(", close: ")" },
+    { open: '"', close: '"' },
+    { open: "'", close: "'" },
+  ],
+  surroundingPairs: [
+    { open: "{", close: "}" },
+    { open: "[", close: "]" },
+    { open: "(", close: ")" },
+    { open: '"', close: '"' },
+    { open: "'", close: "'" },
+  ],
+}
+
+export const tomlTokenProvider = {
+  defaultToken: "",
+  tokenPostfix: ".toml",
+
+  escapes:
+    /\\(?:[abfnrtv\\"']|x[0-9A-Fa-f]{1,4}|u[0-9A-Fa-f]{4}|U[0-9A-Fa-f]{8})/,
+
+  tokenizer: {
+    root: [
+      [/([a-zA-Z0-9_-]+)(\s*)(=)/, ["variable.name", "operators", ""]],
+      [/\[[a-zA-Z0-9_.-]+\]/, "type.identifier"],
+      [/\s*((#).*)$/, "comment"],
+
+      [/\d*\.\d+([eE][\-+]?\d+)?/, "number.float"],
+      [/0[xX][0-9a-fA-F]+/, "number.hex"],
+      [/\d+/, "number"],
+
+      [/"([^"\\]|\\.)*$/, "string.invalid"],
+      [/'([^'\\]|\\.)*$/, "string.invalid"],
+      [/"/, "string", "@string_double"],
+      [/'/, "string", "@string_single"],
+    ],
+    string_double: [
+      [/[^\\"]+/, "string"],
+      [/@escapes/, "string.escape"],
+      [/\\./, "string.escape.invalid"],
+      [/"/, "string", "@pop"],
+    ],
+    string_single: [
+      [/[^\\']+/, "string"],
+      [/@escapes/, "string.escape"],
+      [/\\./, "string.escape.invalid"],
+      [/'/, "string", "@pop"],
+    ],
+  },
+}

libs/remix-ui/run-tab/src/lib/run-tab.tsx

@@ -326,7 +326,14 @@ export function RunTabUI(props: RunTabProps) {
             getFuncABIInputs={getFuncABIValues}
             exEnvironment={runTab.selectExEnv}
             editInstance={(instance) => {
-              plugin.call('dapp-draft', 'edit', { address: instance.address, abi: instance.contractData.abi, name: instance.name, network: runTab.networkName })
+              plugin.call('dapp-draft', 'edit', {
+                address: instance.address,
+                abi: instance.contractData.abi,
+                name: instance.name,
+                network: runTab.networkName,
+                devdoc: instance.contractData.object.devdoc,
+                methodIdentifiers: instance.contractData.object.evm.methodIdentifiers,
+              })
             }}
           />
         </div>

libs/remix-url-resolver/src/resolve.ts

@@ -64,7 +64,7 @@ export class RemixURLResolver {
     // eslint-disable-next-line no-useless-catch
     try {
       const req = `https://raw.githubusercontent.com/${root}/${reference}/${filePath}`
-      const response: AxiosResponse = await axios.get(req, { transformResponse: [] })
+      const response: AxiosResponse = await axios.get(req, { transformResponse: []})
       return { content: response.data, cleanUrl: root + '/' + filePath }
     } catch (e) {
       throw e
@@ -79,7 +79,7 @@ export class RemixURLResolver {
   async handleHttp(url: string, cleanUrl: string): Promise<HandlerResponse> {
     // eslint-disable-next-line no-useless-catch
     try {
-      const response: AxiosResponse = await axios.get(url, { transformResponse: [] })
+      const response: AxiosResponse = await axios.get(url, { transformResponse: []})
       return { content: response.data, cleanUrl }
     } catch (e) {
       throw e
@@ -94,7 +94,7 @@ export class RemixURLResolver {
   async handleHttps(url: string, cleanUrl: string): Promise<HandlerResponse> {
     // eslint-disable-next-line no-useless-catch
     try {
-      const response: AxiosResponse = await axios.get(url, { transformResponse: [] })
+      const response: AxiosResponse = await axios.get(url, { transformResponse: []})
       return { content: response.data, cleanUrl }
     } catch (e) {
       throw e
@@ -106,7 +106,7 @@ export class RemixURLResolver {
     try {
       const bzz = new Bzz({ url: this.protocol + '//swarm-gateways.net' })
       const url = bzz.getDownloadURL(cleanUrl, { mode: 'raw' })
-      const response: AxiosResponse = await axios.get(url, { transformResponse: [] })
+      const response: AxiosResponse = await axios.get(url, { transformResponse: []})
       return { content: response.data, cleanUrl }
     } catch (e) {
       throw e
@@ -125,7 +125,7 @@ export class RemixURLResolver {
       const req = 'https://jqgt.remixproject.org/' + url
       // If you don't find greeter.sol on ipfs gateway use local
       // const req = 'http://localhost:8080/' + url
-      const response: AxiosResponse = await axios.get(req, { transformResponse: [] })
+      const response: AxiosResponse = await axios.get(req, { transformResponse: []})
       return { content: response.data, cleanUrl: url.replace('ipfs/', '') }
     } catch (e) {
       throw e
@@ -190,7 +190,7 @@ export class RemixURLResolver {
     for (let i = 0; i < npm_urls.length; i++) {
       try {
         const req = npm_urls[i] + url
-        const response: AxiosResponse = await axios.get(req, { transformResponse: [] })
+        const response: AxiosResponse = await axios.get(req, { transformResponse: []})
         content = response.data
         break
       } catch (e) {
@@ -202,7 +202,6 @@ export class RemixURLResolver {
     return { content, cleanUrl: url }
   }
 
-
   getHandlers (): Handler[] {
     return [
       {

libs/remix-url-resolver/tests/test.ts

@@ -109,7 +109,7 @@ describe('testRunner', () => {
         it('should return contract content of given github path', () => {
           const expt: object = {
             cleanUrl: 'ethereum/remix-project/libs/remix-url-resolver/tests/example_1/greeter.sol',
-            content: fs.readFileSync(__dirname + '/example_1/greeter.sol', { encoding: 'utf8'}),
+            content: fs.readFileSync(__dirname + '/example_1/greeter.sol', { encoding: 'utf8' }),
             type: 'github'
           }
           assert.deepEqual(results, expt)
@@ -139,7 +139,7 @@ describe('testRunner', () => {
         it('should return contract content of given github path', () => {
           const expt: object = {
             cleanUrl: 'ethereum/remix-project/libs/remix-url-resolver/tests/example_1/greeter.sol',
-            content: fs.readFileSync(__dirname + '/example_1/greeter.sol', { encoding: 'utf8'}) + '\n',
+            content: fs.readFileSync(__dirname + '/example_1/greeter.sol', { encoding: 'utf8' }) + '\n',
             type: 'github'
           }
           assert.deepEqual(results, expt)
@@ -169,7 +169,7 @@ describe('testRunner', () => {
         it('should return contract content of given github path', () => {
           const expt: object = {
             cleanUrl: 'ethereum/remix-project/libs/remix-url-resolver/tests/example_1/greeter.sol',
-            content: fs.readFileSync(__dirname + '/example_1/greeter.sol', { encoding: 'utf8'}),
+            content: fs.readFileSync(__dirname + '/example_1/greeter.sol', { encoding: 'utf8' }),
             type: 'github'
           }
           assert.deepEqual(results, expt)
@@ -257,7 +257,7 @@ describe('testRunner', () => {
           assert.equal(Object.keys(results).length, 3)
         })
         it('should return contract content from IPFS url', () => {
-          const content = fs.readFileSync(__dirname + '/example_1/greeter.sol', { encoding: 'utf8'})
+          const content = fs.readFileSync(__dirname + '/example_1/greeter.sol', { encoding: 'utf8' })
           const expt: object = {
             content: content,
             cleanUrl: 'QmcuCKyokk9Z6f65ADAADNiS2R2xCjfRkv7mYBSWDwtA7M',

libs/remix-ws-templates/src/script-templates/etherscan/receiptGuidScript.ts

@@ -5,5 +5,5 @@
  * @returns {{ status, message, succeed }} receiptStatus
  */
 export const receiptStatus = async (apikey: string, guid: string, isProxyContract?: boolean) => {
-  return await remix.call('etherscan' as any,  'receiptStatus', guid, apikey, isProxyContract)
+  return await remix.call('etherscan' as any, 'receiptStatus', guid, apikey, isProxyContract)
 }

libs/remix-ws-templates/src/script-templates/etherscan/verifyScript.ts

@@ -13,5 +13,5 @@ export const verify = async (apikey: string, contractAddress: string, contractAr
   const compilationResultParam = await remix.call('compilerArtefacts' as any, 'getCompilerAbstract', contractFile)
   console.log('verifying.. ' + contractName)
   // update apiKey and chainRef to verify contract on multiple networks
-  return await remix.call('etherscan' as any,  'verify', apikey, contractAddress, contractArguments, contractName, compilationResultParam, chainRef, isProxyContract, expectedImplAddress)
+  return await remix.call('etherscan' as any, 'verify', apikey, contractAddress, contractArguments, contractName, compilationResultParam, chainRef, isProxyContract, expectedImplAddress)
 }

libs/remix-ws-templates/src/script-templates/sindri/index.ts

@@ -71,12 +71,12 @@ export const sindriScripts = async (plugin: any) => {
             if (a.isTemplateEntrypoint !== b.isTemplateEntrypoint) return +b.isTemplateEntrypoint - +a.isTemplateEntrypoint
             return a.path.localeCompare(b.path)
           })
-          .map(({path}) => path)[0] || './circuit.circom'
+          .map(({ path }) => path)[0] || './circuit.circom'
       sindriManifest.circuitPath = circomCircuitPath
     }
 
     // Derive the circuit name from the workspace name.
-    const {name: workspaceName} = await plugin.call('filePanel', 'getCurrentWorkspace')
+    const { name: workspaceName } = await plugin.call('filePanel', 'getCurrentWorkspace')
     sindriManifest.name =
       workspaceName
         .replace(/\s*-+\s*\d*$/, '')

libs/remix-ws-templates/src/script-templates/sindri/run_compile.ts

@@ -1,4 +1,4 @@
-import {compile} from './utils'
+import { compile } from './utils'
 
 const main = async () => {
   const circuit = await compile()

libs/remix-ws-templates/src/script-templates/sindri/run_prove.ts

@@ -1,4 +1,4 @@
-import {prove} from './utils'
+import { prove } from './utils'
 
 // You must modify the input signals to include the data you're trying to generate a proof for.
 const signals: {[name: string]: number | string} = {}

libs/remix-ws-templates/src/script-templates/sindri/utils.ts

@@ -1,5 +1,5 @@
 import sindriClient from 'sindri'
-import type {CircuitInfoResponse, ProofInfoResponse} from 'sindri'
+import type { CircuitInfoResponse, ProofInfoResponse } from 'sindri'
 
 sindriClient.logLevel = 'info'
 
@@ -9,7 +9,7 @@ const authorize = async () => {
     if (!apiKey) {
       throw new Error('Missing API key.')
     }
-    sindriClient.authorize({apiKey})
+    sindriClient.authorize({ apiKey })
   } catch {
     const message = 'No Sindri API key found. Please click the gear in the lower left corner to open the settings page, and add your API key under "Sindri Credentials".'
     await remix.call('notification', 'toast', message)

libs/remix-ws-templates/src/templates/gnosisSafeMultisig/scripts/web3-lib.ts

@@ -21,7 +21,7 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
   const accounts = await web3.eth.getAccounts()
 
-  const contract: Contract  = new web3.eth.Contract(metadata.abi)
+  const contract: Contract = new web3.eth.Contract(metadata.abi)
 
   const contractSend: ContractSendMethod = contract.deploy({
     data: metadata.data.bytecode.object,

libs/remix-ws-templates/src/templates/hashchecker/scripts/groth16/groth16_zkproof.ts

@@ -51,7 +51,6 @@ const logger = {
     console.log('check')
     await snarkjs.wtns.check(r1cs, wtns, logger);
 
-
     console.log('prove')
     const { proof, publicSignals } = await snarkjs.groth16.prove(zkey_final, wtns);
 

libs/remix-ws-templates/src/templates/ozerc1155/scripts/web3-lib.ts

@@ -21,7 +21,7 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
   const accounts = await web3.eth.getAccounts()
 
-  const contract: Contract  = new web3.eth.Contract(metadata.abi)
+  const contract: Contract = new web3.eth.Contract(metadata.abi)
 
   const contractSend: ContractSendMethod = contract.deploy({
     data: metadata.data.bytecode.object,

libs/remix-ws-templates/src/templates/ozerc20/scripts/web3-lib.ts

@@ -21,7 +21,7 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
   const accounts = await web3.eth.getAccounts()
 
-  const contract: Contract  = new web3.eth.Contract(metadata.abi)
+  const contract: Contract = new web3.eth.Contract(metadata.abi)
 
   const contractSend: ContractSendMethod = contract.deploy({
     data: metadata.data.bytecode.object,

libs/remix-ws-templates/src/templates/ozerc721/scripts/web3-lib.ts

@@ -21,7 +21,7 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
   const accounts = await web3.eth.getAccounts()
 
-  const contract: Contract  = new web3.eth.Contract(metadata.abi)
+  const contract: Contract = new web3.eth.Contract(metadata.abi)
 
   const contractSend: ContractSendMethod = contract.deploy({
     data: metadata.data.bytecode.object,

libs/remix-ws-templates/src/templates/playground/scripts/web3-lib.ts

@@ -21,7 +21,7 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
   const accounts = await web3.eth.getAccounts()
 
-  const contract: Contract  = new web3.eth.Contract(metadata.abi)
+  const contract: Contract = new web3.eth.Contract(metadata.abi)
 
   const contractSend: ContractSendMethod = contract.deploy({
     data: metadata.data.bytecode.object,

libs/remix-ws-templates/src/templates/remixDefault/scripts/web3-lib.ts

@@ -21,7 +21,7 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
   const accounts = await web3.eth.getAccounts()
 
-  const contract: Contract  = new web3.eth.Contract(metadata.abi)
+  const contract: Contract = new web3.eth.Contract(metadata.abi)
 
   const contractSend: ContractSendMethod = contract.deploy({
     data: metadata.data.bytecode.object,

libs/remix-ws-templates/src/templates/semaphore/scripts/groth16/groth16_zkproof.ts

@@ -50,7 +50,7 @@ function hash(message: any): bigint {
     for (let k = 0; k < 2; k++) {
       const identityTrapdoor = BigInt(ethers.utils.hexlify(ethers.utils.randomBytes(32)))
       const identityNullifier = BigInt(ethers.utils.hexlify(ethers.utils.randomBytes(32)))
-      secrets.push({identityTrapdoor, identityNullifier})
+      secrets.push({ identityTrapdoor, identityNullifier })
 
       const secret = poseidon([identityNullifier, identityTrapdoor])
       const identityCommitment = poseidon([secret])

libs/remix-ws-templates/src/templates/semaphore/scripts/plonk/plonk_zkproof.ts

@@ -50,7 +50,7 @@ function hash(message: any): bigint {
     for (let k = 0; k < 2; k++) {
       const identityTrapdoor = BigInt(ethers.utils.hexlify(ethers.utils.randomBytes(32)))
       const identityNullifier = BigInt(ethers.utils.hexlify(ethers.utils.randomBytes(32)))
-      secrets.push({identityTrapdoor, identityNullifier})
+      secrets.push({ identityTrapdoor, identityNullifier })
 
       const secret = poseidon([identityNullifier, identityTrapdoor])
       const identityCommitment = poseidon([secret])

libs/remix-ws-templates/src/templates/semaphore/scripts/run_verification.ts

@@ -47,7 +47,7 @@ function hash(message: any): bigint {
     for (let k = 0; k < 2; k++) {
       const identityTrapdoor = BigInt(ethers.utils.hexlify(ethers.utils.randomBytes(32)))
       const identityNullifier = BigInt(ethers.utils.hexlify(ethers.utils.randomBytes(32)))
-      secrets.push({identityTrapdoor, identityNullifier})
+      secrets.push({ identityTrapdoor, identityNullifier })
 
       const secret = poseidon([identityNullifier, identityTrapdoor])
       const identityCommitment = poseidon([secret])
@@ -86,7 +86,6 @@ function hash(message: any): bigint {
     console.log('check')
     await snarkjs.wtns.check(r1cs, wtns, logger);
 
-
     console.log('prove')
     const { proof, publicSignals } = await snarkjs.groth16.prove(zkey_final, wtns);
 
@@ -94,8 +93,6 @@ function hash(message: any): bigint {
     console.log('zk proof validity', verified);
     proof1.root.toString() === publicSignals[0] ? console.log('merkle proof valid') : console.log('merkle proof invalid')
 
-    
-    
   } catch (e) {
     console.error(e.message)
   }

libs/remix-ws-templates/src/templates/zeroxErc20/scripts/web3-lib.ts

@@ -21,7 +21,7 @@ export const deploy = async (contractName: string, args: Array<any>, from?: stri
 
   const accounts = await web3.eth.getAccounts()
 
-  const contract: Contract  = new web3.eth.Contract(metadata.abi)
+  const contract: Contract = new web3.eth.Contract(metadata.abi)
 
   const contractSend: ContractSendMethod = contract.deploy({
     data: metadata.data.bytecode.object,