feat(block-node): implement 'solo block node add' command and modify remote config to support multiple relays, block nodes, mirror nodes and explorers

.github/workflows/flow-build-application.yaml

@@ -83,6 +83,7 @@ jobs:
           - { name: "Node PEM Kill", test-script: "test-${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-node-pem-kill-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Standard", test-script: "test-${{ needs.env-vars.outputs.e2e-standard-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-standard-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-standard-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-standard-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Relay", test-script: "test-${{ needs.env-vars.outputs.e2e-relay-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-relay-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-relay-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-relay-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
+          - { name: "Block Node", test-script: "test-${{ needs.env-vars.outputs.e2e-block-node-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-block-node-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-block-node-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-block-node-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Node Update", test-script: "test-${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-node-update-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Node Upgrade", test-script: "test-${{ needs.env-vars.outputs.e2e-node-upgrade-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-node-upgrade-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-node-upgrade-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-node-upgrade-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Node PEM Stop", test-script: "test-${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
@@ -131,6 +132,7 @@ jobs:
       e2e-node-upgrade-test-subdir: ${{ needs.env-vars.outputs.e2e-node-upgrade-test-subdir }}
       e2e-node-upgrade-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-upgrade-separate-commands-test-subdir }}
       e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
+      e2e-block-node-test-subdir: ${{ needs.env-vars.outputs.e2e-block-node-test-subdir }}
       e2e-integration-coverage-report: ${{ needs.env-vars.outputs.e2e-integration-coverage-report }}
       e2e-dual-cluster-full-coverage-report: ${{ needs.env-vars.outputs.e2e-dual-cluster-full-coverage-report }}
       e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
@@ -148,6 +150,7 @@ jobs:
       e2e-node-upgrade-coverage-report: ${{ needs.env-vars.outputs.e2e-node-upgrade-coverage-report }}
       e2e-node-upgrade-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-upgrade-separate-commands-coverage-report }}
       e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
+      e2e-block-node-coverage-report: ${{ needs.env-vars.outputs.e2e-block-node-coverage-report }}
     secrets:
       snyk-token: ${{ secrets.SNYK_TOKEN }}
       codecov-token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/flow-pull-request-checks.yaml

@@ -82,6 +82,7 @@ jobs:
           - { name: "Node PEM Kill", test-script: "test-${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-node-pem-kill-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-node-pem-kill-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Standard", test-script: "test-${{ needs.env-vars.outputs.e2e-standard-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-standard-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-standard-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-standard-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Relay", test-script: "test-${{ needs.env-vars.outputs.e2e-relay-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-relay-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-relay-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-relay-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
+          - { name: "Block Node", test-script: "test-${{ needs.env-vars.outputs.e2e-block-node-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-block-node-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-block-node-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-block-node-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Node Update", test-script: "test-${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-node-update-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-node-update-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Node Upgrade", test-script: "test-${{ needs.env-vars.outputs.e2e-node-upgrade-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-node-upgrade-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-node-upgrade-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-node-upgrade-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
           - { name: "Node PEM Stop", test-script: "test-${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}", coverage-subdirectory: "${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}", coverage-report-name: "${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}", cluster-name: "${{ needs.env-vars.outputs.e2e-node-pem-stop-test-subdir }}-${{ github.run_id }}-${{ github.run_attempt }}" }
@@ -127,6 +128,7 @@ jobs:
       e2e-node-upgrade-test-subdir: ${{ needs.env-vars.outputs.e2e-node-upgrade-test-subdir }}
       e2e-node-upgrade-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-upgrade-separate-commands-test-subdir }}
       e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
+      e2e-block-node-test-subdir: ${{ needs.env-vars.outputs.e2e-block-node-test-subdir }}
       e2e-integration-coverage-report: ${{ needs.env-vars.outputs.e2e-integration-coverage-report }}
       e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
       e2e-node-pem-stop-coverage-report: ${{ needs.env-vars.outputs.e2e-node-pem-stop-coverage-report }}
@@ -143,6 +145,7 @@ jobs:
       e2e-node-upgrade-coverage-report: ${{ needs.env-vars.outputs.e2e-node-upgrade-coverage-report }}
       e2e-node-upgrade-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-upgrade-separate-commands-coverage-report }}
       e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
+      e2e-block-node-coverage-report: ${{ needs.env-vars.outputs.e2e-block-node-coverage-report }}
     secrets:
       codecov-token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -175,6 +178,7 @@ jobs:
       e2e-node-upgrade-test-subdir: ${{ needs.env-vars.outputs.e2e-node-upgrade-test-subdir }}
       e2e-node-upgrade-separate-commands-test-subdir: ${{ needs.env-vars.outputs.e2e-node-upgrade-separate-commands-test-subdir }}
       e2e-relay-test-subdir: ${{ needs.env-vars.outputs.e2e-relay-test-subdir }}
+      e2e-block-node-test-subdir: ${{ needs.env-vars.outputs.e2e-block-node-test-subdir }}
       e2e-integration-coverage-report: ${{ needs.env-vars.outputs.e2e-integration-coverage-report }}
       e2e-dual-cluster-full-coverage-report: ${{ needs.env-vars.outputs.e2e-dual-cluster-full-coverage-report }}
       e2e-standard-coverage-report: ${{ needs.env-vars.outputs.e2e-standard-coverage-report }}
@@ -192,5 +196,6 @@ jobs:
       e2e-node-upgrade-coverage-report: ${{ needs.env-vars.outputs.e2e-node-upgrade-coverage-report }}
       e2e-node-upgrade-separate-commands-coverage-report: ${{ needs.env-vars.outputs.e2e-node-upgrade-separate-commands-coverage-report }}
       e2e-relay-coverage-report: ${{ needs.env-vars.outputs.e2e-relay-coverage-report }}
+      e2e-block-node-coverage-report: ${{ needs.env-vars.outputs.e2e-block-node-coverage-report }}
     secrets:
       codacy-project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}

.github/workflows/zxc-code-analysis.yaml

@@ -140,6 +140,11 @@ on:
         type: string
         required: false
         default: "e2e-relay"
+      e2e-block-node-test-subdir:
+        description: "E2E Block Node Test Subdirectory:"
+        type: string
+        required: false
+        default: "e2e-block-node"
       e2e-integration-coverage-report:
         description: "E2E Integration Coverage Report:"
         type: string
@@ -225,6 +230,11 @@ on:
         type: string
         required: false
         default: "E2E Relay Tests Coverage Report"
+      e2e-block-node-coverage-report:
+        description: "E2E Block Node Coverage Report:"
+        type: string
+        required: false
+        default: "E2E Block Node Tests Coverage Report"
     secrets:
       snyk-token:
         description: "The Snyk access token is used by Snyk to analyze the code for vulnerabilities "
@@ -401,6 +411,13 @@ jobs:
           name: ${{ inputs.e2e-relay-coverage-report }}
           path: 'coverage/${{ inputs.e2e-relay-test-subdir }}'
 
+      - name: Download E2E Block Node Coverage Report
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}
+        with:
+          name: ${{ inputs.e2e-block-node-coverage-report }}
+          path: 'coverage/${{ inputs.e2e-block-node-test-subdir }}'
+
       - name: Download E2E Test Report
         uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         if: ${{ (inputs.enable-codecov-analysis || inputs.enable-codacy-coverage) && inputs.enable-e2e-coverage-report && !cancelled() && !failure() }}

.github/workflows/zxc-env-vars.yaml

@@ -77,6 +77,9 @@ on:
       e2e-relay-test-subdir:
         description: "E2E Relay Test Subdirectory"
         value: ${{ jobs.env-vars.outputs.e2e_relay_test_subdir }}
+      e2e-block-node-test-subdir:
+        description: "E2E Block Node Test Subdirectory"
+        value: ${{ jobs.env-vars.outputs.e2e_block_node_test_subdir }}
       e2e-integration-coverage-report:
         description: "E2E Integration Tests Coverage Report"
         value: ${{ jobs.env-vars.outputs.e2e_integration_coverage_report }}
@@ -128,6 +131,9 @@ on:
       e2e-relay-coverage-report:
         description: "E2E Relay Tests Coverage Report"
         value: ${{ jobs.env-vars.outputs.e2e_relay_coverage_report }}
+      e2e-block-node-coverage-report:
+        description: "E2E Block Node Tests Coverage Report"
+        value: ${{ jobs.env-vars.outputs.e2e_block_node_coverage_report }}
 
 defaults:
   run:
@@ -158,6 +164,7 @@ jobs:
       e2e_node_upgrade_test_subdir: e2e-node-upgrade
       e2e_node_upgrade_separate_commands_test_subdir: e2e-node-upgrade-separate
       e2e_relay_test_subdir: e2e-relay
+      e2e_block_node_test_subdir: e2e-block-node
       e2e_integration_coverage_report: "E2E Integration Tests Coverage Report"
       e2e_dual_cluster_full_coverage_report: "E2E Dual Cluster Full Tests Coverage Report"
       e2e_standard_coverage_report: "E2E Standard Tests Coverage Report"
@@ -176,6 +183,7 @@ jobs:
       e2e_node_upgrade_coverage_report: "E2E Node Upgrade Tests Coverage Report"
       e2e_node_upgrade_separate_commands_coverage_report: "E2E Node Upgrade - Separate commands Tests Coverage Report"
       e2e_relay_coverage_report: "E2E Relay Tests Coverage Report"
+      e2e_block_node_coverage_report: "E2E Block Node Tests Coverage Report"
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1

Taskfile.tests.yml

@@ -77,6 +77,7 @@ tasks:
           --ignore 'test/e2e/commands/node*.ts' 
           --ignore 'test/e2e/commands/separate-node*.ts' 
           --ignore 'test/e2e/commands/relay*.ts' 
+          --ignore 'test/e2e/commands/block-node.test.ts' 
           --ignore 'test/e2e/commands/dual-*.ts'
           --ignore 'test/e2e/commands/separate-node-add.test.ts' 
           --ignore 'test/e2e/commands/separate-node-delete.test.ts' 
@@ -182,6 +183,13 @@ tasks:
         {{ .mocha_bin }} 'test/e2e/commands/relay.test.ts'
         {{ .reporter_options_prefix }}-e2e-relay.xml"
 
+  test-e2e-block-node:
+    cmds:
+      - "{{ .test_prefix }}=\"Mocha E2E Block Nodes Tests\"
+        {{ .reporter_prefix }}='coverage/e2e-block-node'
+        {{ .mocha_bin }} 'test/e2e/commands/block-node.test.ts'
+        {{ .reporter_options_prefix }}-e2e-block-node.xml"
+
   test-e2e-dual-cluster-full:
     cmds:
       - "{{ .test_prefix }}=\"Mocha E2E Dual Cluster Full Test\"

eslint.config.mjs

@@ -137,7 +137,7 @@ export default [
         'warn',
         {
           allowExpressions: false,
-          allowTypedFunctionExpressions: false,
+          allowTypedFunctionExpressions: true,
           allowHigherOrderFunctions: false,
         },
       ],

resources/block-node-values.yaml

@@ -0,0 +1,24 @@
+resources:
+  requests:
+    cpu: "3"
+    memory: "8Gi"
+
+blockNode:
+  config:
+    JAVA_TOOL_OPTIONS: "-Djava.util.logging.config.file=/app/logs/config/logging.properties"
+    JAVA_OPTS: "-Xms8G -Xmx8G" # if modifying this line also change in BlockNodesCommand
+    MEDIATOR_RING_BUFFER_SIZE: "2048"
+  persistence:
+    archive:
+      size: 6Gi
+    live:
+      size: 1Gi
+
+kubepromstack:
+  enabled: false
+
+loki:
+  enabled: false
+
+promtail:
+  enabled: false

src/commands/account.ts

@@ -16,7 +16,7 @@
 import {resolveNamespaceFromDeployment} from '../core/resolvers.js';
 import {type NamespaceName} from '../integration/kube/resources/namespace/namespace-name.js';
 import {type ClusterReference, type DeploymentName} from '../core/config/remote/types.js';
-import {type SoloListrTask} from '../types/index.js';
+import {type CommandDefinition, type SoloListrTask} from '../types/index.js';
 import {Templates} from '../core/templates.js';
 import {SecretType} from '../integration/kube/resources/secret/secret-type.js';
 import {Base64} from 'js-base64';
@@ -56,18 +56,18 @@
     }
 
     this.accountManager = options.accountManager;
     this.accountInfo = null;
     this.systemAccounts = systemAccounts;
   }
 
   public static readonly COMMAND_NAME = 'account';
 
   private static INIT_FLAGS_LIST = {
     required: [],
     optional: [flags.deployment, flags.nodeAliasesUnparsed, flags.clusterRef],
   };
 
   private static CREATE_FLAGS_LIST = {
     required: [],
     optional: [
       flags.amount,
@@ -81,7 +81,7 @@
     ],
   };
 
   private static UPDATE_FLAGS_LIST = {
     required: [],
     optional: [
       flags.accountId,
@@ -93,7 +93,7 @@
     ],
   };
 
   private static GET_FLAGS_LIST = {
     required: [],
     optional: [flags.accountId, flags.privateKey, flags.deployment, flags.clusterRef],
   };
@@ -726,8 +726,8 @@
     return true;
   }
 
-  public getCommandDefinition() {
-    const self = this;
+  public getCommandDefinition(): CommandDefinition {
+    const self: this = this;
     return {
       command: AccountCommand.COMMAND_NAME,
       desc: 'Manage Hedera accounts in solo network',