Expand common singleton config accees to lib/service/

Author: holgerd77

lib/node.ts

@@ -54,15 +54,15 @@ export default class Node extends events.EventEmitter {
             servers: this.servers,
             logger: this.logger,
             lightserv: options.lightserv,
-            common: this.config.common,
+            config: this.config,
             minPeers: options.minPeers,
             maxPeers: options.maxPeers,
             db: options.db,
           })
         : new LightEthereumService({
             servers: this.servers,
             logger: this.logger,
-            common: this.config.common,
+            config: this.config,
             minPeers: options.minPeers,
             maxPeers: options.maxPeers,
             db: options.db,

lib/service/ethereumservice.ts

@@ -1,11 +1,10 @@
 import { Service } from './service'
 import { FlowControl } from '../net/protocol/flowcontrol'
 import { Chain } from '../blockchain'
-import Common from '@ethereumjs/common'
+import { Config } from '../config'
 
 const defaultOptions = {
   lightserv: false,
-  common: new Common({ chain: 'mainnet', hardfork: 'chainstart' }),
   minPeers: 3,
   timeout: 8000,
   interval: 1000,
@@ -16,9 +15,10 @@ const defaultOptions = {
  * @memberof module:service
  */
 export class EthereumService extends Service {
+  public config: Config
+  
   public flow: FlowControl
   public chain: Chain
-  public common: Common
   public minPeers: number
   public interval: number
   public timeout: number
@@ -27,10 +27,10 @@ export class EthereumService extends Service {
   /**
    * Create new ETH service
    * @param {Object}   options constructor parameters
+   * @param {Config}   [options.config] Client configuration
    * @param {Server[]} options.servers servers to run service on
    * @param {Chain}    [options.chain] blockchain
    * @param {LevelDB}  [options.db=null] blockchain database
-   * @param {Common}   [options.common] ethereum network name
    * @param {number}   [options.minPeers=3] number of peers needed before syncing
    * @param {number}   [options.maxPeers=25] maximum peers allowed
    * @param {number}   [options.timeout] protocol timeout
@@ -41,9 +41,10 @@ export class EthereumService extends Service {
     options = { ...defaultOptions, ...options }
     super(options)
 
+    this.config = options.config || new Config()
+
     this.flow = new FlowControl(options)
     this.chain = options.chain || new Chain(options)
-    this.common = options.common
     this.minPeers = options.minPeers
     this.interval = options.interval
     this.timeout = options.timeout

lib/service/fastethereumservice.ts

@@ -18,10 +18,10 @@ export class FastEthereumService extends EthereumService {
   /**
    * Create new ETH service
    * @param {Object}   options constructor parameters
+   * @param {Config}   [options.config] Client configuration
    * @param {Server[]} options.servers servers to run service on
    * @param {boolean}  [options.lightserv=false] serve LES requests
    * @param {Chain}    [options.chain] blockchain
-   * @param {Common}   [options.common] ethereum network name
    * @param {number}   [options.minPeers=3] number of peers needed before syncing
    * @param {number}   [options.maxPeers=25] maximum peers allowed
    * @param {number}   [options.interval] sync retry interval
@@ -40,7 +40,7 @@ export class FastEthereumService extends EthereumService {
       logger: this.logger,
       pool: this.pool,
       chain: this.chain,
-      common: this.common,
+      common: this.config.common,
       minPeers: this.minPeers,
       interval: this.interval,
     })

lib/service/lightethereumservice.ts

@@ -11,9 +11,9 @@ export class LightEthereumService extends EthereumService {
   /**
    * Create new ETH service
    * @param {Object}   options constructor parameters
+   * @param {Config}   [options.config] Client configuration
    * @param {Server[]} options.servers servers to run service on
    * @param {Chain}    [options.chain] blockchain
-   * @param {Common}   [options.common] ethereum network name
    * @param {number}   [options.minPeers=3] number of peers needed before syncing
    * @param {number}   [options.maxPeers=25] maximum peers allowed
    * @param {number}   [options.interval] sync retry interval
@@ -30,7 +30,7 @@ export class LightEthereumService extends EthereumService {
       logger: this.logger,
       pool: this.pool,
       chain: this.chain,
-      common: this.common,
+      common: this.config.common,
       minPeers: this.minPeers,
       flow: this.flow,
       interval: this.interval,