Skip to content

Commit 0fcb6bf

Browse files
committed
Merge branch 'master' into vm/error-management-poc
2 parents 40c8df0 + b0477d6 commit 0fcb6bf

File tree

278 files changed

+14533
-13342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+14533
-13342
lines changed
File renamed without changes.

.github/labeler.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/workflows/client-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
runs-on: ubuntu-latest
5050
strategy:
5151
matrix:
52-
network: ['rinkeby', 'goerli']
52+
network: ['goerli']
5353
syncmode: ['full', 'light']
5454
fail-fast: false
5555
steps:

config/MONOREPO.md

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Development quick start
44

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

77
```sh
88
git submodule init
@@ -12,16 +12,36 @@ git submodule update
1212
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.
1313

1414
TLDR: Setup
15+
1516
```sh
1617
npm i
1718
```
1819

1920
TLDR: To update dependencies
21+
2022
```sh
2123
npm run build --workspaces
2224
```
2325

24-
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:
26+
Above is the quickest way to set you up.
27+
28+
### ℹ️ Note for Windows users:
29+
30+
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:
31+
32+
```sh
33+
npm config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe"
34+
```
35+
36+
If you ever need to reset this change, you can do so with this command:
37+
38+
```sh
39+
npm config delete script-shell
40+
```
41+
42+
---
43+
44+
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:
2545

2646
### Project scripts — run from repository root
2747

@@ -49,8 +69,8 @@ Rebuilds all generated docs.
4969

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

52-
**⚠️ 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.**
53-
72+
**⚠️ 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.**
73+
5474
There's a set of rather standardized commands you will find in each package of this repository.
5575

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

7696
#### `npm run test`
7797

78-
Runs the package tests.
98+
Runs the package tests.
7999

80-
_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._
100+
_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._

config/cli/prepublish.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npm run clean && npm run build && npm run test

config/eslint.js

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,48 @@ module.exports = {
55
es6: true,
66
node: true,
77
},
8-
ignorePatterns: ['node_modules/', 'dist/', 'dist.browser/', 'coverage/', 'prettier.config.js', 'typedoc.js', 'karma.conf.js'],
8+
ignorePatterns: [
9+
'node_modules/',
10+
'dist/',
11+
'dist.browser/',
12+
'coverage/',
13+
'prettier.config.js',
14+
'typedoc.js',
15+
'karma.conf.js',
16+
],
917
extends: ['typestrict', 'eslint:recommended'],
1018
rules: {
1119
'no-console': 'warn',
1220
'no-debugger': 'error',
1321
'prefer-const': 'error',
1422
'no-var': 'error',
15-
'implicit-dependencies/no-implicit': [
16-
'error',
17-
{ peer: true, dev: true, optional: true },
18-
],
23+
'implicit-dependencies/no-implicit': ['error', { peer: true, dev: true, optional: true }],
1924
'@typescript-eslint/prefer-nullish-coalescing': 'error',
2025
'@typescript-eslint/no-use-before-define': 'error',
2126
'@typescript-eslint/naming-convention': [
2227
'error',
2328
{
24-
selector: 'interface',
25-
format: ['PascalCase', 'camelCase'],
26-
custom: {
27-
regex: '^I[A-Z]',
28-
match: false,
29-
}
30-
}
29+
selector: 'interface',
30+
format: ['PascalCase', 'camelCase'],
31+
custom: {
32+
regex: '^I[A-Z]',
33+
match: false,
34+
},
35+
},
3136
],
3237
'no-unused-vars': 'off',
33-
'@typescript-eslint/no-unused-vars': ["error", { argsIgnorePattern: "^_", varsIgnorePattern: "^_" }],
38+
'@typescript-eslint/no-unused-vars': [
39+
'error',
40+
{ argsIgnorePattern: '^_', varsIgnorePattern: '^_' },
41+
],
3442
'@typescript-eslint/no-unnecessary-condition': 'off',
3543
'no-dupe-class-members': 'off',
3644
'prettier/prettier': 'error',
45+
'no-redeclare': 'off',
46+
'@typescript-eslint/no-redeclare': ['error'],
3747
},
3848
parserOptions: {
3949
sourceType: 'module',
40-
project: './tsconfig.json'
50+
project: './tsconfig.json',
4151
},
42-
};
52+
}

greenkeeper.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)