Skip to content

Commit aea6f48

Browse files
jeromy-cannonjeromy-cannon
committed
Squashed commit of the following:
commit b871e44 Author: Jeromy Cannon <[email protected]> Date: Thu Jan 30 09:30:01 2025 +0000 rename testClusterConnection to testContextConnection Signed-off-by: Jeromy Cannon <[email protected]> commit cb91806 Author: Jeromy Cannon <[email protected]> Date: Thu Jan 30 09:17:17 2025 +0000 fix: fixed merge issue with incorrect license header (#1235) Signed-off-by: Jeromy Cannon <[email protected]> commit 6f43952 Author: Jeromy Cannon <[email protected]> Date: Thu Jan 30 09:04:39 2025 +0000 refactor: minor refactors to K8 setting private and public modifiers (#1234) Signed-off-by: Jeromy Cannon <[email protected]> commit 9c31b6c Author: Jeromy Cannon <[email protected]> Date: Wed Jan 29 23:27:15 2025 +0000 chore: changed license header to SPDX and ran npm run format (#1233) Signed-off-by: Jeromy Cannon <[email protected]> commit b044fcc Author: Ivo Yankov <[email protected]> Date: Wed Jan 29 22:26:19 2025 +0200 feat: Add adminKey flag to node setup command (#1193) Signed-off-by: Ivo Yankov <[email protected]> Signed-off-by: Jeromy Cannon <[email protected]> Co-authored-by: Jeromy Cannon <[email protected]> commit 0c4fec2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed Jan 29 13:58:40 2025 -0600 chore(deps): bump @inquirer/prompts from 7.2.3 to 7.2.4 (#1228) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 18a07b8 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed Jan 29 13:57:37 2025 -0600 chore(deps): bump actions/setup-java from 4.6.0 to 4.7.0 (#1229) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 71e56a9 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Jan 28 15:21:42 2025 -0600 chore(deps-dev): bump typescript-eslint from 8.21.0 to 8.22.0 (#1223) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 1c5212a Author: Jan Milenkov <[email protected]> Date: Tue Jan 28 16:44:28 2025 +0200 chore(lint): manually fixed imports to be consisent (#1219) Signed-off-by: instamenta <[email protected]> commit d460985 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Jan 28 08:41:01 2025 -0600 chore(deps-dev): bump @types/node from 22.10.10 to 22.12.0 (#1222) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit c448060 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Jan 28 08:39:44 2025 -0600 chore(deps-dev): bump @typescript-eslint/utils from 8.21.0 to 8.22.0 (#1221) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 83ad04f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 27 14:54:56 2025 -0600 chore(deps-dev): bump remark-lint-unordered-list-marker-style from 4.0.0 to 4.0.1 (#1214) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit d9a3592 Author: JeffreyDallas <[email protected]> Date: Mon Jan 27 13:23:37 2025 -0600 feat: update solo to support pathPrefix of mirror node importer (#1204) Signed-off-by: Jeffrey Tang <[email protected]> commit 6773955 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 27 12:57:49 2025 -0600 chore(deps-dev): bump remark-lint-list-item-indent from 4.0.0 to 4.0.1 (#1210) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit a31498e Author: Jan Milenkov <[email protected]> Date: Mon Jan 27 20:06:08 2025 +0200 feat(remote-config): instead of keeping just the command and the subcommand inside the remote config keep the flags as passed (#1208) Signed-off-by: instamenta <[email protected]> commit fb69435 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 27 12:00:53 2025 -0600 chore(deps-dev): bump remark-preset-lint-consistent from 6.0.0 to 6.0.1 (#1213) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit ab36894 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 27 12:00:02 2025 -0600 chore(deps-dev): bump eslint from 9.18.0 to 9.19.0 (#1215) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 764db3a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 27 09:26:12 2025 -0600 chore(deps-dev): bump remark-preset-lint-recommended from 7.0.0 to 7.0.1 (#1212) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 18ee776 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 27 09:25:12 2025 -0600 chore(deps-dev): bump @eslint/js from 9.18.0 to 9.19.0 (#1211) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 809d0ab Author: Jan Milenkov <[email protected]> Date: Mon Jan 27 17:14:36 2025 +0200 feat(remote-config): save reusable solo flags in remoteconfig (#1191) Signed-off-by: instamenta <[email protected]> Signed-off-by: Jeromy Cannon <[email protected]> Signed-off-by: Jan Milenkov <[email protected]> Co-authored-by: Jeromy Cannon <[email protected]> commit 7877d92 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Jan 27 09:03:45 2025 -0600 chore(deps): bump actions/setup-node from 4.1.0 to 4.2.0 (#1209) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 4ab4dd5 Author: Jan Milenkov <[email protected]> Date: Fri Jan 24 18:46:00 2025 +0200 feat(cli): reduce redundancy on context to cluster flags in command `deployment create` (#1156) Signed-off-by: instamenta <[email protected]> commit 80176a3 Author: Hedera Eng Automation <[email protected]> Date: Fri Jan 24 15:39:32 2025 +0000 chore(release): 0.34.0 [skip ci] ## [0.34.0](v0.33.0...v0.34.0) (2025-01-24) ### Features * `solo deployment create` should use the context and cluster provided for where to save the remote config ([#1142](#1142)) ([fe42edd](fe42edd)) * Connect to multicluster deployments and validate remoteConfigs ([#1141](#1141)) ([c78e226](c78e226)) * for v0.59.x or greater set the internal IP address to 127.0.0.1 to avoid an ISS, in config.txt ([#1162](#1162)) ([4ca488b](4ca488b)) * node upgrade command and new e2e tests ([#1133](#1133)) ([1cf5893](1cf5893)) * separate explorer from mirror node install/uninstall ([#1177](#1177)) ([0887fa6](0887fa6)) * solo network destroy should update remote-config ([#1155](#1155)) ([98b028f](98b028f)) * Update solo to load remote config near entry point ([#1176](#1176)) ([473a650](473a650)) ### Bug Fixes * merge error due to change of remote_config_tasks ([#1197](#1197)) ([9d1a8cb](9d1a8cb)) * Normalize mirror node resources path ([#1175](#1175)) ([ab018a7](ab018a7)) * Refactor RemoteConfigTasks class ([#1185](#1185)) ([66cfc4d](66cfc4d)) * remove k8.getKubeConfig ([#1182](#1182)) ([89c557a](89c557a)) * Set mirror node importer startDate ([#1174](#1174)) ([9d9ef53](9d9ef53)) * update hedera explorer chart version and location ([#1188](#1188)) ([0c415ef](0c415ef)) * use "double fork" to invoke port forward within Taskfile ([#1148](#1148)) ([d662d3f](d662d3f)) commit d0a8046 Author: Swirlds Automation <[email protected]> Date: Fri Jan 24 15:37:52 2025 +0000 chore: auto update docs/content/User/StepByStepGuide.md Signed-off-by: Swirlds Automation <[email protected]> commit d60247a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Jan 24 08:30:52 2025 -0600 chore(deps-dev): bump @types/node from 22.10.9 to 22.10.10 (#1207) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 28fd81e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri Jan 24 08:29:42 2025 -0600 chore(deps-dev): bump @types/ws from 8.5.13 to 8.5.14 (#1206) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 64fbf95 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Jan 23 11:40:40 2025 -0600 chore(deps-dev): bump mocha from 11.0.1 to 11.1.0 (#1200) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 960db04 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu Jan 23 08:19:52 2025 -0600 chore(deps-dev): bump @types/node from 22.10.7 to 22.10.9 (#1199) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commit 9d1a8cb Author: JeffreyDallas <[email protected]> Date: Wed Jan 22 13:28:24 2025 -0600 fix: merge error due to change of remote_config_tasks (#1197) Signed-off-by: Jeffrey Tang <[email protected]> commit 66cfc4d Author: Ivo Yankov <[email protected]> Date: Wed Jan 22 18:38:35 2025 +0200 fix: Refactor RemoteConfigTasks class (#1185) Signed-off-by: Ivo Yankov <[email protected]> commit 0887fa6 Author: JeffreyDallas <[email protected]> Date: Wed Jan 22 10:38:00 2025 -0600 feat: separate explorer from mirror node install/uninstall (#1177) Signed-off-by: Jeffrey Tang <[email protected]> commit 89c557a Author: Ivo Yankov <[email protected]> Date: Tue Jan 21 16:40:39 2025 +0200 fix: remove k8.getKubeConfig (#1182) Signed-off-by: Ivo Yankov <[email protected]> commit 0c415ef Author: Nathan Klick <[email protected]> Date: Tue Jan 21 07:55:33 2025 -0600 fix: update hedera explorer chart version and location (#1188) Signed-off-by: Nathan Klick <[email protected]> commit 0e236d7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue Jan 21 07:27:00 2025 -0600 chore(deps-dev): bump @typescript-eslint/utils from 8.20.0 to 8.21.0 (#1190) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Jeromy Cannon <[email protected]>
1 parent 505d347 commit aea6f48

File tree

179 files changed

+1781
-3375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+1781
-3375
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
fetch-depth: 0
5656

5757
- name: Setup Node
58-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
58+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
5959
with:
6060
node-version: 20
6161

@@ -140,7 +140,7 @@ jobs:
140140
git_tag_gpgsign: false
141141

142142
- name: Setup Node
143-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
143+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
144144
with:
145145
node-version: 20
146146

‎.github/workflows/flow-gcs-test.yaml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@ jobs:
6262
github_token: ${{ secrets.GITHUB_TOKEN }}
6363
job_name: "gcs-storage-test (${{ matrix.storageType }})"
6464

65-
- name: Create GCS bucket
66-
# create a new bucket and use job runner id as prefix
65+
- name: Create Bucket Name and Prefix
6766
run: |
68-
export BUCKET_NAME=${{ steps.jobs.outputs.job_id }}-solo-streams
69-
gcloud storage buckets create gs://${BUCKET_NAME} --project=${{ vars.GCP_S3_PROJECT_ID }}
67+
export BUCKET_NAME="solo-ci-test-streams"
68+
export PREFIX=${{ steps.jobs.outputs.job_id }}
69+
7070
echo "BUCKET_NAME=${BUCKET_NAME}" >> $GITHUB_ENV
71+
echo "PREFIX=${PREFIX}" >> $GITHUB_ENV
7172
72-
export BACKUP_BUCKET_NAME=${{ steps.jobs.outputs.job_id }}-solo-backups
73-
gcloud storage buckets create gs://${BACKUP_BUCKET_NAME} --project=${{ vars.GCP_S3_PROJECT_ID }}
73+
export BACKUP_BUCKET_NAME="solo-ci-backups"
7474
echo "BACKUP_BUCKET_NAME=${BACKUP_BUCKET_NAME}" >> $GITHUB_ENV
7575
7676
- name: Setup Node
77-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
77+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
7878
with:
7979
node-version: 20
8080
cache: npm
@@ -108,13 +108,14 @@ jobs:
108108
GCS_ACCESS_KEY: ${{ secrets.GCP_S3_ACCESS_KEY }}
109109
GCS_SECRET_KEY: ${{ secrets.GCP_S3_SECRET_KEY }}
110110
BUCKET_NAME: ${{ env.BUCKET_NAME }}
111-
BACKUP_BUCKET_NAME: ${{ env.BACKUP_BUCKET_NAME }}
111+
PREFIX: ${{ env.PREFIX }}
112+
BACKUP_BUCKET_NAME: ${{ env.BACKUP_BUCKET_NAME }}/${{ steps.jobs.outputs.job_id }}
112113
STORAGE_TYPE: ${{ matrix.storageType }}
113114
GCP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.GCP_SERVICE_ACCOUNT_TOKEN }}
114115
run: |
115116
.github/workflows/script/gcs_test.sh
116117
117-
- name: Delete Bucket after Test
118+
- name: Delete Test Directory after Test
118119
run: |
119-
gcloud storage rm --recursive gs://${BUCKET_NAME} --project=${{ vars.GCP_S3_PROJECT_ID }}
120-
gcloud storage rm --recursive gs://${BACKUP_BUCKET_NAME} --project=${{ vars.GCP_S3_PROJECT_ID }}
120+
gcloud storage rm --recursive gs://${BUCKET_NAME}/${{ steps.jobs.outputs.job_id }} --project=${{ vars.GCP_S3_PROJECT_ID }}
121+
gcloud storage rm --recursive gs://${BACKUP_BUCKET_NAME}/${{ steps.jobs.outputs.job_id }} --project=${{ vars.GCP_S3_PROJECT_ID }}

‎.github/workflows/flow-hugo-publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
fetch-depth: 0
7979

8080
- name: Setup Node
81-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
81+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
8282
with:
8383
node-version: 20
8484

‎.github/workflows/flow-task-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ permissions:
3636

3737
jobs:
3838
example-task-file-test:
39-
timeout-minutes: 20
39+
timeout-minutes: 30
4040
runs-on: solo-linux-large
4141
strategy:
4242
matrix:
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5252

5353
- name: Setup Node
54-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
54+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
5555
with:
5656
node-version: 20
5757
cache: npm

‎.github/workflows/script/gcs_test.sh

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ if [ -z "${GCP_SERVICE_ACCOUNT_TOKEN}" ]; then
3636
exit 1
3737
fi
3838

39+
if [ -z "${PREFIX}" ]; then
40+
echo "PREFIX is not set"
41+
else
42+
echo "Using PREFIX: ${PREFIX}"
43+
BUCKET_PREFIX_OPTION="--storage-bucket-prefix ${PREFIX}"
44+
fi
45+
3946
echo "${GCP_SERVICE_ACCOUNT_TOKEN}" > gcp_service_account.json
4047

4148
echo "Using bucket name: ${streamBucket}"
@@ -45,6 +52,7 @@ SOLO_CLUSTER_NAME=solo-e2e
4552
SOLO_NAMESPACE=solo-e2e
4653
SOLO_CLUSTER_SETUP_NAMESPACE=solo-setup
4754

55+
4856
kind delete cluster -n "${SOLO_CLUSTER_NAME}"
4957
kind create cluster -n "${SOLO_CLUSTER_NAME}"
5058
npm run solo-test -- init
@@ -54,7 +62,7 @@ npm run solo-test -- node keys --gossip-keys --tls-keys -i node1
5462
npm run solo-test -- network deploy -i node1 -n "${SOLO_NAMESPACE}" \
5563
--storage-endpoint "https://storage.googleapis.com" \
5664
--storage-access-key "${GCS_ACCESS_KEY}" --storage-secrets "${GCS_SECRET_KEY}" \
57-
--storage-type "${storageType}" --storage-bucket "${streamBucket}" \
65+
--storage-type "${storageType}" --storage-bucket "${streamBucket}" $BUCKET_PREFIX_OPTION \
5866
--backup-bucket "${streamBackupBucket}" \
5967
--google-credential gcp_service_account.json
6068

@@ -63,24 +71,31 @@ npm run solo-test -- node start -i node1 -n "${SOLO_NAMESPACE}"
6371
npm run solo-test -- mirror-node deploy --namespace "${SOLO_NAMESPACE}" \
6472
--storage-endpoint "https://storage.googleapis.com" \
6573
--storage-access-key "${GCS_ACCESS_KEY}" --storage-secrets "${GCS_SECRET_KEY}" \
66-
--storage-type "${storageType}" --storage-bucket "${streamBucket}"
74+
--storage-type "${storageType}" --storage-bucket "${streamBucket}" $BUCKET_PREFIX_OPTION
75+
76+
npm run solo-test -- explorer deploy -n "${SOLO_NAMESPACE}" -s "${SOLO_CLUSTER_SETUP_NAMESPACE}"
6777

6878
kubectl port-forward -n "${SOLO_NAMESPACE}" svc/haproxy-node1-svc 50211:50211 > /dev/null 2>&1 &
69-
kubectl port-forward -n "${SOLO_NAMESPACE}" svc/hedera-explorer 8080:80 > /dev/null 2>&1 &
79+
80+
explorer_svc="$(kubectl get svc -l app.kubernetes.io/component=hedera-explorer -n ${SOLO_NAMESPACE} --output json | jq -r '.items[].metadata.name')"
81+
kubectl port-forward -n "${SOLO_NAMESPACE}" svc/"${explorer_svc}" 8080:80 > /dev/null 2>&1 &
7082

7183
cd ..; create_test_account ; cd -
7284

7385
node examples/create-topic.js
7486

7587
npm run solo-test -- node stop -i node1 -n "${SOLO_NAMESPACE}"
7688

89+
echo "Waiting for backup uploader to run"
7790
# manually call script "backup.sh" from container backup-uploader since it only runs every 5 minutes
78-
kubectl exec network-node1-0 -c backup-uploader -n solo-e2e -- /backup.sh > /dev/null 2>&1
91+
kubectl exec network-node1-0 -c backup-uploader -n solo-e2e -- /backup.sh
7992

80-
# retrieve logs and check if it include the message type "error"
93+
echo "Retrieve logs and check if it include the error message"
8194
# example : {"level":"error","msg":"Updated modification time ......}
8295
kubectl logs network-node1-0 -c backup-uploader -n solo-e2e > backup-uploader.log
8396
if grep -q \""error\"" backup-uploader.log; then
8497
echo "Backup uploader logs contain error message"
8598
exit 1
8699
fi
100+
101+
npm run solo-test -- network destroy -n "${SOLO_NAMESPACE}" --force -q

‎.github/workflows/script/solo_smoke_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function setup_smart_contract_test ()
3131
rm -f .env
3232

3333
npm install
34-
npx hardhat compile || return 1:
34+
npx hardhat compile || return 1
3535

3636
echo "Build .env file"
3737

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ jobs:
264264
fetch-depth: ${{ inputs.enable-sonar-analysis && '0' || '' }}
265265

266266
- name: Setup Node
267-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
267+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
268268
with:
269269
node-version: ${{ inputs.node-version }}
270270

‎.github/workflows/zxc-code-style.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6161

6262
- name: Setup Node
63-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
63+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
6464
with:
6565
node-version: ${{ inputs.node-version }}
6666

‎.github/workflows/zxc-e2e-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
# echo "::endgroup::"
122122

123123
- name: Setup Node
124-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
124+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
125125
with:
126126
node-version: ${{ inputs.node-version }}
127127

@@ -152,7 +152,7 @@ jobs:
152152

153153
- name: Setup Java
154154
if: ${{ runner.os == 'linux' && (inputs.npm-test-script == 'test-e2e-node-local-hedera' || inputs.npm-test-script == 'test-e2e-node-local-ptt' || inputs.npm-test-script == 'test-e2e-node-add-local') && !cancelled() && !failure() }}
155-
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
155+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
156156
with:
157157
distribution: temurin
158158
java-version: 21.0.1

‎.github/workflows/zxc-unit-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6767

6868
- name: Setup Node
69-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
69+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
7070
with:
7171
node-version: ${{ inputs.node-version }}
7272
cache: npm

‎.github/workflows/zxc-update-readme.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
token: ${{ secrets.GH_ACCESS_TOKEN }}
7171

7272
- name: Setup Node
73-
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
73+
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
7474
with:
7575
node-version: 20
7676

‎Taskfile.helper.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ tasks:
167167
deps:
168168
- task: "init"
169169
cmds:
170-
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node keys --gossip-keys --tls-keys --node-aliases-unparsed {{.node_identifiers}} -q --dev
170+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node keys --gossip-keys --tls-keys --node-aliases {{.node_identifiers}} -q --dev
171171

172172
solo:network:deploy:
173173
silent: true
@@ -185,7 +185,7 @@ tasks:
185185
if [[ "${SOLO_CHART_VERSION}" != "" ]]; then
186186
export SOLO_CHART_FLAG='--solo-chart-version ${SOLO_CHART_VERSION}'
187187
fi
188-
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} ${CONSENSUS_NODE_FLAG} ${SOLO_CHART_FLAG} ${VALUES_FLAG} ${SETTINGS_FLAG} ${LOG4J2_FLAG} ${APPLICATION_PROPERTIES_FLAG} ${GENESIS_THROTTLES_FLAG} ${DEBUG_NODE_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${LOAD_BALANCER_FLAG} ${NETWORK_DEPLOY_EXTRA_FLAGS} -q --dev
188+
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- network deploy --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} ${CONSENSUS_NODE_FLAG} ${SOLO_CHART_FLAG} ${VALUES_FLAG} ${SETTINGS_FLAG} ${LOG4J2_FLAG} ${APPLICATION_PROPERTIES_FLAG} ${GENESIS_THROTTLES_FLAG} ${DEBUG_NODE_FLAG} ${SOLO_CHARTS_DIR_FLAG} ${LOAD_BALANCER_FLAG} ${NETWORK_DEPLOY_EXTRA_FLAGS} -q --dev
189189
- task: "solo:node:setup"
190190

191191
solo:node:setup:
@@ -198,7 +198,7 @@ tasks:
198198
if [[ "${CONSENSUS_NODE_VERSION}" != "" ]]; then
199199
export CONSENSUS_NODE_FLAG='--release-tag {{.CONSENSUS_NODE_VERSION}}'
200200
fi
201-
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node setup --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} ${CONSENSUS_NODE_FLAG} ${LOCAL_BUILD_FLAG} -q --dev
201+
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node setup --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} ${CONSENSUS_NODE_FLAG} ${LOCAL_BUILD_FLAG} -q --dev
202202
203203
solo:network:destroy:
204204
silent: true
@@ -218,7 +218,7 @@ tasks:
218218
if [[ "${DEBUG_NODE_ALIAS}" != "" ]]; then
219219
export DEBUG_NODE_FLAG="--debug-node-alias {{ .DEBUG_NODE_ALIAS }}"
220220
fi
221-
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} ${DEBUG_NODE_FLAG} -q {{ .CLI_ARGS }} --dev
221+
SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} ${DEBUG_NODE_FLAG} -q {{ .CLI_ARGS }} --dev
222222
- |
223223
if [[ "{{ .use_port_forwards }}" == "true" ]];then
224224
echo "Port forwarding for Hedera Network Node: grpc:50211"
@@ -233,7 +233,7 @@ tasks:
233233
deps:
234234
- task: "init"
235235
cmds:
236-
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} -q {{ .CLI_ARGS }} --dev
236+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} -q {{ .CLI_ARGS }} --dev
237237

238238
solo:relay:
239239
silent: true
@@ -289,8 +289,8 @@ tasks:
289289
cmds:
290290
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node prepare-upgrade --namespace "${SOLO_NAMESPACE}" -q --dev
291291
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node freeze-upgrade --namespace "${SOLO_NAMESPACE}" -q --dev
292-
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} -q --dev
293-
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} -q --dev
292+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node stop --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} -q --dev
293+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node start --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} -q --dev
294294

295295
cluster:create:
296296
silent: true
@@ -360,7 +360,7 @@ tasks:
360360
solo:node:logs:
361361
silent: true
362362
cmds:
363-
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node logs --namespace "${SOLO_NAMESPACE}" --node-aliases-unparsed {{.node_identifiers}} -q --dev
363+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- node logs --namespace "${SOLO_NAMESPACE}" --node-aliases {{.node_identifiers}} -q --dev
364364

365365
start:
366366
desc: solo node start
@@ -420,12 +420,14 @@ tasks:
420420
deps:
421421
- task: "init"
422422
cmds:
423-
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node deploy --namespace "${SOLO_NAMESPACE}" -s ${SOLO_CLUSTER_SETUP_NAMESPACE} ${SOLO_CHARTS_DIR_FLAG} ${ENABLE_EXPLORER_TLS_FLAG} ${TLS_CLUSTER_ISSUER_TYPE_FLAG} ${MIRROR_NODE_DEPLOY_EXTRA_FLAGS} --pinger -q --dev
423+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node deploy --namespace "${SOLO_NAMESPACE}" ${SOLO_CHARTS_DIR_FLAG} ${MIRROR_NODE_DEPLOY_EXTRA_FLAGS} --pinger -q --dev
424+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- explorer deploy --namespace "${SOLO_NAMESPACE}" -s ${SOLO_CLUSTER_SETUP_NAMESPACE} ${SOLO_CHARTS_DIR_FLAG} ${ENABLE_EXPLORER_TLS_FLAG} ${TLS_CLUSTER_ISSUER_TYPE_FLAG} -q --dev
424425
- |
425426
if [[ "{{ .use_port_forwards }}" == "true" ]];then
426427
echo "Enable port forwarding for Hedera Explorer & Mirror Node Network"
427-
echo "Port forwarding for Hedera Explorer: http://localhost:6789"
428-
/bin/bash -c "nohup kubectl port-forward -n \"${SOLO_NAMESPACE}\" svc/hedera-explorer 8080:80 > /dev/null 2>&1 &"
428+
echo "Port forwarding for Hedera Explorer: http://localhost:8080"
429+
explorer_svc="$(kubectl get svc -l app.kubernetes.io/component=hedera-explorer -n ${SOLO_NAMESPACE} --output json | jq -r '.items[].metadata.name')"
430+
/bin/bash -c "nohup kubectl port-forward -n \"${SOLO_NAMESPACE}\" \"svc/${explorer_svc}\" 8080:80 > /dev/null 2>&1 &"
429431
echo "Port forwarding for Mirror Node Network: grpc:5600, rest:5551"
430432
/bin/bash -c "nohup kubectl port-forward -n \"${SOLO_NAMESPACE}\" svc/mirror-grpc 5600:5600 > /dev/null 2>&1 &"
431433
/bin/bash -c "nohup kubectl port-forward -n \"${SOLO_NAMESPACE}\" svc/mirror-rest 5551:80 > /dev/null 2>&1 &"
@@ -442,6 +444,7 @@ tasks:
442444
- task: "init"
443445
cmds:
444446
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- mirror-node destroy --namespace "${SOLO_NAMESPACE}" --force -q --dev || true
447+
- SOLO_HOME_DIR=${SOLO_HOME_DIR} npm run solo -- explorer destroy --namespace "${SOLO_NAMESPACE}" --force -q --dev || true
445448

446449
clean:
447450
desc: destroy, then remove cache directory, logs directory, config, and port forwards

‎docs/content/User/AccessHederaServices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Once the nodes are up, you may now expose various services (using `k9s` (shift-f
2323
* Hedera explorer: `solo-deployment-hedera-explorer`
2424
```bash
2525
#enable portforwarding for hedera explorer, can be access at http://localhost:8080/
26-
kubectl port-forward svc/hedera-explorer -n "${SOLO_NAMESPACE}" 8080:80 &
26+
kubectl port-forward svc/hedera-explorer-hedera-explorer-chart -n "${SOLO_NAMESPACE}" 8080:80 &
2727
```
2828
* JSON Rpc Relays
2929

0 commit comments

Comments
 (0)