some fixes

Signed-off-by: Jeromy Cannon <[email protected]>

Author: jeromy-cannon

src/commands/node.mjs

@@ -69,11 +69,11 @@ export class NodeCommand extends BaseCommand {
 
   static get SETUP_FLAGS_LIST () {
     return [
-      flags.apiPermissionProperties, // TODO move
+      flags.apiPermissionProperties, // TODO move to `network deploy`
       flags.app,
       flags.appConfig,
-      flags.applicationProperties, // TODO move
-      flags.bootstrapProperties, // TODO move
+      flags.applicationProperties, // TODO move to `network deploy`
+      flags.bootstrapProperties, // TODO move to `network deploy`
       flags.cacheDir,
       flags.chainId,
       flags.devMode,
@@ -82,11 +82,11 @@ export class NodeCommand extends BaseCommand {
       flags.generateTlsKeys,
       flags.keyFormat,
       flags.localBuildPath,
-      flags.log4j2Xml, // TODO move
+      flags.log4j2Xml, // TODO move to `network deploy`
       flags.namespace,
       flags.nodeIDs,
       flags.releaseTag,
-      flags.settingTxt // TODO move
+      flags.settingTxt // TODO move to `network deploy`
     ]
   }
 

src/core/helpers.mjs

@@ -215,9 +215,13 @@ export async function getNodeLogs (k8, namespace) {
   }
 }
 
-// a function generate map between the nodeId and their account ids
+/**
+ * Create a map of node IDs to account IDs
+ * @param nodeIDs an array of the node IDs
+ * @returns {Map<string,string>} the map of node IDs to account IDs
+ */
 export function getNodeAccountMap (nodeIDs) {
-  const accountMap = new Map()
+  const accountMap = /** @type {Map<string,string>} **/ 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

src/core/profile_manager.mjs

@@ -24,12 +24,6 @@ import dot from 'dot-object'
 import { getNodeAccountMap } from './helpers.mjs'
 import * as semver from 'semver'
 
-/**
- * @typedef {Object} NodeInfo
- * @property {string} nodeName
- * @property {string} accountId
- */
-
 const consensusSidecars = [
   'recordStreamUploader', 'eventStreamUploader', 'backupUploader', 'accountBalanceUploader', 'otelCollector']
 
@@ -158,18 +152,11 @@ export class ProfileManager {
 
     const accountMap = getNodeAccountMap(nodeIds)
 
-    /** @type {Map<string, NodeInfo>} **/
-    const nodeMap = new Map()
-
     // set consensus pod level resources
     for (let nodeIndex = 0; nodeIndex < nodeIds.length; nodeIndex++) {
-      const fullAccountId = `${realm}.${shard}.${accountId++}`
-
       this._setValue(`hedera.nodes.${nodeIndex}.name`, nodeIds[nodeIndex], yamlRoot)
-      this._setValue(`hedera.nodes.${nodeIndex}.accountId`, fullAccountId, yamlRoot)
+      this._setValue(`hedera.nodes.${nodeIndex}.accountId`, accountMap.get(nodeIds[nodeIndex]), yamlRoot)
       this._setChartItems(`hedera.nodes.${nodeIndex}`, profile.consensus, yamlRoot)
-
-      nodeMap.set(nodeIds[nodeIndex], { nodeName: nodeIds[nodeIndex], accountId: fullAccountId })
     }
 
     const stagingDir = Templates.renderStagingDir(this.configManager, flags)
@@ -385,16 +372,16 @@ export class ProfileManager {
   /**
    * Prepares config.txt file for the node
    * @param {string} namespace namespace where the network is deployed
-   * @param {Map<string, NodeInfo>} nodeMap Map of NodeInfo objects
+   * @param {Map<string, string>} nodeAccountMap the map of node IDs to account IDs
    * @param {string} destPath path to the destination directory to write the config.txt file
    * @param {string} releaseTag release tag e.g. v0.42.0
    * @param {string} appName the app name (default: HederaNode.jar)
    * @param {string} chainId chain ID (298 for local network)
    * @param {string} template path to the config.template file
    * @returns {string} the config.txt file path
    */
-  prepareConfigTxt (namespace, nodeMap, destPath, releaseTag, appName = constants.HEDERA_APP_NAME, chainId = constants.HEDERA_CHAIN_ID, template = `${constants.RESOURCES_DIR}/templates/config.template`) {
-    if (!nodeMap || nodeMap.length === 0) throw new MissingArgumentError('map of NodeInfo objects is required')
+  prepareConfigTxt (namespace, nodeAccountMap, destPath, releaseTag, appName = constants.HEDERA_APP_NAME, chainId = constants.HEDERA_CHAIN_ID, template = `${constants.RESOURCES_DIR}/templates/config.template`) {
+    if (!nodeAccountMap || nodeAccountMap.length === 0) throw new MissingArgumentError('nodeAccountMap the map of node IDs to account IDs is required')
     if (!template) throw new MissingArgumentError('config templatePath is required')
     if (!releaseTag) throw new MissingArgumentError('release tag is required')
 
@@ -415,16 +402,15 @@ export class ProfileManager {
       configLines.push(`app, ${appName}`)
 
       let nodeSeq = 0
-      for (const nodeInfo of nodeMap.values()) {
-        const nodeName = nodeInfo.nodeId
-        const nodeNickName = nodeInfo.nodeId
+      for (const nodeID of nodeAccountMap.keys()) {
+        const nodeName = nodeID
 
         const internalIP = Templates.renderFullyQualifiedNetworkPodName(namespace, nodeName)
         const externalIP = Templates.renderFullyQualifiedNetworkSvcName(namespace, nodeName)
 
-        const account = nodeInfo.accountId
+        const account = nodeAccountMap.get(nodeID)
         if (releaseVersion.minor >= 40) {
-          configLines.push(`address, ${nodeSeq}, ${nodeNickName}, ${nodeName}, ${nodeStakeAmount}, ${internalIP}, ${internalPort}, ${externalIP}, ${externalPort}, ${account}`)
+          configLines.push(`address, ${nodeSeq}, ${nodeName}, ${nodeName}, ${nodeStakeAmount}, ${internalIP}, ${internalPort}, ${externalIP}, ${externalPort}, ${account}`)
         } else {
           configLines.push(`address, ${nodeSeq}, ${nodeName}, ${nodeStakeAmount}, ${internalIP}, ${internalPort}, ${externalIP}, ${externalPort}, ${account}`)
         }