Skip to content

Commit

Permalink
Merge branch 'master' into vm/error-management-poc
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrocheleau committed Sep 28, 2021
2 parents 40c8df0 + b0477d6 commit 0fcb6bf
Show file tree
Hide file tree
Showing 278 changed files with 14,533 additions and 13,342 deletions.
File renamed without changes.
23 changes: 0 additions & 23 deletions .github/labeler.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/client-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
network: ['rinkeby', 'goerli']
network: ['goerli']
syncmode: ['full', 'light']
fail-fast: false
steps:
Expand Down
32 changes: 26 additions & 6 deletions config/MONOREPO.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Development quick start

First, make sure you have the `ethereum-tests` git submodule, by running:
First, make sure you have the `ethereum-tests` git submodule, by running:

```sh
git submodule init
Expand All @@ -12,16 +12,36 @@ git submodule update
This monorepo uses [npm workspaces](https://docs.npmjs.com/cli/v7/using-npm/workspaces). It links the local packages together, making development a lot easier.

TLDR: Setup

```sh
npm i
```

TLDR: To update dependencies

```sh
npm run build --workspaces
```

Above is the quickest way to set you up. Going down the road, there are two sets of commands: *project* and *package-specific* commands. You can find them at `./package.json` and `./packages/*/package.json`, respectively. Here's a breakdown:
Above is the quickest way to set you up.

### ℹ️ Note for Windows users:

Windows users might run into the following error when trying to install the repo: `'.' is not recognized as an internal or external command`. To remediate for this, you can force Windows to use Git bash to run scripts (you'll need to install [Git for Windows](https://git-scm.com/download/win) for this) with the following command:

```sh
npm config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe"
```

If you ever need to reset this change, you can do so with this command:

```sh
npm config delete script-shell
```

---

Going down the road, there are two sets of commands: _project_ and _package-specific_ commands. You can find them at `./package.json` and `./packages/*/package.json`, respectively. Here's a breakdown:

### Project scripts — run from repository root

Expand Down Expand Up @@ -49,8 +69,8 @@ Rebuilds all generated docs.

### Package scripts — run from `./packages/<name>`

**⚠️ Important: if you run `npm install` from the package directory, it will [ignore the workspace](https://github.com/npm/cli/issues/2546). Run `npm install` from the root only.**
**⚠️ Important: if you run `npm install` from the package directory, it will [ignore the workspace](https://github.com/npm/cli/issues/2546). Run `npm install` from the root only.**

There's a set of rather standardized commands you will find in each package of this repository.

#### `npm run build`
Expand All @@ -75,6 +95,6 @@ Fixes code style according to the rules. Differently from `npm run lint`, this c

#### `npm run test`

Runs the package tests.
Runs the package tests.

_Note that the VM has several test scopes - refer to [packages/vm/package.json](https://github.com/ethereumjs/ethereumjs-monorepo/blob/master/packages/vm/package.json) for more info._
_Note that the VM has several test scopes - refer to [packages/vm/package.json](https://github.com/ethereumjs/ethereumjs-monorepo/blob/master/packages/vm/package.json) for more info._
1 change: 1 addition & 0 deletions config/cli/prepublish.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npm run clean && npm run build && npm run test
40 changes: 25 additions & 15 deletions config/eslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,48 @@ module.exports = {
es6: true,
node: true,
},
ignorePatterns: ['node_modules/', 'dist/', 'dist.browser/', 'coverage/', 'prettier.config.js', 'typedoc.js', 'karma.conf.js'],
ignorePatterns: [
'node_modules/',
'dist/',
'dist.browser/',
'coverage/',
'prettier.config.js',
'typedoc.js',
'karma.conf.js',
],
extends: ['typestrict', 'eslint:recommended'],
rules: {
'no-console': 'warn',
'no-debugger': 'error',
'prefer-const': 'error',
'no-var': 'error',
'implicit-dependencies/no-implicit': [
'error',
{ peer: true, dev: true, optional: true },
],
'implicit-dependencies/no-implicit': ['error', { peer: true, dev: true, optional: true }],
'@typescript-eslint/prefer-nullish-coalescing': 'error',
'@typescript-eslint/no-use-before-define': 'error',
'@typescript-eslint/naming-convention': [
'error',
{
selector: 'interface',
format: ['PascalCase', 'camelCase'],
custom: {
regex: '^I[A-Z]',
match: false,
}
}
selector: 'interface',
format: ['PascalCase', 'camelCase'],
custom: {
regex: '^I[A-Z]',
match: false,
},
},
],
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': ["error", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }],
'@typescript-eslint/no-unused-vars': [
'error',
{ argsIgnorePattern: '^_', varsIgnorePattern: '^_' },
],
'@typescript-eslint/no-unnecessary-condition': 'off',
'no-dupe-class-members': 'off',
'prettier/prettier': 'error',
'no-redeclare': 'off',
'@typescript-eslint/no-redeclare': ['error'],
},
parserOptions: {
sourceType: 'module',
project: './tsconfig.json'
project: './tsconfig.json',
},
};
}
14 changes: 0 additions & 14 deletions greenkeeper.json

This file was deleted.

Loading

1 comment on commit 0fcb6bf

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 0fcb6bf Previous: b0477d6 Ratio
Block 9422913 7499 ops/sec (±15.31%) 15330 ops/sec (±4.17%) 2.04

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.