[pull] master from ethereum:master

.eslintrc.json

@@ -54,7 +54,13 @@
         "react-hooks/exhaustive-deps": "off",
         "array-callback-return": "off",
         "prefer-spread": "off",
-        "indent": ["error", 2]
+        "indent": ["error", 2],
+        "keyword-spacing": ["error", { "after": true, "before": true }],
+        "array-bracket-spacing": ["error", "never"],
+        "object-curly-spacing": ["error", "always", { "arraysInObjects": false }],
+        "no-trailing-spaces": "error",
+        "no-multi-spaces": "error",
+        "no-multiple-empty-lines": ["error" , { "max": 1}]
       }
     },
     {

.github/workflows/pr-reminder.yml

@@ -14,4 +14,4 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-        freeze-date: '2024-04-22T18:00:00Z'
+        freeze-date: '2024-05-20T18:00:00Z'

apps/circuit-compiler/.eslintrc

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

apps/circuit-compiler/project.json

@@ -35,6 +35,14 @@
           }
         }
       },
+      "lint": {
+        "executor": "@nrwl/linter:eslint",
+        "outputs": ["{options.outputFile}"],
+        "options": {
+          "lintFilePatterns": ["apps/circuit-compiler/**/*.ts"],
+          "eslintConfig": "apps/circuit-compiler/.eslintrc"
+        }
+      },
       "serve": {
         "executor": "@nrwl/webpack:dev-server",
         "defaultConfiguration": "development",

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

@@ -1,4 +1,4 @@
-import {createContext} from 'react'
-import {ICircuitAppContext} from '../types'
+import { createContext } from 'react'
+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

@@ -163,7 +163,7 @@ export class CircomPluginClient extends PluginClient {
     } else {
       this.lastCompiledFile = path
       const fileName = extractNameFromKey(path)
-      
+
       this.lastCompiledCircuitPath = extractParentFromKey(path) + "/.bin/" + fileName.replace('circom', 'wasm')
       // @ts-ignore
       await this.call('fileManager', 'writeFile', this.lastCompiledCircuitPath, circuitProgram, { encoding: null })
@@ -179,7 +179,7 @@ export class CircomPluginClient extends PluginClient {
         this.internalEvents.emit('circuit_compiling_done', [])
       }
       circuitApi.log().map(log => {
-        log && this.call('terminal', 'log', { type: 'log', value: log })  
+        log && this.call('terminal', 'log', { type: 'log', value: log })
       })
       // @ts-ignore
       this.call('terminal', 'log', { type: 'typewritersuccess', value: 'Everything went okay' })
@@ -222,11 +222,11 @@ export class CircomPluginClient extends PluginClient {
       this.internalEvents.emit('circuit_generating_r1cs_done')
       const fileName = extractNameFromKey(path)
       const writePath = extractParentFromKey(path) + "/.bin/" + fileName.replace('circom', 'r1cs')
-  
+
       // @ts-ignore
       await this.call('fileManager', 'writeFile', writePath, r1csProgram, true)
       r1csApi.log().map(log => {
-        log && this.call('terminal', 'log', { type: 'log', value: log })  
+        log && this.call('terminal', 'log', { type: 'log', value: log })
       })
       // @ts-ignore
       this.call('terminal', 'log', { type: 'typewritersuccess', value: 'Everything went okay' })
@@ -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/debugger/project.json

@@ -40,6 +40,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/debugger/**/*.ts"],
+        "eslintConfig": "apps/debugger/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/debugger/src/app/debugger.ts

@@ -1,13 +1,13 @@
 import { PluginClient } from "@remixproject/plugin";
 import { createClient } from "@remixproject/plugin-webview";
-import { IDebuggerApi, LineColumnLocation, 
+import { IDebuggerApi, LineColumnLocation,
   onBreakpointClearedListener, onBreakpointAddedListener, onEditorContentChanged, onEnvChangedListener, TransactionReceipt } from '@remix-ui/debugger-ui'
 import { DebuggerApiMixin } from '@remix-ui/debugger-ui'
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 
-export class DebuggerClientApi extends DebuggerApiMixin(PluginClient) {  
+export class DebuggerClientApi extends DebuggerApiMixin(PluginClient) {
   constructor () {
-    super()    
+    super()
     createClient(this as any)
     this.initDebuggerApi()
   }

apps/doc-gen/.eslintrc

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

apps/doc-gen/project.json

@@ -38,6 +38,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/doc-gen/**/*.ts"],
+        "eslintConfig": "apps/doc-gen/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

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

@@ -17,7 +17,7 @@ export class DocGenClient extends PluginClient {
   public docs: string[] = []
   private fileName: string = ''
   private contractPath: string = ''
-  
+
   constructor() {
     super()
     this.eventEmitter = new EventEmitter()
@@ -30,7 +30,7 @@ export class DocGenClient extends PluginClient {
 
   async setListeners() {
     this.currentTheme = await this.call('theme', 'currentTheme')
-    
+
     this.on('theme', 'themeChanged', (theme: any) => {
       this.currentTheme = theme
       this.eventEmitter.emit('themeChanged', this.currentTheme)
@@ -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':
-      return undefined;
-
-    case 'FunctionDefinition': {
-      const { kind, name } = item;
-      const params = item.parameters.parameters;
-      const returns = item.returnParameters.parameters;
-      const head = (kind === 'function' || kind === 'freeFunction') ? [kind, name].join(' ') : kind;
-      const res = [
-        `${head}(${params.map(formatVariable).join(', ')})`,
-        item.visibility,
-      ];
-      if (item.stateMutability !== 'nonpayable') {
-        res.push(item.stateMutability);
-      }
-      if (item.virtual) {
-        res.push('virtual');
-      }
-      if (returns.length > 0) {
-        res.push(`returns (${returns.map(formatVariable).join(', ')})`);
-      }
-      return res.join(' ');
+  case 'ContractDefinition':
+    return undefined;
+
+  case 'FunctionDefinition': {
+    const { kind, name } = item;
+    const params = item.parameters.parameters;
+    const returns = item.returnParameters.parameters;
+    const head = (kind === 'function' || kind === 'freeFunction') ? [kind, name].join(' ') : kind;
+    const res = [
+      `${head}(${params.map(formatVariable).join(', ')})`,
+      item.visibility,
+    ];
+    if (item.stateMutability !== 'nonpayable') {
+      res.push(item.stateMutability);
     }
-
-    case 'EventDefinition': {
-      const params = item.parameters.parameters;
-      return `event ${item.name}(${params.map(formatVariable).join(', ')})`;
+    if (item.virtual) {
+      res.push('virtual');
     }
-
-    case 'ErrorDefinition': {
-      const params = item.parameters.parameters;
-      return `error ${item.name}(${params.map(formatVariable).join(', ')})`;
+    if (returns.length > 0) {
+      res.push(`returns (${returns.map(formatVariable).join(', ')})`);
     }
+    return res.join(' ');
+  }
 
-    case 'ModifierDefinition': {
-      const params = item.parameters.parameters;
-      return `modifier ${item.name}(${params.map(formatVariable).join(', ')})`;
-    }
+  case 'EventDefinition': {
+    const params = item.parameters.parameters;
+    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':
-      return formatVariable(item);
+  case 'VariableDeclaration':
+    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}`;
@@ -86,15 +85,15 @@ async function readPartials() {
 }
 
 async function readHelpers(name: string) {
-  
+
   const helpers: Record<string, (...args: any[]) => any> = {};
 
   for (const name in themeHelpers) {
     if (typeof themeHelpers[name] === 'function') {
       helpers[name] = themeHelpers[name];
     }
   }
-  
+
   return helpers;
 }
 

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': 
-          return value;
+      case 'done':
+        return value;
 
-        case 'doing':
-          throw new Error("Detected recursion");
+      case 'doing':
+        throw new Error("Detected recursion");
 
-        case 'todo':
-          state = 'doing';
-          value = getter();
-          state = 'done';
-          return value;
+      case 'todo':
+        state = 'doing';
+        value = getter();
+        state = 'done';
+        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'
-    ? item.documentation
-    : cleanUpDocstringFromSolc(item.documentation.text)
-    : '';
+      ? typeof item.documentation === 'string'
+        ? item.documentation
+        : 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/doc-viewer/project.json

@@ -38,6 +38,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/doc-viewer/**/*.ts"],
+        "eslintConfig": "apps/doc-viewer/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/etherscan/.eslintrc

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

apps/etherscan/project.json

@@ -38,6 +38,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/etherscan/**/*.ts"],
+        "eslintConfig": "apps/etherscan/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",