Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Monorepo: Develop -> Master - Breaking Release Transition PR #1943

Merged
merged 48 commits into from
Jun 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b077551
VM: Make CodeHashes have a DB prefix in StateManager (#1438)
jochem-brouwer Sep 2, 2021
8200340
Util: Remove `assert` in favor of simply throwing `Errors` (#1638)
steveluscher Jan 18, 2022
3255060
Common, VM: Remove unused HF options from Common, move supportedHardf…
emersonmacro Jan 21, 2022
a025170
Common: method deprecations (new) (#1698)
ScottyPoi Feb 8, 2022
c1b2571
Common: Rename *BN methods to non-BN names (#1709)
ScottyPoi Feb 11, 2022
f89d34d
Upgrade ethereum-cryptography to 1.0. (#1714)
paulmillr Feb 21, 2022
c5d1721
VM: Replace BN.js with bigints, Util helpers (#1671)
acolytec3 Feb 22, 2022
d47c4c9
monorepo: develop rebase 2022-02-23 fixes
holgerd77 Feb 23, 2022
4ac43d0
Tx: Execute on deprecation notes (#1742)
ScottyPoi Feb 24, 2022
bf4ebb3
Monorepo: Set default hardfork to London (#1749)
holgerd77 Feb 28, 2022
f72b8bb
Block: deprecation tasks (#1752)
emersonmacro Feb 28, 2022
6d387a9
Common, Block: remove and rename ambiguous active methods (#1753)
emersonmacro Mar 1, 2022
dca50bb
vm: reintroduce modifyAccountFields (#1763)
ryanio Mar 4, 2022
86009ae
Develop Rebase Fixes (2022-03-05)
holgerd77 Mar 5, 2022
5e84515
develop: fix client parse, move modifyAccountFields to baseStateManag…
ryanio Mar 8, 2022
d1a7f5f
Convert bn to bigint (#1771)
holgerd77 Mar 14, 2022
0efd114
refactor: unify constructor input types and refactor defaults to clas…
gabrocheleau Mar 15, 2022
5c6d5c2
util: remove object.ts (#1809)
acolytec3 Mar 23, 2022
0c39e26
VM: rebase fixes
holgerd77 Mar 24, 2022
13609d4
Client: rebase fixes
holgerd77 Mar 24, 2022
85f3239
Fix missing = sign
acolytec3 Mar 24, 2022
207126f
Revert process code changes
acolytec3 Mar 24, 2022
813686d
VM, Blockchain, Client: fix storing unsettled promises (develop) (#1811)
ryanio Apr 2, 2022
3dae936
vm, client: continuing v6 breaking changes (#1815)
ryanio Apr 2, 2022
e2c28ad
Implement EIP3074: Authcall (#1789)
jochem-brouwer Apr 4, 2022
03dbf96
util: move misplaced functions (#1825)
acolytec3 Apr 4, 2022
c96ec2c
Blockchain, Client, VM: Head function rename rebase (#1822)
acolytec3 Apr 5, 2022
d1f4b84
develop: ci fix, some last backwards compatibility removals (#1834)
ryanio Apr 5, 2022
f140034
Develop rebase fixes (2022-04-07)
acolytec3 Apr 6, 2022
84c5b15
vm: extract statemanager to own package (#1817)
g11tech Apr 13, 2022
d271ea1
Blockchain: encapsulate consensus mechanism (new) (#1841)
holgerd77 Apr 14, 2022
fe4e559
Develop rebase fixes (2022-05-04)
g11tech Apr 30, 2022
a86e290
trie: convert constructor to options interface, remove deprecated set…
ryanio May 2, 2022
df03ce6
util: replace hash module with ethereum-cryptography (#1859)
emersonmacro May 4, 2022
414a64f
vm: Improve `skipBalance` logic (#1849)
acolytec3 May 4, 2022
b21e013
Migrate `common.param` (and friends) to return `BigInt` (#1854)
acolytec3 May 4, 2022
efb8226
rlp: v3 integration for monorepo packages (#1662)
ryanio May 12, 2022
d63fc6f
blockchain: fix iterator return type, reinstate tests (#1877)
ScottyPoi May 13, 2022
840d592
EVM/VM refactor (#1892)
gabrocheleau May 23, 2022
4d32591
Common type safety (#1906)
acolytec3 May 26, 2022
c946740
Common refactor (#1915)
acolytec3 May 27, 2022
b8e69ce
refactor(trie): abstract database implementation with an interface (#…
faustbrian May 27, 2022
41e1daa
Tx: Throw when hash() is called on unsigned legacy transaction (#1894)
ScottyPoi May 31, 2022
99a44bd
common/blockchain genesis refactor (#1916)
ryanio May 31, 2022
c151338
develop: small fixes (#1924)
ryanio Jun 3, 2022
c1f15c5
Update EIP 3074 AUTHCALL (#1867)
jochem-brouwer Jun 3, 2022
5d5a841
Rebase fixes on master 3e4e7be
g11tech Jun 2, 2022
97554f2
Monorepo: fixed eslint-plugin-typestrict dependency to v1.0.3 to avoi…
holgerd77 Jun 8, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .github/workflows/e2e-hardhat.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: E2E Hardhat Tests
on:
push:
branches: [master, develop]
branches: [master]
tags: ['*']
pull_request:
branches: [master]
types: [opened, reopened, synchronize]

env:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/node-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ jobs:
run: npm run test
working-directory: packages/util

- name: Test StateManager
run: npm run test
working-directory: packages/statemanager

- name: Test VM
run: npm run test:API
working-directory: packages/vm
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/statemanager-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: StateManager
on:
push:
branches: [master, develop]
tags: ['*']
pull_request:
types: [opened, reopened, synchronize]

env:
cwd: ${{github.workspace}}/packages/statemanager

defaults:
run:
working-directory: packages/statemanager

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
test-statemanager:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16]
steps:
- uses: actions/checkout@v2
with:
submodules: recursive

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- run: npm i
working-directory: ${{github.workspace}}

- run: npm run lint
- run: npm run coverage

- uses: codecov/codecov-action@v2
with:
files: ${{ env.cwd }}/coverage/lcov.info
flags: statemanager
if: ${{ matrix.node-version == 16 }}
44 changes: 29 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@ This was originally the EthereumJS VM repository. In Q1 2020 we brought some of

🚧 Please note that the `master` branch is updated on a daily basis, and to inspect code related to a specific package version, refer to the [tags](https://github.com/ethereumjs/ethereumjs-monorepo/tags).

| package | npm | issues | tests | coverage |
| -------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------------------- | ---------------------------------------------------------------------- | ----------------------------------------------------------------------- |
| [@ethereumjs/block][block-package] | [![NPM Package][block-npm-badge]][block-npm-link] | [![Block Issues][block-issues-badge]][block-issues-link] | [![Actions Status][block-actions-badge]][block-actions-link] | [![Code Coverage][block-coverage-badge]][block-coverage-link] |
| [@ethereumjs/blockchain][blockchain-package] | [![NPM Package][blockchain-npm-badge]][blockchain-npm-link] | [![Blockchain Issues][blockchain-issues-badge]][blockchain-issues-link] | [![Actions Status][blockchain-actions-badge]][blockchain-actions-link] | [![Code Coverage][blockchain-coverage-badge]][blockchain-coverage-link] |
| [@ethereumjs/client][client-package] | [![NPM Package][client-npm-badge]][client-npm-link] | [![Client Issues][client-issues-badge]][client-issues-link] | [![Actions Status][client-actions-badge]][client-actions-link] | [![Code Coverage][client-coverage-badge]][client-coverage-link] |
| [@ethereumjs/common][common-package] | [![NPM Package][common-npm-badge]][common-npm-link] | [![Common Issues][common-issues-badge]][common-issues-link] | [![Actions Status][common-actions-badge]][common-actions-link] | [![Code Coverage][common-coverage-badge]][common-coverage-link] |
| [@ethereumjs/devp2p][devp2p-package] | [![NPM Package][devp2p-npm-badge]][devp2p-npm-link] | [![Devp2p Issues][devp2p-issues-badge]][devp2p-issues-link] | [![Actions Status][devp2p-actions-badge]][devp2p-actions-link] | [![Code Coverage][devp2p-coverage-badge]][devp2p-coverage-link] |
| [@ethereumjs/ethash][ethash-package] | [![NPM Package][ethash-npm-badge]][ethash-npm-link] | [![Ethash Issues][ethash-issues-badge]][ethash-issues-link] | [![Actions Status][ethash-actions-badge]][ethash-actions-link] | [![Code Coverage][ethash-coverage-badge]][ethash-coverage-link] |
| [merkle-patricia-tree][trie-package] | [![NPM Package][trie-npm-badge]][trie-npm-link] | [![Trie Issues][trie-issues-badge]][trie-issues-link] | [![Actions Status][trie-actions-badge]][trie-actions-link] | [![Code Coverage][trie-coverage-badge]][trie-coverage-link] |
| [rlp][rlp-package] | [![NPM Package][rlp-npm-badge]][rlp-npm-link] | [![rlp Issues][rlp-issues-badge]][rlp-issues-link] | [![Actions Status][rlp-actions-badge]][rlp-actions-link] | [![Code Coverage][rlp-coverage-badge]][rlp-coverage-link] |
| [@ethereumjs/tx][tx-package] | [![NPM Package][tx-npm-badge]][tx-npm-link] | [![Tx Issues][tx-issues-badge]][tx-issues-link] | [![Actions Status][tx-actions-badge]][tx-actions-link] | [![Code Coverage][tx-coverage-badge]][tx-coverage-link] |
| [ethereumjs-util][util-package] | [![NPM Package][util-npm-badge]][util-npm-link] | [![Util Issues][util-issues-badge]][util-issues-link] | [![Actions Status][util-actions-badge]][util-actions-link] | [![Code Coverage][util-coverage-badge]][util-coverage-link] |
| [@ethereumjs/vm][vm-package] | [![NPM Package][vm-npm-badge]][vm-npm-link] | [![VM Issues][vm-issues-badge]][vm-issues-link] | [![Actions Status][vm-actions-badge]][vm-actions-link] | [![Code Coverage][vm-coverage-badge]][vm-coverage-link] |
| package | npm | issues | tests | coverage |
| ------------------------------------------------ | --------------------------------------------------------------- | ----------------------------------------------------------------------------- | -------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
| [@ethereumjs/block][block-package] | [![NPM Package][block-npm-badge]][block-npm-link] | [![Block Issues][block-issues-badge]][block-issues-link] | [![Actions Status][block-actions-badge]][block-actions-link] | [![Code Coverage][block-coverage-badge]][block-coverage-link] |
| [@ethereumjs/blockchain][blockchain-package] | [![NPM Package][blockchain-npm-badge]][blockchain-npm-link] | [![Blockchain Issues][blockchain-issues-badge]][blockchain-issues-link] | [![Actions Status][blockchain-actions-badge]][blockchain-actions-link] | [![Code Coverage][blockchain-coverage-badge]][blockchain-coverage-link] |
| [@ethereumjs/client][client-package] | [![NPM Package][client-npm-badge]][client-npm-link] | [![Client Issues][client-issues-badge]][client-issues-link] | [![Actions Status][client-actions-badge]][client-actions-link] | [![Code Coverage][client-coverage-badge]][client-coverage-link] |
| [@ethereumjs/common][common-package] | [![NPM Package][common-npm-badge]][common-npm-link] | [![Common Issues][common-issues-badge]][common-issues-link] | [![Actions Status][common-actions-badge]][common-actions-link] | [![Code Coverage][common-coverage-badge]][common-coverage-link] |
| [@ethereumjs/devp2p][devp2p-package] | [![NPM Package][devp2p-npm-badge]][devp2p-npm-link] | [![Devp2p Issues][devp2p-issues-badge]][devp2p-issues-link] | [![Actions Status][devp2p-actions-badge]][devp2p-actions-link] | [![Code Coverage][devp2p-coverage-badge]][devp2p-coverage-link] |
| [@ethereumjs/ethash][ethash-package] | [![NPM Package][ethash-npm-badge]][ethash-npm-link] | [![Ethash Issues][ethash-issues-badge]][ethash-issues-link] | [![Actions Status][ethash-actions-badge]][ethash-actions-link] | [![Code Coverage][ethash-coverage-badge]][ethash-coverage-link] |
| [merkle-patricia-tree][trie-package] | [![NPM Package][trie-npm-badge]][trie-npm-link] | [![Trie Issues][trie-issues-badge]][trie-issues-link] | [![Actions Status][trie-actions-badge]][trie-actions-link] | [![Code Coverage][trie-coverage-badge]][trie-coverage-link] |
| [rlp][rlp-package] | [![NPM Package][rlp-npm-badge]][rlp-npm-link] | [![rlp Issues][rlp-issues-badge]][rlp-issues-link] | [![Actions Status][rlp-actions-badge]][rlp-actions-link] | [![Code Coverage][rlp-coverage-badge]][rlp-coverage-link] |
| [@ethereumjs/statemanager][statemanager-package] | [![NPM Package][statemanager-npm-badge]][statemanager-npm-link] | [![StateManager Issues][statemanager-issues-badge]][statemanager-issues-link] | [![Actions Status][statemanager-actions-badge]][statemanager-actions-link] | [![Code Coverage][statemanager-coverage-badge]][statemanager-coverage-link] |
| [@ethereumjs/tx][tx-package] | [![NPM Package][tx-npm-badge]][tx-npm-link] | [![Tx Issues][tx-issues-badge]][tx-issues-link] | [![Actions Status][tx-actions-badge]][tx-actions-link] | [![Code Coverage][tx-coverage-badge]][tx-coverage-link] |
| [ethereumjs-util][util-package] | [![NPM Package][util-npm-badge]][util-npm-link] | [![Util Issues][util-issues-badge]][util-issues-link] | [![Actions Status][util-actions-badge]][util-actions-link] | [![Code Coverage][util-coverage-badge]][util-coverage-link] |
| [@ethereumjs/vm][vm-package] | [![NPM Package][vm-npm-badge]][vm-npm-link] | [![VM Issues][vm-issues-badge]][vm-issues-link] | [![Actions Status][vm-actions-badge]][vm-actions-link] | [![Code Coverage][vm-coverage-badge]][vm-coverage-link] |

## Coverage report

Expand All @@ -47,6 +48,7 @@ Detailed version can be seen on [Codecov.io][coverage-link]
trie --> client
trie --> vm
trie --> block
trie --> blockchain
common --> block
common --> blockchain
common --> tx
Expand All @@ -56,9 +58,12 @@ Detailed version can be seen on [Codecov.io][coverage-link]
tx --> block
tx --> vm
vm --> client
```
statemanager --> vm
common --> statemanager
trie --> statemanager
```

To update the diagram above edit the README file and open a new PR with the changes.
To update the diagram above edit the README file and open a new PR with the changes.

## Getting Started

Expand Down Expand Up @@ -170,6 +175,15 @@ Most packages are [MPL-2.0](<https://tldrlegal.com/license/mozilla-public-licens
[util-actions-link]: https://github.com/ethereumjs/ethereumjs-monorepo/actions?query=workflow%3A%22Util%22
[util-coverage-badge]: https://codecov.io/gh/ethereumjs/ethereumjs-monorepo/branch/master/graph/badge.svg?flag=util
[util-coverage-link]: https://codecov.io/gh/ethereumjs/ethereumjs-monorepo/tree/master/packages/util
[statemanager-package]: ./packages/statemanager
[statemanager-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/statemanager.svg
[statemanager-npm-link]: https://www.npmjs.com/package/@ethereumjs/statemanager
[statemanager-issues-badge]: https://img.shields.io/github/issues/ethereumjs/ethereumjs-monorepo/package:%20statemanager?label=issues
[statemanager-issues-link]: https://github.com/ethereumjs/ethereumjs-monorepo/issues?q=is%3Aopen+is%3Aissue+label%3A"package%3A+statemanager"
[statemanager-actions-badge]: https://github.com/ethereumjs/ethereumjs-monorepo/workflows/StateManager/badge.svg
[statemanager-actions-link]: https://github.com/ethereumjs/ethereumjs-monorepo/actions?query=workflow%3A%22StateManager%22
[statemanager-coverage-badge]: https://codecov.io/gh/ethereumjs/ethereumjs-monorepo/branch/master/graph/badge.svg?flag=statemanager
[statemanager-coverage-link]: https://codecov.io/gh/ethereumjs/ethereumjs-monorepo/tree/master/packages/statemanager
[vm-package]: ./packages/vm
[vm-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/vm.svg
[vm-npm-link]: https://www.npmjs.com/package/@ethereumjs/vm
Expand Down
3 changes: 2 additions & 1 deletion config/eslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint', 'implicit-dependencies', 'prettier'],
env: {
es6: true,
es2020: true,
node: true,
},
ignorePatterns: [
Expand Down Expand Up @@ -45,6 +45,7 @@ module.exports = {
'prettier/prettier': 'error',
'no-redeclare': 'off',
'@typescript-eslint/no-redeclare': ['error'],
'@typescript-eslint/restrict-plus-operands': 'off',
},
parserOptions: {
sourceType: 'module',
Expand Down
3 changes: 1 addition & 2 deletions config/tsconfig.browser.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"target": "es5",
"lib": ["dom", "es5"]
"lib": ["dom", "ES2020"]
}
}
4 changes: 2 additions & 2 deletions config/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"resolveJsonModule": true,
"downlevelIteration": true,
"strict": true,
"target": "ES2017",
"lib": ["es2018"]
"target": "es2020",
"lib": ["ES2020", "DOM"]
}
}
Loading