fix: net_version now reads chainId from config and return decimal value

Signed-off-by: Logan Nguyen <[email protected]>

packages/relay/src/lib/net.ts

@@ -19,15 +19,19 @@
  */
 
 import { Net } from '../index';
+import constants from './constants';
 import { Client } from '@hashgraph/sdk';
 
 export class NetImpl implements Net {
   private client: Client;
   private readonly chainId: string;
 
-  constructor(client: Client, chainId: string) {
+  constructor(client: Client) {
     this.client = client;
-    this.chainId = chainId;
+
+    const hederaNetwork: string = (process.env.HEDERA_NETWORK || '{}').toLowerCase();
+    this.chainId = process.env.CHAIN_ID || constants.CHAIN_IDS[hederaNetwork] || '298';
+    if (this.chainId.startsWith('0x')) this.chainId = parseInt(this.chainId, 16).toString();
   }
 
   /**
@@ -39,7 +43,6 @@ export class NetImpl implements Net {
 
   /**
    * This is the chain id we registered.
-   * TODO Support some config when launching the server for this. dotenv support?
    */
   version(): string {
     return this.chainId;

packages/relay/src/lib/relay.ts

@@ -63,7 +63,7 @@ export class RelayImpl implements Relay {
     this.clientMain = hapiService.getMainClientInstance();
 
     this.web3Impl = new Web3Impl(this.clientMain);
-    this.netImpl = new NetImpl(this.clientMain, chainId);
+    this.netImpl = new NetImpl(this.clientMain);
 
     this.mirrorNodeClient = new MirrorNodeClient(
       process.env.MIRROR_NODE_URL || '',

packages/relay/tests/lib/net.spec.ts

@@ -18,18 +18,27 @@
  *
  */
 
+import pino from 'pino';
 import { expect } from 'chai';
 import { Registry } from 'prom-client';
 import { RelayImpl } from '../../src/lib/relay';
+import constants from '../../src/lib/constants';
 
-import pino from 'pino';
 const logger = pino();
-
 const Relay = new RelayImpl(logger, new Registry());
 
 describe('Net', async function () {
-  it('should execute "net_listening"', async function () {
-    const result = await Relay.net().listening();
+  it('should execute "net_listening"', function () {
+    const result = Relay.net().listening();
     expect(result).to.eq(false);
   });
+
+  it('should execute "net_version"', function () {
+    const hederaNetwork: string = (process.env.HEDERA_NETWORK || '{}').toLowerCase();
+    let expectedNetVersion = process.env.CHAIN_ID || constants.CHAIN_IDS[hederaNetwork] || '298';
+    if (expectedNetVersion.startsWith('0x')) expectedNetVersion = parseInt(expectedNetVersion, 16).toString();
+
+    const actualNetVersion = Relay.net().version();
+    expect(actualNetVersion).to.eq(expectedNetVersion);
+  });
 });

packages/server/tests/acceptance/rpc_batch2.spec.ts

@@ -600,7 +600,11 @@ describe('@api-batch-2 RPC Server Acceptance Tests', function () {
 
     it('should execute "net_version"', async function () {
       const res = await relay.call(RelayCalls.ETH_ENDPOINTS.NET_VERSION, [], requestId);
-      expect(res).to.be.equal(CHAIN_ID);
+
+      let expectedVersion = CHAIN_ID as string;
+      if (expectedVersion.startsWith('0x')) expectedVersion = parseInt(expectedVersion, 16).toString();
+
+      expect(res).to.be.equal(expectedVersion);
     });
 
     it('should execute "eth_getUncleByBlockHashAndIndex"', async function () {