Merge branch 'main' into 00336-D-node-log-cmd

Author: JeffreyDallas

.github/workflows/flow-deploy-release-artifact.yaml

@@ -126,7 +126,7 @@ jobs:
           attempt_delay: 5000
 
       - name: Setup JFrog CLI
-        uses: jfrog/setup-jfrog-cli@1405ca8c4227d79f4c8303964f757a4e4e2369c2 # v4.1.1
+        uses: jfrog/setup-jfrog-cli@7c95feb32008765e1b4e626b078dfd897c4340ad # v4.1.2
         env:
           JF_URL: ${{ vars.JF_URL }}
           JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }}

README.md

@@ -90,7 +90,7 @@ You can now use your cluster with:
 
 kubectl cluster-info --context kind-solo
 
-Not sure what to do next? 😅  Check out https://kind.sigs.k8s.io/docs/user/quick-start/
+Have a question, bug, or feature request? Let us know! https://kind.sigs.k8s.io/#community 🙂
 ```
 
 You may now view pods in your cluster using `k9s -A` as below:
@@ -178,9 +178,9 @@ Kubernetes Namespace	: solo
 ✔ Clean up temp files
 ✔ Generate gossip keys
 ✔ Backup old files
-✔ TLS key for node: node0
-✔ TLS key for node: node1
 ✔ TLS key for node: node2
+✔ TLS key for node: node1
+✔ TLS key for node: node0
 ✔ Generate gRPC TLS keys
 ✔ Finalize
 ```
@@ -242,9 +242,9 @@ Kubernetes Namespace	: solo
 ✔ Check HAProxy for: node0
 ✔ Check HAProxy for: node1
 ✔ Check HAProxy for: node2
+✔ Check Envoy Proxy for: node2
 ✔ Check Envoy Proxy for: node1
 ✔ Check Envoy Proxy for: node0
-✔ Check Envoy Proxy for: node2
 ✔ Check proxy pods are ready
 ✔ Check MinIO
 ✔ Check auxiliary pods are ready
@@ -269,17 +269,17 @@ Kubernetes Namespace	: solo
 **********************************************************************************
 ✔ Initialize
 ✔ Check network pod: node0
-✔ Check network pod: node1
 ✔ Check network pod: node2
+✔ Check network pod: node1
 ✔ Identify network pods
 ✔ Copy configuration files
 ✔ Copy Gossip keys to staging
 ✔ Copy gRPC TLS keys to staging
 ✔ Prepare config.txt for the network
 ✔ Prepare staging directory
-✔ Update node: node2
-✔ Update node: node1
 ✔ Update node: node0
+✔ Update node: node1
+✔ Update node: node2
 ✔ Fetch platform software into network nodes
 ✔ Copy Gossip keys
 ✔ Copy Gossip keys
@@ -291,11 +291,11 @@ Kubernetes Namespace	: solo
 ✔ Copy configuration files
 ✔ Copy configuration files
 ✔ Set file permissions
-✔ Node: node1
-✔ Set file permissions
 ✔ Node: node0
 ✔ Set file permissions
 ✔ Node: node2
+✔ Set file permissions
+✔ Node: node1
 ✔ Setup network nodes
 ✔ Finalize
 ```
@@ -317,13 +317,13 @@ Kubernetes Cluster	: kind-solo
 Kubernetes Namespace	: solo
 **********************************************************************************
 ✔ Initialize
-✔ Check network pod: node1
 ✔ Check network pod: node2
 ✔ Check network pod: node0
+✔ Check network pod: node1
 ✔ Identify network pods
-✔ Start node: node2
-✔ Start node: node0
 ✔ Start node: node1
+✔ Start node: node0
+✔ Start node: node2
 ✔ Starting nodes
 ✔ Check node: node0
 ✔ Check node: node1
@@ -358,8 +358,8 @@ Kubernetes Namespace	: solo
 ✔ Check Postgres DB
 ✔ Check Monitor
 ✔ Check GRPC
-✔ Check Importer
 ✔ Check REST API
+✔ Check Importer
 ✔ Check pods are ready
 ```
 
@@ -513,8 +513,8 @@ Kubernetes Namespace	: solo
 ✔ Generate gossip keys
 ✔ Backup old files
 ✔ TLS key for node: node0
-✔ TLS key for node: node2
 ✔ TLS key for node: node1
+✔ TLS key for node: node2
 ✔ Generate gRPC TLS keys
 ✔ Finalize
 ```

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@hashgraph/solo",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "An opinionated CLI tool to deploy and manage private Hedera Networks.",
   "main": "src/index.mjs",
   "type": "module",

package.json

@@ -1494,7 +1494,10 @@ export class NodeCommand extends BaseCommand {
       )
 
       const futureDate = new Date()
-      futureDate.setDate(futureDate.getDate() + (1 / 24 / 60)) // 1 minute in the future
+      this.logger.debug(`Current time: ${futureDate}`)
+
+      futureDate.setTime(futureDate.getTime() + 20000) // 20 seconds in the future
+      this.logger.debug(`Freeze time: ${futureDate}`)
 
       const freezeUpgradeTx = await new FreezeTransaction()
         .setFreezeType(FreezeType.FreezeUpgrade)
@@ -1504,7 +1507,10 @@ export class NodeCommand extends BaseCommand {
         .freezeWith(client)
         .execute(client)
 
-      this.logger.debug(`Upgrade frozen with transaction id: ${freezeUpgradeTx.transactionId.toString()}`)
+      const freezeUpgradeReceipt = await freezeUpgradeTx.getReceipt(client)
+
+      this.logger.debug(`Upgrade frozen with transaction id: ${freezeUpgradeTx.transactionId.toString()}`,
+        freezeUpgradeReceipt.status.toString())
     } catch (e) {
       this.logger.error(`Error in freeze upgrade: ${e.message}`, e)
       throw new FullstackTestingError(`Error in freeze upgrade: ${e.message}`, e)

src/commands/node.mjs

@@ -39,7 +39,7 @@ import * as version from '../../../version.mjs'
 import { getNodeLogs, sleep } from '../../../src/core/helpers.mjs'
 import { MirrorNodeCommand } from '../../../src/commands/mirror_node.mjs'
 import * as core from '../../../src/core/index.mjs'
-import { TopicCreateTransaction, TopicMessageSubmitTransaction } from '@hashgraph/sdk'
+import { Status, TopicCreateTransaction, TopicMessageSubmitTransaction } from '@hashgraph/sdk'
 import * as http from 'http'
 
 describe('MirrorNodeCommand', () => {
@@ -66,6 +66,10 @@ describe('MirrorNodeCommand', () => {
   const downloader = new core.PackageDownloader(mirrorNodeCmd.logger)
   const accountManager = bootstrapResp.opts.accountManager
 
+  const testMessage = 'Mirror node test message'
+  let portForwarder = null
+  let newTopicId = null
+
   beforeAll(() => {
     bootstrapResp.opts.logger.showUser(`------------------------- START: ${testName} ----------------------------`)
   })
@@ -94,45 +98,66 @@ describe('MirrorNodeCommand', () => {
     }
   }, 600000)
 
-  it('mirror node api and hedera explorer should success', async () => {
+  it('mirror node API should be running', async () => {
     await accountManager.loadNodeClient(namespace)
-    expect.assertions(3)
+    expect.assertions(1)
     try {
       // find hedera explorer pod
       const pods = await k8.getPodsByLabel(['app.kubernetes.io/name=hedera-explorer'])
       const explorerPod = pods[0]
 
-      // enable port forwarding
-      let portForwarder = null
       portForwarder = await k8.portForward(explorerPod.metadata.name, 8080, 8080)
       await sleep(2000)
 
       // check if mirror node api server is running
       const apiURL = 'http://127.0.0.1:8080/api/v1/transactions'
       await expect(downloader.urlExists(apiURL)).resolves.toBeTruthy()
       await sleep(2000)
+    } catch (e) {
+      mirrorNodeCmd.logger.showUserError(e)
+      expect(e).toBeNull()
+    }
+  }, 60000)
 
-      // check if the explorer GUI is running
+  it('Explorer GUI should be running', async () => {
+    expect.assertions(1)
+    try {
       const guiURL = 'http://127.0.0.1:8080/localnet/dashboard'
       await expect(downloader.urlExists(guiURL)).resolves.toBeTruthy()
       await sleep(2000)
 
       mirrorNodeCmd.logger.debug('mirror node API and explorer GUI are running')
+    } catch (e) {
+      mirrorNodeCmd.logger.showUserError(e)
+      expect(e).toBeNull()
+    }
+  }, 60000)
 
+  it('Create topic and submit message should success', async () => {
+    expect.assertions(1)
+    try {
       // Create a new public topic and submit a message
       const txResponse = await new TopicCreateTransaction().execute(accountManager._nodeClient)
       const receipt = await txResponse.getReceipt(accountManager._nodeClient)
-      const newTopicId = receipt.topicId
+      newTopicId = receipt.topicId
       mirrorNodeCmd.logger.debug(`Newly created topic ID is: ${newTopicId}`)
 
-      const testMessage = 'Mirror node test message'
-      await new TopicMessageSubmitTransaction({
+      const submitResponse = await new TopicMessageSubmitTransaction({
         topicId: newTopicId,
         message: testMessage
       }).execute(accountManager._nodeClient)
 
-      await sleep(4000)
+      const submitReceipt = await submitResponse.getReceipt(accountManager._nodeClient)
+      expect(submitReceipt.status).toBe(Status.Success)
+    } catch (e) {
+      mirrorNodeCmd.logger.showUserError(e)
+      expect(e).toBeNull()
+    }
+  }, 60000)
 
+  it('Check submit message result should success', async () => {
+    expect.assertions(1)
+    try {
       const queryURL = `http://localhost:8080/api/v1/topics/${newTopicId}/messages`
       let received = false
       let receivedMessage = ''

test/e2e/commands/mirror_node.test.mjs

@@ -16,6 +16,7 @@
  */
 import { describe, expect, it } from '@jest/globals'
 import * as helpers from '../../../src/core/helpers.mjs'
+import { HEDERA_PLATFORM_VERSION } from '../../../version.mjs'
 
 describe('Helpers', () => {
   it.each([
@@ -65,7 +66,8 @@ describe('Helpers', () => {
     { input: 'v0.45.1', output: 'hashgraph/full-stack-testing/ubi8-init-java17' },
     { input: 'v0.46.0', output: 'hashgraph/full-stack-testing/ubi8-init-java21' },
     { input: 'v0.47.1', output: 'hashgraph/full-stack-testing/ubi8-init-java21' },
-    { input: 'v0.47.1-alpha.0', output: 'hashgraph/full-stack-testing/ubi8-init-java21' }
+    { input: 'v0.47.1-alpha.0', output: 'hashgraph/full-stack-testing/ubi8-init-java21' },
+    { input: HEDERA_PLATFORM_VERSION, output: 'hashgraph/full-stack-testing/ubi8-init-java21' }
   ])('should be able to determine root-image based on Hedera platform version', (t) => {
     expect(helpers.getRootImageRepository(t.input)).toStrictEqual(t.output)
   })