Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
acolytec3 committed Nov 20, 2024
1 parent 4aa40ad commit 4998914
Show file tree
Hide file tree
Showing 104 changed files with 363 additions and 330 deletions.
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"lineWidth": 100
},
"organizeImports": {
"enabled": false
"enabled": true
},
"linter": {
"enabled": false,
Expand Down
33 changes: 0 additions & 33 deletions config/cli/lint-fix.sh

This file was deleted.

33 changes: 0 additions & 33 deletions config/cli/lint.sh

This file was deleted.

27 changes: 14 additions & 13 deletions config/eslint.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module.exports = {
'github',
'implicit-dependencies',
'import',
'simple-import-sort',
],
env: {
es2020: true,
Expand All @@ -21,6 +20,11 @@ module.exports = {
'docs',
'.eslintrc.cjs',
'vitest.config.*.ts',
'archived-browser-client/',
'browser-client/',
'ui/',
'scripts/',
'proxy/'
],
extends: [
'typestrict',
Expand Down Expand Up @@ -75,16 +79,6 @@ module.exports = {
'import/no-unused-modules': 'error',
'import/no-useless-path-segments': 'error',
'import/no-webpack-loader-syntax': 'error',
'import/order': [
'error',
{
alphabetize: {
order: 'asc',
},
groups: ['object', ['builtin', 'external'], 'parent', 'sibling', 'index', 'type'],
'newlines-between': 'always',
},
],
'no-console': 'warn',
'no-debugger': 'error',
'no-dupe-class-members': 'off',
Expand All @@ -94,12 +88,19 @@ module.exports = {
'no-var': 'error',
'object-shorthand': 'error',
'prefer-const': 'error',
'simple-import-sort/exports': 'error',
'sort-imports': ['error', { ignoreDeclarationSort: true }],
},
parserOptions: {
extraFileExtensions: ['.json'],
sourceType: 'module',
project: './tsconfig.lint.json',
project: './config/tsconfig.lint.json',
},
overrides: [
{
files: ['**/cli/**/*.ts'],
rules: {
'no-console': 'off',
},
},
]
}
102 changes: 102 additions & 0 deletions config/tsconfig.lint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
{
"include": ["../packages/cli/**/*.ts", "../packages/era/**/*.ts", "../packages/portalnetwork/**/*.ts"],
"exclude": ["dist"],
"compilerOptions": {
/* Visit https://aka.ms/tsconfig.json to read more about this file */

/* Projects */
// "incremental": true, /* Enable incremental compilation */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "es2020" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
// "jsx": "preserve", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
// "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */

/* Modules */
"module": "NodeNext" /* Specify what module code is generated. */,
"rootDir": "./src", /* Specify the root folder within your source files. */
// "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
// "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "resolveJsonModule": true, /* Enable importing .json files */
// "noResolve": true, /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */

/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */

/* Emit */
"declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
"declarationMap": true, /* Create sourcemaps for d.ts files. */
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
"outDir": "./dist", /* Specify an output folder for all emitted files. */
// "removeComments": true, /* Disable emitting comments. */
// "noEmit": true, /* Disable emitting files from a compilation. */
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */
"downlevelIteration": true /* Emit more compliant, but verbose and less performant JavaScript for iteration. */,
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */

/* Interop Constraints */
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
// "allowSyntheticDefaultImports": false, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": false /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,

/* Type Checking */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */
// "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
// "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
// "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */
// "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
// "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */

/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
}
}
9 changes: 0 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"name": "ultralight",
"private": true,
"workspaces": ["./", "./packages/portalnetwork", "./packages/cli", "./packages/era"],
"workspaces": [
"./",
"./packages/portalnetwork",
"./packages/cli",
"./packages/era"
],
"engines": {
"npm": "^10",
"node": "^20"
Expand All @@ -12,8 +17,8 @@
"start-proxy": "npm run start -w=proxy -- --nat=localhost",
"start-browser-client": "npm run start-testnet -w=browser-client",
"start-cli": "npm run dev -w=cli",
"lint": "npm run lint -w=cli -w=portalnetwork -w=proxy",
"lint:fix": "npm run lint:fix -w=cli -w=portalnetwork -w=proxy",
"lint": "eslint --format codeframe --config ./config/eslint.cjs . --ext .js,.ts",
"lint:fix": "eslint --fix --config ./config/eslint.cjs . --ext .js,.ts",
"clean": "bash ./scripts/clean-root.sh"
},
"devDependencies": {
Expand All @@ -27,8 +32,7 @@
"eslint-plugin-implicit-dependencies": "^1.1.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-simple-import-sort": "^10.0.0",
"node-gyp": "^10.1.0",
"tsx": "^4.6.2"
}
}
}
2 changes: 1 addition & 1 deletion packages/cli/scripts/beaconBridge.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { writeFileSync } from 'fs'
import { bytesToHex, concatBytes, hexToBytes } from '@ethereumjs/util'
import { createBeaconConfig, defaultChainConfig } from '@lodestar/config'
import { genesisData } from '@lodestar/config/networks'
import { computeSyncPeriodAtSlot } from '@lodestar/light-client/utils'
import { ForkName } from '@lodestar/params'
import { ssz } from '@lodestar/types'
import { writeFileSync } from 'fs'
import jayson from 'jayson/promise/index.js'
import {
BeaconLightClientNetworkContentType,
Expand Down
5 changes: 3 additions & 2 deletions packages/cli/scripts/content/connectNodes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Client, HttpClient } from 'jayson/promise'
import type { HttpClient } from 'jayson/promise';
import { Client } from 'jayson/promise'
import yargs from 'yargs'
import { hideBin } from 'yargs/helpers'

Expand All @@ -9,7 +10,7 @@ const args: any = yargs(hideBin(process.argv)).option('bootnodes', {
}).argv

const main = async () => {
let bootNodes: { node: HttpClient; enr: string }[] = []
const bootNodes: { node: HttpClient; enr: string }[] = []

console.log(args.bootnodes)
for (let i = 0; i < args.bootnodes; i++) {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/scripts/content/nodeLookup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const args: any = yargs(hideBin(process.argv))
})

const main = async () => {
let bootEnrs: string[] = []
const bootEnrs: string[] = []
for (let i = 0; i < 8; i++) {
const boot = Client.http({ port: 8546 + i })
const bootEnr = (await boot.request('portal_nodeEnr', [])).result
Expand Down
5 changes: 3 additions & 2 deletions packages/cli/scripts/content/requestContent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Client, HttpClient } from 'jayson/promise'
import type { HttpClient } from 'jayson/promise';
import { Client } from 'jayson/promise'
import yargs from 'yargs'
import { hideBin } from 'yargs/helpers'
import blocks from '../blocks200000-210000.json'
Expand Down Expand Up @@ -27,7 +28,7 @@ const args: any = yargs(hideBin(process.argv))
})

const main = async () => {
let bootNodes: Node[] = []
const bootNodes: Node[] = []

for (let i = 0; i < 8; i++) {
const boot = Client.http({ port: 8546 + i })
Expand Down
5 changes: 3 additions & 2 deletions packages/cli/scripts/content/seedContent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Client, HttpClient } from 'jayson/promise'
import type { HttpClient } from 'jayson/promise';
import { Client } from 'jayson/promise'
import yargs from 'yargs'
import { hideBin } from 'yargs/helpers'
import blocks from '../blocks200000-210000.json'
Expand All @@ -22,7 +23,7 @@ const args: any = yargs(hideBin(process.argv))
})

const main = async () => {
let bootNodes: { node: HttpClient; enr: string }[] = []
const bootNodes: { node: HttpClient; enr: string }[] = []

for (let i = 0; i < 8; i++) {
const boot = Client.http({ port: 8546 + i })
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/scripts/devnet.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { spawn } from 'child_process'
import * as fs from 'fs'
import jayson from 'jayson/promise/index.js'
import { createRequire } from 'module'
import jayson from 'jayson/promise/index.js'
import yargs from 'yargs'
import { hideBin } from 'yargs/helpers'

import type { DevnetOpts } from '../src/types.js'
import type { ChildProcessByStdio } from 'child_process'
import type { DevnetOpts } from '../src/types.js'

const bootnodes = [
'enr:-Jy4QIs2pCyiKna9YWnAF0zgf7bT0GzlAGoF8MEKFJOExmtofBIqzm71zDvmzRiiLkxaEJcs_Amr7XIhLI74k1rtlXICY5Z0IDAuMS4xLWFscGhhLjEtMTEwZjUwgmlkgnY0gmlwhKEjVaWJc2VjcDI1NmsxoQLSC_nhF1iRwsCw0n3J4jRjqoaRxtKgsEe5a-Dz7y0JloN1ZHCCIyg',
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/scripts/genesisBridge.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { readFileSync, writeFileSync } from 'fs'
import { Blockchain } from '@ethereumjs/blockchain'
import { Common } from '@ethereumjs/common'
import { LeafNode, Trie } from '@ethereumjs/trie'
import { Account, bytesToHex, hexToBytes, parseGethGenesisState } from '@ethereumjs/util'
import { readFileSync, writeFileSync } from 'fs'
import { AccountTrieNodeContentKey, AccountTrieNodeOffer, tightlyPackNibbles } from 'portalnetwork'

import genesis from '../data/mainnet.json' assert { type: 'json' }
Expand Down
Loading

0 comments on commit 4998914

Please sign in to comment.