Added datadir to Config, new getSyncDataDir() Config method

Author: holgerd77

bin/cli.ts

@@ -10,7 +10,6 @@ import { Config } from '../lib/config'
 import Common from '@ethereumjs/common'
 const RPCManager = require('../lib/rpc')
 const level = require('level')
-const os = require('os')
 const path = require('path')
 const fs = require('fs-extra')
 
@@ -39,7 +38,7 @@ const args = require('yargs')
     },
     datadir: {
       describe: 'Data directory for the blockchain',
-      default: `${os.homedir()}/Library/Ethereum`,
+      default: Config.DATADIR_DEFAULT,
     },
     transports: {
       describe: 'Network transports',
@@ -115,15 +114,13 @@ function runRpcServer(node: any, options: any) {
 }
 
 async function run() {
-  const syncDirName = args.syncmode === 'light' ? 'lightchaindata' : 'chaindata'
   // give network id precedence over network name
   if (args.networkId) {
     const network = networks.find((n) => n[0] === `${args.networkId}`)
     if (network) {
       args.network = network[1]
     }
   }
-  const networkDirName = args.network === 'mainnet' ? '' : `${args.network}/`
 
   const common = new Common({ chain: args.network, hardfork: 'chainstart' })
   const config = new Config({
@@ -146,15 +143,16 @@ async function run() {
     }
     return new Server({ config, ...t.options })
   })
-  const dataDir = `${args.datadir}/${networkDirName}ethereumjs/${syncDirName}`
+
   config.servers = servers
 
-  fs.ensureDirSync(dataDir)
-  logger.info(`Data directory: ${dataDir}`)
+  const syncDataDir = config.getSyncDataDirectory()
+  fs.ensureDirSync(syncDataDir)
+  logger.info(`Sync data directory: ${syncDataDir}`)
 
   const options = {
     config,
-    db: level(dataDir),
+    db: level(syncDataDir),
     rpcport: args.rpcport,
     rpcaddr: args.rpcaddr,
   }

lib/config.ts

@@ -1,3 +1,4 @@
+const os = require('os')
 import Common from '@ethereumjs/common'
 import { Logger } from 'winston'
 import { defaultLogger } from './logging'
@@ -34,6 +35,10 @@ export interface Options {
    * Default: false
    */
   lightserv?: boolean
+  /**
+   * Root data directory for the blockchain
+   */
+  datadir?: string
   /**
    * Number of peers needed before syncing
    *
@@ -54,6 +59,7 @@ export class Config {
   public servers: (RlpxServer | Libp2pServer)[]
   public syncmode: string
   public lightserv: boolean
+  public datadir: string
   public minPeers: number
   public maxPeers: number
 
@@ -62,6 +68,7 @@ export class Config {
   public static readonly SERVERS_DEFAULT = []
   public static readonly SYNCMODE_DEFAULT = 'fast'
   public static readonly LIGHTSERV_DEFAULT = false
+  public static readonly DATADIR_DEFAULT = `${os.homedir()}/Library/Ethereum`
   public static readonly MINPEERS_DEFAULT = 2
   public static readonly MAXPEERS_DEFAULT = 25
 
@@ -76,7 +83,21 @@ export class Config {
     this.servers = options.servers ?? Config.SERVERS_DEFAULT
     this.syncmode = options.syncmode ?? Config.SYNCMODE_DEFAULT
     this.lightserv = options.lightserv ?? Config.LIGHTSERV_DEFAULT
+    this.datadir = options.datadir ?? Config.DATADIR_DEFAULT
     this.minPeers = options.minPeers ?? Config.MINPEERS_DEFAULT
     this.maxPeers = options.maxPeers ?? Config.MAXPEERS_DEFAULT
   }
+
+  /**
+   * Returns the directory for storing the client sync data
+   * based on syncmode and selected chain (subdirectory of 'datadir')
+   */
+  getSyncDataDirectory(): string {
+    const syncDirName = this.syncmode === 'light' ? 'lightchaindata' : 'chaindata'
+    const chain = this.common.chainName()
+    const networkDirName = chain === 'mainnet' ? '' : `${chain}/`
+
+    const dataDir = `${this.datadir}/${networkDirName}ethereumjs/${syncDirName}`
+    return dataDir
+  }
 }