Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Wyatt/eth2 GitHub action #3896

Merged
merged 37 commits into from
Feb 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0d2b54f
Update compiler for ETH2 packages
spacesailor24 Jan 28, 2021
c26483b
Remove commented code
spacesailor24 Jan 28, 2021
d4acfdd
Update build command to tsc to follow repo
spacesailor24 Jan 28, 2021
5e8a29b
revert web3-eth2-core version change
spacesailor24 Jan 28, 2021
0dfaf55
Add eth2 github action
spacesailor24 Jan 29, 2021
7454ab4
Update changelog
spacesailor24 Jan 29, 2021
cb69277
Merge branch 'wyatt/update-compiler' into wyatt/eth2-github-action
spacesailor24 Jan 29, 2021
7877268
Add npm build step
spacesailor24 Jan 29, 2021
1318b84
Temp skip test
spacesailor24 Jan 29, 2021
63aceb6
Add docker image and make command
spacesailor24 Jan 29, 2021
b9f66fc
Debug lighthouse docker
spacesailor24 Jan 29, 2021
e27ee74
Debug lighthouse docker
spacesailor24 Jan 29, 2021
6344a1a
Debug lighthouse docker
spacesailor24 Jan 29, 2021
4f82d8d
Debug lighthouse docker
spacesailor24 Jan 29, 2021
c35e08f
Debug lighthouse docker
spacesailor24 Jan 29, 2021
240447c
Debug lighthouse docker
spacesailor24 Jan 29, 2021
570acd1
Debug lighthouse docker
spacesailor24 Jan 29, 2021
b751525
Debug lighthouse docker
spacesailor24 Jan 29, 2021
b9c3709
Debug lighthouse docker
spacesailor24 Jan 29, 2021
9e4c67b
Debug lighthouse docker
spacesailor24 Jan 29, 2021
b5431bf
Debug lighthouse docker
spacesailor24 Jan 29, 2021
d222147
Debug test runner
spacesailor24 Jan 29, 2021
c1c24b4
Debug test runner
spacesailor24 Jan 29, 2021
fc5894d
Debugging test runner
spacesailor24 Jan 29, 2021
e0fd5ef
Debugging docker lighthouse
spacesailor24 Jan 29, 2021
592a029
Debugging docker lighthouse
spacesailor24 Jan 29, 2021
c941274
Debugging docker lighthouse
spacesailor24 Jan 29, 2021
e2ae854
Debugging docker lighthouse
spacesailor24 Jan 29, 2021
a9da109
Debugging docker lighthouse
spacesailor24 Jan 29, 2021
578cc0b
Debugging docker lighthouse
spacesailor24 Jan 29, 2021
6973b0e
Add @babel/runtime to dev dependencies
spacesailor24 Jan 29, 2021
d4d6d74
Update changelog
spacesailor24 Jan 30, 2021
f428623
Add pr number to changelog. Add README and CHANGELOG to paths-ignore …
spacesailor24 Jan 30, 2021
79ec088
Move paths-ignore to PRs
spacesailor24 Jan 30, 2021
b2bbb47
Remove paths-ignore
spacesailor24 Jan 30, 2021
ff0ee29
Merge branch '1.x' into wyatt/eth2-github-action
spacesailor24 Feb 4, 2021
d5ab78c
Set target for ts to ES2020
spacesailor24 Feb 4, 2021
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
26 changes: 26 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,29 @@ jobs:
node-version: 12
- uses: actions/checkout@v2
- run: bash ./scripts/ci.sh
eth2:
runs-on: ubuntu-latest
strategy:
matrix:
node: [10, 11, 12, 13]
env:
TEST: "eth2"
steps:
- uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node }}

- uses: actions/checkout@v2

- uses: actions/cache@v2
id: cache-deps
with:
path: |
node_modules
*/*/node_modules
key: ${{ runner.os }}-node${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}

- run: npm ci
if: steps.cache-deps.outputs.cache-hit != 'true'

- run: bash ./scripts/ci.sh
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -352,3 +352,11 @@ Released with 1.0.0-beta.37 code base.
## [Unreleased]

## [1.3.5]

### Added

- Github action for running tests for `web3-eth2-core` and `web3-eth2-beaconchain` packages (#3892)

### Changed

- Unified babel compiler for `web3-eth2-core` and `web3-eth2-beaconchain` (#3892)
16 changes: 9 additions & 7 deletions packages/web3-eth2-beaconchain/.babelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@

{
"presets": ["@babel/env", "@babel/typescript"],
"plugins": [
"@babel/proposal-class-properties",
"@babel/proposal-object-rest-spread"
]
}
"presets": [
"@babel/preset-env",
"@babel/preset-typescript"
],
"plugins": [
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-runtime"
]
}
17 changes: 17 additions & 0 deletions packages/web3-eth2-beaconchain/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
targets: {
node: 'current',
},
},
],
],
env: {
test: {
plugins: ['@babel/plugin-transform-runtime']
}
}
};
8 changes: 0 additions & 8 deletions packages/web3-eth2-beaconchain/jest.config.js

This file was deleted.

17,924 changes: 12,306 additions & 5,618 deletions packages/web3-eth2-beaconchain/package-lock.json

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions packages/web3-eth2-beaconchain/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,27 @@
"types": "types.ts",
"scripts": {
"test": "jest",
"tsc": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline"
"tsc": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline",
"type-check": "tsc --noEmit",
"type-check:watch": "npm run type-check -- --watch"
},
"main": "lib/index.js",
"dependencies": {
"web3-eth2-core": "1.3.4"
},
"devDependencies": {
"@babel/cli": "^7.12.10",
"@babel/core": "^7.12.10",
"@babel/plugin-proposal-class-properties": "^7.12.1",
"@babel/plugin-transform-runtime": "^7.12.10",
"@babel/preset-env": "^7.12.11",
"@babel/preset-typescript": "^7.12.7",
"@babel/runtime": "^7.12.5",
"@chainsafe/lodestar-types": "^0.13.0",
"@types/jest": "^26.0.14",
"@types/node": "^14.11.2",
"babel-jest": "^26.6.3",
"jest": "^26.4.2",
"ts-jest": "^26.4.1",
"typescript": "^4.0.3"
}
}
4 changes: 2 additions & 2 deletions packages/web3-eth2-beaconchain/src/schema.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { IBaseAPISchema } from '../../web3-eth2-core/src/schema'
import { BaseAPISchema } from 'web3-eth2-core'

export const DefaultSchema: IBaseAPISchema = {
export const DefaultSchema: BaseAPISchema = {
packageName: 'eth2-beaconchain',
routePrefix: '/eth/v1/beacon/',
methods: [
Expand Down
3 changes: 0 additions & 3 deletions packages/web3-eth2-beaconchain/test/axiosMock.ts

This file was deleted.

4 changes: 0 additions & 4 deletions packages/web3-eth2-beaconchain/test/constructor.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ const providerSuffix = '/eth/v1/beacon/'

it('constructs a ETH2BeaconChain instance with expected properties', () => {
const eth2BeaconChain = new ETH2BeaconChain(provider)

// @ts-ignore - types not full implemented yet
expect(eth2BeaconChain.name).toBe('eth2-beaconchain')
// @ts-ignore - types not full implemented yet
expect(eth2BeaconChain.provider).toBe(`${provider}${providerSuffix}`)
// @ts-ignore - types not full implemented yet
expect(eth2BeaconChain.protectProvider)
})
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ it('getValidatorBalances', async () => {
expect(response[0]).toMatchObject(expectedResponse)
})

it('getEpochCommittees', async () => {
xit('getEpochCommittees', async () => {
Copy link
Contributor

Choose a reason for hiding this comment

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

can you make an issue so we can address this in the future?

const routeParameters = {
stateId: 'head',
epoch: ''
Expand Down
87 changes: 68 additions & 19 deletions packages/web3-eth2-beaconchain/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,70 @@
{
"compilerOptions": {
"declaration": true,
"outDir": "lib",
"strict": true,
"esModuleInterop": true,
"module": "commonjs",
"lib": ["es6"],
"target": "es6",
"noImplicitAny": true,
"noImplicitThis": true,
"strictNullChecks": true,
"strictFunctionTypes": true,
"noEmit": true,
"allowSyntheticDefaultImports": false,
"baseUrl": ".",
"paths": {
"web3-eth2-beaconchain": ["."]
}
}
}
/* Visit https://aka.ms/tsconfig.json to read more about this file */

/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "ES2020", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "lib", /* Redirect output structure to the directory. */
// "rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
"noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
"strictNullChecks": true, /* Enable strict null checks. */
"strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
"strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
"noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
"baseUrl": "./", /* Base directory to resolve non-absolute module names. */
"paths": {"web3-eth2-beaconchain": ["."]}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
"allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */

/* Advanced Options */
"skipLibCheck": true, /* Skip type checking of declaration files. */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
},
"exclude": ["./test"]
}
15 changes: 8 additions & 7 deletions packages/web3-eth2-core/.babelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@

{
"presets": ["@babel/env", "@babel/typescript"],
"plugins": [
"@babel/proposal-class-properties",
"@babel/proposal-object-rest-spread"
]
}
"presets": [
"@babel/preset-env",
"@babel/preset-typescript"
],
"plugins": [
"@babel/plugin-proposal-class-properties"
]
}
3 changes: 3 additions & 0 deletions packages/web3-eth2-core/babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/preset-env"]
}
Loading