fix: update config to work with new version of hedera-json-rpc-relay (#316)

Signed-off-by: Jeffrey Tang <[email protected]>

Author: JeffreyDallas

src/commands/flags.mjs

@@ -189,8 +189,8 @@ export const releaseTag = {
 export const relayReleaseTag = {
   name: 'relay-release',
   definition: {
-    describe: 'Relay release tag to be used (e.g. v0.43.0)',
-    defaultValue: 'v0.43.0',
+    describe: 'Relay release tag to be used (e.g. v0.48.0)',
+    defaultValue: 'v0.48.1',
     type: 'string'
   }
 }

src/commands/relay.mjs

@@ -21,6 +21,7 @@ import { constants } from '../core/index.mjs'
 import { BaseCommand } from './base.mjs'
 import * as flags from './flags.mjs'
 import * as prompts from './prompts.mjs'
+import { getNodeAccountMap } from '../core/constants.mjs'
 
 export class RelayCommand extends BaseCommand {
   constructor (opts) {
@@ -29,9 +30,10 @@ export class RelayCommand extends BaseCommand {
     if (!opts || !opts.profileManager) throw new MissingArgumentError('An instance of core/ProfileManager is required', opts.downloader)
 
     this.profileManager = opts.profileManager
+    this.accountManager = opts.accountManager
   }
 
-  async prepareValuesArg (valuesFile, nodeIDs, chainID, relayRelease, replicaCount, operatorID, operatorKey) {
+  async prepareValuesArg (valuesFile, nodeIDs, chainID, relayRelease, replicaCount, operatorID, operatorKey, namespace) {
     let valuesArg = ''
     if (valuesFile) {
       valuesArg += this.prepareValuesFiles(valuesFile)
@@ -43,7 +45,11 @@ export class RelayCommand extends BaseCommand {
       valuesArg += this.prepareValuesFiles(profileValuesFile)
     }
 
-    valuesArg += ` --set config.MIRROR_NODE_URL=${constants.FULLSTACK_DEPLOYMENT_CHART}-rest`
+    valuesArg += ` --set config.MIRROR_NODE_URL=http://${constants.FULLSTACK_DEPLOYMENT_CHART}-rest`
+    valuesArg += ` --set config.MIRROR_NODE_URL_WEB3=http://${constants.FULLSTACK_DEPLOYMENT_CHART}-web3`
+    valuesArg += ' --set config.MIRROR_NODE_AGENT_CACHEABLE_DNS=false'
+    valuesArg += ' --set config.MIRROR_NODE_RETRY_DELAY=2001'
+    valuesArg += ' --set config.MIRROR_NODE_GET_CONTRACT_RESULTS_DEFAULT_RETRIES=21'
 
     if (chainID) {
       valuesArg += ` --set config.CHAIN_ID=${chainID}`
@@ -69,12 +75,30 @@ export class RelayCommand extends BaseCommand {
       throw new MissingArgumentError('Node IDs must be specified')
     }
 
+    const networkJsonString = await this.prepareNetworkJsonString(nodeIDs, namespace)
+    valuesArg += ` --set config.HEDERA_NETWORK='${networkJsonString}'`
+    return valuesArg
+  }
+
+  // created a json string to represent the map between the node keys and their ids
+  // output example '{"node-1": "0.0.3", "node-2": "0.004"}'
+  async prepareNetworkJsonString (nodeIDs = [], namespace) {
+    if (!nodeIDs) {
+      throw new MissingArgumentError('Node IDs must be specified')
+    }
+
+    const networkIds = {}
+    const accountMap = getNodeAccountMap(nodeIDs)
+
+    const networkNodeServicesMap = await this.accountManager.getNodeServiceMap(namespace)
     nodeIDs.forEach(nodeID => {
-      const networkKey = `network-${nodeID.trim()}-0:50211`
-      valuesArg += ` --set config.HEDERA_NETWORK.${networkKey}=0.0.3`
+      const nodeName = networkNodeServicesMap.get(nodeID).nodeName
+      const haProxyGrpcPort = networkNodeServicesMap.get(nodeID).haProxyGrpcPort
+      const networkKey = `network-${nodeName}:${haProxyGrpcPort}`
+      networkIds[networkKey] = accountMap.get(nodeID)
     })
 
-    return valuesArg
+    return JSON.stringify(networkIds)
   }
 
   prepareReleaseName (nodeIDs = []) {
@@ -145,7 +169,8 @@ export class RelayCommand extends BaseCommand {
             ctx.config.relayRelease,
             ctx.config.replicaCount,
             ctx.config.operatorId,
-            ctx.config.operatorKey
+            ctx.config.operatorKey,
+            ctx.config.namespace
           )
         }
       },

src/core/constants.mjs

@@ -19,6 +19,7 @@ import { color, PRESET_TIMER } from 'listr2'
 import { dirname, normalize } from 'path'
 import { fileURLToPath } from 'url'
 import chalk from 'chalk'
+import { constants } from './index.mjs'
 
 // -------------------- solo related constants ---------------------------------------------------------------------
 export const CUR_FILE_DIR = dirname(fileURLToPath(import.meta.url))
@@ -147,6 +148,20 @@ export const PROFILE_LOCAL = 'local'
 export const ALL_PROFILES = [PROFILE_LOCAL, PROFILE_TINY, PROFILE_SMALL, PROFILE_MEDIUM, PROFILE_LARGE]
 export const DEFAULT_PROFILE_FILE = `${SOLO_CACHE_DIR}/profiles/custom-spec.yaml`
 
+// a function generate map between the nodeId and their account ids
+export function getNodeAccountMap (nodeIDs) {
+  const accountMap = new Map()
+  const realm = constants.HEDERA_NODE_ACCOUNT_ID_START.realm
+  const shard = constants.HEDERA_NODE_ACCOUNT_ID_START.shard
+  let accountId = constants.HEDERA_NODE_ACCOUNT_ID_START.num
+
+  nodeIDs.forEach(nodeID => {
+    const nodeAccount = `${realm}.${shard}.${accountId++}`
+    accountMap.set(nodeID, nodeAccount)
+  })
+  return accountMap
+}
+
 // ------ Hedera SDK Related ------
 export const NODE_CLIENT_MAX_ATTEMPTS = process.env.NODE_CLIENT_MAX_ATTEMPTS || 60
 export const NODE_CLIENT_MIN_BACKOFF = process.env.NODE_CLIENT_MIN_BACKOFF || 1000

src/core/profile_manager.mjs

@@ -21,6 +21,7 @@ import * as yaml from 'js-yaml'
 import { flags } from '../commands/index.mjs'
 import { constants, helpers } from './index.mjs'
 import dot from 'dot-object'
+import { getNodeAccountMap } from './constants.mjs'
 
 const consensusSidecars = [
   'recordStreamUploader', 'eventStreamUploader', 'backupUploader', 'accountBalanceUploader', 'otelCollector']
@@ -148,15 +149,12 @@ export class ProfileManager {
   resourcesForConsensusPod (profile, nodeIds, yamlRoot) {
     if (!profile) throw new MissingArgumentError('profile is required')
 
-    // prepare name and account IDs for nodes
-    const realm = constants.HEDERA_NODE_ACCOUNT_ID_START.realm
-    const shard = constants.HEDERA_NODE_ACCOUNT_ID_START.shard
-    let accountId = constants.HEDERA_NODE_ACCOUNT_ID_START.num
+    const accountMap = getNodeAccountMap(nodeIds)
 
     // set consensus pod level resources
     for (let nodeIndex = 0; nodeIndex < nodeIds.length; nodeIndex++) {
       this._setValue(`hedera.nodes.${nodeIndex}.name`, nodeIds[nodeIndex], yamlRoot)
-      this._setValue(`hedera.nodes.${nodeIndex}.accountId`, `${realm}.${shard}.${accountId++}`, yamlRoot)
+      this._setValue(`hedera.nodes.${nodeIndex}.accountId`, accountMap.get(nodeIds[nodeIndex]), yamlRoot)
       this._setChartItems(`hedera.nodes.${nodeIndex}`, profile.consensus, yamlRoot)
     }