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

VM v5 changes #767

Merged
merged 16 commits into from
Jun 10, 2020
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/account-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ jobs:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1

- run: npx lerna bootstrap --scope ethereumjs-account --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-account --include-dependencies
- run: npx lerna run lint --scope ethereumjs-account

- run: npx lerna run coverage --scope ethereumjs-account
- run: npx lerna bootstrap --scope @ethereumjs/account --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/account --include-dependencies
- run: npx lerna run lint --scope @ethereumjs/account
- run: npx lerna run coverage --scope @ethereumjs/account

- uses: codecov/codecov-action@v1
with:
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/block-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1

- run: npm install
working-directory: ${{ env.cwd }}

- run: npx lerna run lint --scope ethereumjs-block

- run: npm run coverage
working-directory: ${{ env.cwd }}

- run: npx lerna bootstrap --scope @ethereumjs/block --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/block --include-dependencies
- run: npx lerna run lint --scope @ethereumjs/block
- run: npx lerna run coverage --scope @ethereumjs/block
- run: npx lerna run test:browser --scope @ethereumjs/block

- uses: codecov/codecov-action@v1
with:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/blockchain-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ jobs:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1

- run: npx lerna bootstrap --scope ethereumjs-blockchain --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-blockchain --include-dependencies
- run: npx lerna run lint --scope ethereumjs-blockchain

- run: npx lerna run coverage --scope ethereumjs-blockchain
- run: npx lerna bootstrap --scope @ethereumjs/blockchain --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/blockchain --include-dependencies
- run: npx lerna run lint --scope @ethereumjs/blockchain
- run: npx lerna run coverage --scope @ethereumjs/blockchain

- uses: codecov/codecov-action@v1
with:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/common-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ jobs:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1

- run: npx lerna bootstrap --scope ethereumjs-common --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-common --include-dependencies
- run: npx lerna run lint --scope ethereumjs-common

- run: npx lerna run coverage --scope ethereumjs-common
- run: npx lerna bootstrap --scope @ethereumjs/common --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/common --include-dependencies
- run: npx lerna run lint --scope @ethereumjs/common
- run: npx lerna run coverage --scope @ethereumjs/common

- uses: codecov/codecov-action@v1
with:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/tx-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ jobs:
node-version: ${{ matrix.node-version }}
- uses: actions/checkout@v1

- run: npx lerna bootstrap --scope ethereumjs-tx --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-tx --include-dependencies
- run: npx lerna run lint --scope ethereumjs-tx

- run: npx lerna run coverage --scope ethereumjs-tx
- run: npx lerna bootstrap --scope @ethereumjs/tx --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/tx --include-dependencies
- run: npx lerna run lint --scope @ethereumjs/tx
- run: npx lerna run coverage --scope @ethereumjs/tx

- uses: codecov/codecov-action@v1
with:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/vm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
with:
node-version: 12.x
- uses: actions/checkout@v1
- run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-vm --include-dependencies
- run: npx lerna run lint --scope ethereumjs-vm
- run: npx lerna run test:API --scope ethereumjs-vm
- run: npx lerna run test:API:browser --scope ethereumjs-vm
- run: npx lerna bootstrap --scope @ethereumjs/vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/vm --include-dependencies
- run: npx lerna run lint --scope @ethereumjs/vm
- run: npx lerna run test:API --scope @ethereumjs/vm
- run: npx lerna run test:API:browser --scope @ethereumjs/vm
test-vm-state:
runs-on: ubuntu-latest
env:
Expand All @@ -31,10 +31,10 @@ jobs:
with:
node-version: 12.x
- uses: actions/checkout@v1
- run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-vm --include-dependencies
- run: npx lerna run test:state:selectedForks --scope ethereumjs-vm
- run: npx lerna run coverage --scope ethereumjs-vm
- run: npx lerna bootstrap --scope @ethereumjs/vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/vm --include-dependencies
- run: npx lerna run test:state:selectedForks --scope @ethereumjs/vm
- run: npx lerna run coverage --scope @ethereumjs/vm
- uses: codecov/codecov-action@v1
with:
file: ${{ env.cwd }}/coverage/lcov.info
Expand All @@ -48,6 +48,6 @@ jobs:
with:
node-version: 12.x
- uses: actions/checkout@v1
- run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-vm --include-dependencies
- run: npx lerna run test:blockchain --scope ethereumjs-vm
- run: npx lerna bootstrap --scope @ethereumjs/vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/vm --include-dependencies
- run: npx lerna run test:blockchain --scope @ethereumjs/vm
26 changes: 13 additions & 13 deletions .github/workflows/vm-nightly-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
with:
node-version: 12.x
- uses: actions/checkout@v1
- run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-vm --include-dependencies
- run: npx lerna run test:API --scope ethereumjs-vm
- run: npx lerna run test:API:browser --scope ethereumjs-vm
- run: npx lerna bootstrap --scope @ethereumjs/vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/vm --include-dependencies
- run: npx lerna run test:API --scope @ethereumjs/vm
- run: npx lerna run test:API:browser --scope @ethereumjs/vm
test-vm-state:
runs-on: ubuntu-latest
env:
Expand All @@ -25,9 +25,9 @@ jobs:
with:
node-version: 12.x
- uses: actions/checkout@v1
- run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-vm --include-dependencies
- run: npx lerna run test:state:allForks --scope ethereumjs-vm
- run: npx lerna bootstrap --scope @ethereumjs/vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/vm --include-dependencies
- run: npx lerna run test:state:allForks --scope @ethereumjs/vm
test-vm-blockchain:
runs-on: ubuntu-latest
env:
Expand All @@ -37,9 +37,9 @@ jobs:
with:
node-version: 12.x
- uses: actions/checkout@v1
- run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-vm --include-dependencies
- run: npx lerna run test:blockchain --scope ethereumjs-vm
- run: npx lerna bootstrap --scope @ethereumjs/vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/vm --include-dependencies
- run: npx lerna run test:blockchain --scope @ethereumjs/vm
test-vm-slow:
runs-on: ubuntu-latest
env:
Expand All @@ -49,6 +49,6 @@ jobs:
with:
node-version: 12.x
- uses: actions/checkout@v1
- run: npx lerna bootstrap --scope ethereumjs-vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope ethereumjs-vm --include-dependencies
- run: npx lerna run test:state:slow --scope ethereumjs-vm
- run: npx lerna bootstrap --scope @ethereumjs/vm --ignore-scripts --include-dependencies --no-ci
- run: npx lerna run build --scope @ethereumjs/vm --include-dependencies
- run: npx lerna run test:state:slow --scope @ethereumjs/vm
36 changes: 18 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ This was originally the EthereumJS VM repository. On Q1 2020 we brought some of

| package | npm | issues | tests | coverage |
| ------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------------------- | ---------------------------------------------------------------------- | ----------------------------------------------------------------------- |
| [ethereumjs-account][account-package] | [![NPM Package][account-npm-badge]][account-npm-link] | [![Account Issues][account-issues-badge]][account-issues-link] | [![Actions Status][account-actions-badge]][account-actions-link] | [![Code Coverage][account-coverage-badge]][account-coverage-link] |
| [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-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-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-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] |
| [@ethereumjs/account][account-package] | [![NPM Package][account-npm-badge]][account-npm-link] | [![Account Issues][account-issues-badge]][account-issues-link] | [![Actions Status][account-actions-badge]][account-actions-link] | [![Code Coverage][account-coverage-badge]][account-coverage-link] |
| [@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/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/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/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 Down Expand Up @@ -72,53 +72,53 @@ If you want to join for work or do improvements on the libraries have a look at
[js-standard-style-badge]: https://cdn.rawgit.com/feross/standard/master/badge.svg
[js-standard-style-link]: https://github.com/feross/standard
[account-package]: ./packages/account
[account-npm-badge]: https://img.shields.io/npm/v/ethereumjs-account.svg
[account-npm-link]: https://www.npmjs.org/package/ethereumjs-account
[account-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/account.svg
[account-npm-link]: https://www.npmjs.org/package/@ethereumjs/account
[account-issues-badge]: https://img.shields.io/github/issues/ethereumjs/ethereumjs-vm/package:%20account?label=issues
[account-issues-link]: https://github.com/ethereumjs/ethereumjs-vm/issues?q=is%3Aopen+is%3Aissue+label%3A"package%3A+account"
[account-actions-badge]: https://github.com/ethereumjs/ethereumjs-vm/workflows/Account%20Test/badge.svg
[account-actions-link]: https://github.com/ethereumjs/ethereumjs-vm/actions?query=workflow%3A%22Account+Test%22
[account-coverage-badge]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/branch/master/graph/badge.svg?flag=account
[account-coverage-link]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/tree/master/packages/account
[block-package]: ./packages/block
[block-npm-badge]: https://img.shields.io/npm/v/ethereumjs-block.svg
[block-npm-link]: https://www.npmjs.org/package/ethereumjs-block
[block-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/block.svg
[block-npm-link]: https://www.npmjs.org/package/@ethereumjs/block
[block-issues-badge]: https://img.shields.io/github/issues/ethereumjs/ethereumjs-vm/package:%20block?label=issues
[block-issues-link]: https://github.com/ethereumjs/ethereumjs-vm/issues?q=is%3Aopen+is%3Aissue+label%3A"package%3A+block"
[block-actions-badge]: https://github.com/ethereumjs/ethereumjs-vm/workflows/Block%20Test/badge.svg
[block-actions-link]: https://github.com/ethereumjs/ethereumjs-vm/actions?query=workflow%3A%22Block+Test%22
[block-coverage-badge]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/branch/master/graph/badge.svg?flag=block
[block-coverage-link]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/tree/master/packages/block
[blockchain-package]: ./packages/blockchain
[blockchain-npm-badge]: https://img.shields.io/npm/v/ethereumjs-blockchain.svg
[blockchain-npm-link]: https://www.npmjs.org/package/ethereumjs-blockchain
[blockchain-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/blockchain.svg
[blockchain-npm-link]: https://www.npmjs.org/package/@ethereumjs/blockchain
[blockchain-issues-badge]: https://img.shields.io/github/issues/ethereumjs/ethereumjs-vm/package:%20blockchain?label=issues
[blockchain-issues-link]: https://github.com/ethereumjs/ethereumjs-vm/issues?q=is%3Aopen+is%3Aissue+label%3A"package%3A+blockchain"
[blockchain-actions-badge]: https://github.com/ethereumjs/ethereumjs-vm/workflows/Blockchain%20Test/badge.svg
[blockchain-actions-link]: https://github.com/ethereumjs/ethereumjs-vm/actions?query=workflow%3A%22Blockchain+Test%22
[blockchain-coverage-badge]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/branch/master/graph/badge.svg?flag=blockchain
[blockchain-coverage-link]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/tree/master/packages/blockchain
[common-package]: ./packages/common
[common-npm-badge]: https://img.shields.io/npm/v/ethereumjs-common.svg
[common-npm-link]: https://www.npmjs.org/package/ethereumjs-common
[common-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/common.svg
[common-npm-link]: https://www.npmjs.org/package/@ethereumjs/common
[common-issues-badge]: https://img.shields.io/github/issues/ethereumjs/ethereumjs-vm/package:%20common?label=issues
[common-issues-link]: https://github.com/ethereumjs/ethereumjs-vm/issues?q=is%3Aopen+is%3Aissue+label%3A"package%3A+common"
[common-actions-badge]: https://github.com/ethereumjs/ethereumjs-vm/workflows/Common%20Test/badge.svg
[common-actions-link]: https://github.com/ethereumjs/ethereumjs-vm/actions?query=workflow%3A%22Common+Test%22
[common-coverage-badge]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/branch/master/graph/badge.svg?flag=common
[common-coverage-link]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/tree/master/packages/common
[tx-package]: ./packages/tx
[tx-npm-badge]: https://img.shields.io/npm/v/ethereumjs-tx.svg
[tx-npm-link]: https://www.npmjs.org/package/ethereumjs-tx
[tx-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/tx.svg
[tx-npm-link]: https://www.npmjs.org/package/@ethereumjs/tx
[tx-issues-badge]: https://img.shields.io/github/issues/ethereumjs/ethereumjs-vm/package:%20tx?label=issues
[tx-issues-link]: https://github.com/ethereumjs/ethereumjs-vm/issues?q=is%3Aopen+is%3Aissue+label%3A"package%3A+tx"
[tx-actions-badge]: https://github.com/ethereumjs/ethereumjs-vm/workflows/Tx%20Test/badge.svg
[tx-actions-link]: https://github.com/ethereumjs/ethereumjs-vm/actions?query=workflow%3A%22Tx+Test%22
[tx-coverage-badge]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/branch/master/graph/badge.svg?flag=tx
[tx-coverage-link]: https://codecov.io/gh/ethereumjs/ethereumjs-vm/tree/master/packages/tx
[vm-package]: ./packages/vm
[vm-npm-badge]: https://img.shields.io/npm/v/ethereumjs-vm.svg
[vm-npm-link]: https://www.npmjs.org/package/ethereumjs-vm
[vm-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/vm.svg
[vm-npm-link]: https://www.npmjs.org/package/@ethereumjs/vm
[vm-issues-badge]: https://img.shields.io/github/issues/ethereumjs/ethereumjs-vm/package:%20vm?label=issues
[vm-issues-link]: https://github.com/ethereumjs/ethereumjs-vm/issues?q=is%3Aopen+is%3Aissue+label%3A"package%3A+vm"
[vm-actions-badge]: https://github.com/ethereumjs/ethereumjs-vm/workflows/VM%20Test/badge.svg
Expand Down
7 changes: 1 addition & 6 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,5 @@
"packages": [
"packages/*"
],
"version": "0.0.0",
"command": {
"bootstrap": {
"ignore": "ethereumjs-block"
}
}
"version": "0.0.0"
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
}
},
"scripts": {
"bootstrap": "lerna bootstrap --ignore-scripts && lerna exec npm i --scope=ethereumjs-block",
"bootstrap": "lerna bootstrap --ignore-scripts",
"postinstall": "npm run bootstrap",
"build:all": "lerna run build",
"lint": "lerna run lint"
}
}
Loading