client: some typesafety in rpc/modules

Author: jochem-brouwer

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

@@ -35,18 +35,18 @@ export class Admin {
    * @param {*} [params] An empty array
    * @param {*} [cb] A function with an error object as the first argument and the result as the second
    */
-  async nodeInfo(params: any, cb: Function) {
+  async nodeInfo(params: [], cb: Function) {
     const rlpxInfo = (this._client.server('rlpx') as RlpxServer).getRlpxInfo()
     const { enode, id, ip, listenAddr, ports } = rlpxInfo
     const { discovery, listener } = ports
     const clientName = getClientVersion()
 
     // TODO version not present in reference..
     // const ethVersion = Math.max.apply(Math, this._ethProtocol.versions)
-    const latestHeader = (this._chain as any)._headers.latest
-    const difficulty = latestHeader?.difficulty ?? 0 // should be number
+    const latestHeader = await this._chain.getLatestHeader()
+    const difficulty = latestHeader.difficulty
     const genesis = bufferToHex(this._chain.genesis.hash)
-    const head = bufferToHex(latestHeader?.mixHash ?? null)
+    const head = bufferToHex(latestHeader.mixHash)
     const network = this._chain.networkId
 
     const nodeInfo = {

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

@@ -1,24 +1,25 @@
 import { Chain } from '../../blockchain'
 import { middleware, validators } from '../validation'
 import { toBuffer, stripHexPrefix, BN } from 'ethereumjs-util'
+import { EthereumClient } from '../..'
 
 /**
  * eth_* RPC module
  * @memberof module:rpc/modules
  */
 export class Eth {
   private _chain: Chain
-  public ethVersion: any
+  public ethVersion: number
 
   /**
    * Create eth_* RPC module
    * @param {Node} Node to which the module binds
    */
-  constructor(node: any) {
+  constructor(node: EthereumClient) {
     const service = node.services.find((s: any) => s.name === 'eth')
-    this._chain = service.chain
-    const ethProtocol = service.protocols.find((p: any) => p.name === 'eth')
-    this.ethVersion = Math.max.apply(Math, ethProtocol.versions)
+    this._chain = service!.chain
+    const ethProtocol = service!.protocols.find((p: any) => p.name === 'eth')
+    this.ethVersion = Math.max.apply(Math, ethProtocol!.versions)
 
     this.blockNumber = middleware(this.blockNumber.bind(this), 0)
 

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

@@ -1,6 +1,7 @@
 import { EthereumService } from '../../service/ethereumservice'
 import { middleware } from '../validation'
 import { addHexPrefix } from 'ethereumjs-util'
+import { EthereumClient } from '../..'
 
 /**
  * net_* RPC module
@@ -15,8 +16,8 @@ export class Net {
    * Create net_* RPC module
    * @param {Node} Node to which the module binds
    */
-  constructor(node: any) {
-    const service: EthereumService = node.services.find((s: any) => s.name === 'eth')
+  constructor(node: EthereumClient) {
+    const service: EthereumService = node.services.find((s: any) => s.name === 'eth')!
     this._chain = service.chain
     this._node = node
     this._peerPool = service.pool

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

@@ -1,21 +1,23 @@
 import { middleware, validators } from '../validation'
 import { addHexPrefix, keccak, toBuffer } from 'ethereumjs-util'
 import { getClientVersion } from '../../util'
+import { EthereumClient } from '../..'
+import { Chain } from '../../blockchain'
 
 /**
  * web3_* RPC module
  * @memberof module:rpc/modules
  */
 export class Web3 {
-  private _chain: any
+  private _chain?: Chain
 
   /**
    * Create web3_* RPC module
    * @param {Node} Node to which the module binds
    */
-  constructor(node: any) {
+  constructor(node: EthereumClient) {
     const service = node.services.find((s: any) => s.name === 'eth')
-    this._chain = service.chain
+    this._chain = service?.chain
 
     this.clientVersion = middleware(this.clientVersion.bind(this), 0, [])