Merge pull request #181 from ethereumjs/fix-ci-and-improvements

Upgrade to monorepo beta.2 libraries, other improvements

Author: ryanio

.github/workflows/build.yml

@@ -21,9 +21,9 @@ jobs:
       - uses: actions/checkout@v2
       - run: npm install
       - run: npm run lint
-      - run: npm run build
       - run: npm run coverage
       - uses: codecov/codecov-action@v1
+        if: matrix.node-version == 12
         with:
           file: ./coverage/lcov.info
   test-browser:

karma.conf.js

@@ -2,19 +2,19 @@ module.exports = function (config) {
   config.set({
     frameworks: ['karma-typescript', 'tap'],
 
-    files: ['test/**/*.ts', 'lib/**/*.ts'],
+    files: ['lib/**/*.ts', 'test/blockchain/chain.spec.ts'],
 
     preprocessors: {
-      '**/*.ts': ['karma-typescript']
+      '**/*.ts': ['karma-typescript'],
     },
 
     reporters: ['progress'],
 
     karmaTypescriptConfig: {
       bundlerOptions: {
-        entrypoints: /\.spec\.ts$/
+        entrypoints: /\.spec\.ts$/,
       },
-      tsconfig: "./tsconfig.karma.json",
+      tsconfig: './tsconfig.karma.json',
     },
 
     browsers: ['FirefoxHeadless', 'ChromeHeadless'],
@@ -31,6 +31,6 @@ module.exports = function (config) {
 
     // Fail after timeout
     browserDisconnectTimeout: 100000,
-    browserNoActivityTimeout: 100000
+    browserNoActivityTimeout: 100000,
   })
 }

lib/blockchain/chain.ts

@@ -12,7 +12,7 @@ export interface ChainOptions {
   /**
    * Client configuration instance
    */
-  config?: Config
+  config: Config
 
   /**
    * Database to store blocks and metadata. Should be an abstract-leveldown compliant store.
@@ -99,18 +99,18 @@ export class Chain extends EventEmitter {
    * Create new chain
    * @param {ChainOptions} options
    */
-  constructor(options: ChainOptions = {}) {
+  constructor(options: ChainOptions) {
     super()
 
-    this.config = options.config ?? new Config()
+    this.config = options.config
 
     this.blockchain =
       options.blockchain ??
       new Blockchain({
         db: options.db,
         common: this.config.common,
         validateBlocks: false,
-        validatePow: false,
+        validateConsensus: false,
       })
 
     this.db = this.blockchain.db
@@ -324,6 +324,6 @@ export class Chain extends EventEmitter {
    */
   async getTd(hash: Buffer, num: BN): Promise<BN> {
     await this.open()
-    return this.blockchain._getTd(hash, num)
+    return (this.blockchain as any)._getTd(hash, num)
   }
 }

lib/logging.ts

@@ -1,16 +1,17 @@
 import chalk from 'chalk'
 import { createLogger, format, transports, Logger as WinstonLogger } from 'winston'
-const { combine, timestamp, label, printf } = format
 
 export type Logger = WinstonLogger
 
-const levelColors: any = {
+const levelColors = {
   error: 'red',
   warn: 'yellow',
   info: 'green',
   debug: 'white',
 }
 
+const { combine, timestamp, label, printf } = format
+
 const errorFormat = format((info: any) => {
   if (info.message instanceof Error && info.message.stack) {
     info.message = info.message.stack

lib/net/peer/libp2pnode.ts

@@ -41,7 +41,6 @@ export class Libp2pNode extends LibP2p {
         dht: {
           kBucketSize: 20,
         },
-        // @ts-ignore: 'EXPERIMENTAL' does not exist in type 'OptionsConfig'
         EXPERIMENTAL: {
           dht: false,
           pubsub: false,

lib/net/peer/libp2ppeer.ts

@@ -39,7 +39,7 @@ export class Libp2pPeer extends Peer {
    * Create new libp2p peer
    * @param {Libp2pPeerOptions}
    */
-  constructor(options: Libp2pPeerOptions = {}) {
+  constructor(options: Libp2pPeerOptions) {
     options.multiaddrs = options.multiaddrs
       ? parseMultiaddrs(options.multiaddrs)
       : ['/ip4/0.0.0.0/tcp/0']

lib/net/peer/peer.ts

@@ -5,7 +5,7 @@ import { Config } from '../../config'
 
 export interface PeerOptions {
   /* Config */
-  config?: Config
+  config: Config
 
   /* Peer id */
   id?: string
@@ -52,7 +52,7 @@ export class Peer extends events.EventEmitter {
   constructor(options: PeerOptions) {
     super()
 
-    this.config = options.config ?? new Config()
+    this.config = options.config
 
     this.id = options.id ?? ''
     this.address = options.address

lib/net/server/index.ts

@@ -1,6 +1,6 @@
-export { Server } from './server'
-export { RlpxServer } from './rlpxserver'
-export { Libp2pServer } from './libp2pserver'
+export * from './server'
+export * from './rlpxserver'
+export * from './libp2pserver'
 
 /**
  * @module net/server

lib/net/server/server.ts

@@ -6,7 +6,7 @@ import { Protocol } from '../protocol/protocol'
 
 export interface ServerOptions {
   /* Config */
-  config?: Config
+  config: Config
 
   /* How often (in ms) to discover new peers (default: 30000) */
   refreshInterval?: number
@@ -39,7 +39,7 @@ export class Server extends EventEmitter {
   constructor(options: ServerOptions) {
     super()
 
-    this.config = options.config ?? new Config()
+    this.config = options.config
     this.key = options.key ? parseKey(options.key) : undefined
     this.bootnodes = options.bootnodes ? parseBootnodes(options.bootnodes) : []
     this.refreshInterval = options.refreshInterval ?? 30000

lib/service/service.ts

@@ -6,7 +6,7 @@ import { Protocol } from '../net/protocol'
 
 export interface ServiceOptions {
   /* Config */
-  config?: Config
+  config: Config
 }
 
 /**
@@ -26,7 +26,7 @@ export class Service extends events.EventEmitter {
   constructor(options: ServiceOptions) {
     super()
 
-    this.config = options.config ?? new Config()
+    this.config = options.config
 
     this.opened = false
     this.running = false