Collapse EthereumService abstraction service (#2943)

* Collapse ethereumservice into service

* Clean up ethereumservice references

packages/client/src/rpc/modules/admin.ts

@@ -6,7 +6,7 @@ import { middleware } from '../validation'
 import type { Chain } from '../../blockchain'
 import type { EthereumClient } from '../../client'
 import type { RlpxServer } from '../../net/server'
-import type { EthereumService } from '../../service'
+import type { Service } from '../../service'
 
 /**
  * admin_* RPC module
@@ -21,7 +21,7 @@ export class Admin {
    * @param client Client to which the module binds
    */
   constructor(client: EthereumClient) {
-    const service = client.services.find((s) => s.name === 'eth') as EthereumService
+    const service = client.services.find((s) => s.name === 'eth') as Service
     this._chain = service.chain
     this._client = client
 

packages/client/src/rpc/modules/eth.ts

@@ -19,7 +19,7 @@ import type { EthereumClient } from '../..'
 import type { Chain } from '../../blockchain'
 import type { ReceiptsManager } from '../../execution/receipt'
 import type { EthProtocol } from '../../net/protocol'
-import type { EthereumService, FullEthereumService } from '../../service'
+import type { FullEthereumService, Service } from '../../service'
 import type { RpcTx } from '../types'
 import type { Block, JsonRpcBlock } from '@ethereumjs/block'
 import type { Log } from '@ethereumjs/evm'
@@ -203,7 +203,7 @@ const jsonRpcReceipt = async (
  */
 export class Eth {
   private client: EthereumClient
-  private service: EthereumService
+  private service: Service
   private receiptsManager: ReceiptsManager | undefined
   private _chain: Chain
   private _vm: VM | undefined
@@ -215,7 +215,7 @@ export class Eth {
    */
   constructor(client: EthereumClient) {
     this.client = client
-    this.service = client.services.find((s) => s.name === 'eth') as EthereumService
+    this.service = client.services.find((s) => s.name === 'eth') as Service
     this._chain = this.service.chain
     this._vm = (this.service as FullEthereumService).execution?.vm
     this.receiptsManager = (this.service as FullEthereumService).execution?.receiptsManager

packages/client/src/rpc/modules/net.ts

@@ -5,7 +5,7 @@ import { middleware } from '../validation'
 import type { EthereumClient } from '../..'
 import type { Chain } from '../../blockchain'
 import type { PeerPool } from '../../net/peerpool'
-import type { EthereumService } from '../../service/ethereumservice'
+import type { Service } from '../../service/service'
 
 /**
  * net_* RPC module
@@ -21,7 +21,7 @@ export class Net {
    * @param client Client to which the module binds
    */
   constructor(client: EthereumClient) {
-    const service = client.services.find((s) => s.name === 'eth') as EthereumService
+    const service = client.services.find((s) => s.name === 'eth') as Service
     this._chain = service.chain
     this._client = client
     this._peerPool = service.pool

packages/client/src/rpc/modules/web3.ts

@@ -6,7 +6,7 @@ import { middleware, validators } from '../validation'
 
 import type { EthereumClient } from '../..'
 import type { Chain } from '../../blockchain'
-import type { EthereumService } from '../../service'
+import type { Service } from '../../service'
 
 /**
  * web3_* RPC module
@@ -20,7 +20,7 @@ export class Web3 {
    * @param client Client to which the module binds
    */
   constructor(client: EthereumClient) {
-    const service = client.services.find((s) => s.name === 'eth') as EthereumService
+    const service = client.services.find((s) => s.name === 'eth') as Service
     this._chain = service.chain
 
     this.clientVersion = middleware(this.clientVersion.bind(this), 0, [])

packages/client/src/service/fullethereumservice.ts

@@ -13,16 +13,15 @@ import { BeaconSynchronizer, FullSynchronizer, SnapSynchronizer } from '../sync'
 import { Skeleton } from '../sync/skeleton'
 import { Event } from '../types'
 
-import { EthereumService } from './ethereumservice'
+import { Service, type ServiceOptions } from './service'
 import { TxPool } from './txpool'
 
 import type { Peer } from '../net/peer/peer'
 import type { Protocol } from '../net/protocol'
-import type { EthereumServiceOptions } from './ethereumservice'
 import type { Block } from '@ethereumjs/block'
 import type { BlobEIP4844Transaction } from '@ethereumjs/tx'
 
-interface FullEthereumServiceOptions extends EthereumServiceOptions {
+interface FullEthereumServiceOptions extends ServiceOptions {
   /** Serve LES requests (default: false) */
   lightserv?: boolean
 }
@@ -31,7 +30,7 @@ interface FullEthereumServiceOptions extends EthereumServiceOptions {
  * Full Ethereum service
  * @memberof module:service
  */
-export class FullEthereumService extends EthereumService {
+export class FullEthereumService extends Service {
   public synchronizer?: BeaconSynchronizer | FullSynchronizer | SnapSynchronizer
   public lightserv: boolean
   public miner: Miner | undefined

packages/client/src/service/index.ts

@@ -2,7 +2,6 @@
  * @module service
  */
 
-export * from './ethereumservice'
 export * from './fullethereumservice'
 export * from './lightethereumservice'
 export * from './service'

packages/client/src/service/lightethereumservice.ts

@@ -1,22 +1,22 @@
 import { LesProtocol } from '../net/protocol/lesprotocol'
 import { LightSynchronizer } from '../sync/lightsync'
 
-import { EthereumService } from './ethereumservice'
+import { Service } from './service'
 
 import type { Peer } from '../net/peer/peer'
-import type { EthereumServiceOptions } from './ethereumservice'
+import type { ServiceOptions } from './service'
 
 /**
  * Light Ethereum service
  * @memberof module:service
  */
-export class LightEthereumService extends EthereumService {
+export class LightEthereumService extends Service {
   public synchronizer: LightSynchronizer
 
   /**
    * Create new LES service
    */
-  constructor(options: EthereumServiceOptions) {
+  constructor(options: ServiceOptions) {
     super(options)
 
     this.config.logger.info('Light sync mode')
@@ -49,4 +49,16 @@ export class LightEthereumService extends EthereumService {
    * @param peer peer
    */
   async handle(_message: any, _protocol: string, _peer: Peer) {}
+
+  /**
+   * Stop service
+   */
+  async stop(): Promise<boolean> {
+    if (!this.running) {
+      return false
+    }
+    await this.synchronizer?.stop()
+    await super.stop()
+    return true
+  }
 }