Merge commit '1abb12b8521d67a17c84662451cab8b053c877aa' into 01962-D-e2e-customized-consensus-version

Signed-off-by: Jeffrey Tang <jeffrey@swirldslabs.com>

# Conflicts:
#	version.ts

Author: JeffreyDallas

.github/workflows/flow-migration-test.yaml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        release-tag: ["0.35.0", "0.35.1", "0.35.2"]
+        release-tag: ["0.35.2"]
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -79,6 +79,4 @@ jobs:
   
           npm install
           task build
-          npm install -g @hashgraph/solo@${{ matrix.release-tag }} --force
-          solo --version
           .github/workflows/script/launch_network.sh ${{ matrix.release-tag }}

.github/workflows/script/launch_network.sh

@@ -17,26 +17,32 @@ fi
 npm install -g @hashgraph/solo@"${releaseTag}" --force
 solo --version
 
-SOLO_CLUSTER_NAME=solo-e2e
-SOLO_NAMESPACE=solo-e2e
-SOLO_CLUSTER_SETUP_NAMESPACE=solo-setup
-SOLO_DEPLOYMENT=solo-e2e
+export SOLO_CLUSTER_NAME=solo-e2e
+export SOLO_NAMESPACE=solo-e2e
+export SOLO_CLUSTER_SETUP_NAMESPACE=solo-setup
+export SOLO_DEPLOYMENT=solo-e2e
 
 kind delete cluster -n "${SOLO_CLUSTER_NAME}"
 kind create cluster -n "${SOLO_CLUSTER_NAME}"
 
 rm -rf ~/.solo/*
 
-echo "Launch solo using released version ${releaseTag}"
+
+echo "Launch solo using released Solo version ${releaseTag}"
+
 
 solo init
 solo cluster setup -s "${SOLO_CLUSTER_SETUP_NAMESPACE}"
 solo node keys --gossip-keys --tls-keys -i node1,node2
 solo deployment create -i node1,node2 -n "${SOLO_NAMESPACE}" --context kind-"${SOLO_CLUSTER_NAME}" --email john@doe.com --deployment-clusters kind-"${SOLO_CLUSTER_NAME}" --cluster-ref kind-${SOLO_CLUSTER_NAME} --deployment "${SOLO_DEPLOYMENT}"
-solo network deploy -i node1,node2 --deployment "${SOLO_DEPLOYMENT}"
 
-solo node setup -i node1,node2 --deployment "${SOLO_DEPLOYMENT}"
-solo node start -i node1,node2 --deployment "${SOLO_DEPLOYMENT}"
+export CONSENSUS_NODE_VERSION=v0.58.10
+# Use custom settings file for the deployment to avoid too many state saved in disk causing the no space left on device error
+solo network deploy -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" --pvcs --release-tag "${CONSENSUS_NODE_VERSION}" -q --settings-txt .github/workflows/support/v58-test/settings.txt
+solo node setup -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" --release-tag "${CONSENSUS_NODE_VERSION}" -q
+solo node start -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" -q
+solo account create --deployment "${SOLO_DEPLOYMENT}" --hbar-amount 100
+
 
 solo mirror-node deploy  --deployment "${SOLO_DEPLOYMENT}"
 solo explorer deploy -s "${SOLO_CLUSTER_SETUP_NAMESPACE}" --deployment "${SOLO_DEPLOYMENT}" --cluster-ref kind-${SOLO_CLUSTER_NAME}
@@ -47,6 +53,10 @@ cat ./local-config-before.yaml
 kubectl get ConfigMap solo-remote-config -n ${SOLO_NAMESPACE} -o yaml | yq '.data' > remote-config-before.yaml
 cat remote-config-before.yaml
 
+# must uninstall explorer before migration, because the change of explorer chart name and labels
+# make it harder to uninstall or upgrade after migration
+ solo explorer destroy --deployment "${SOLO_DEPLOYMENT}" --force
+
 # trigger migration
 npm run solo-test -- account create --deployment "${SOLO_DEPLOYMENT}"
 
@@ -67,7 +77,45 @@ if ! grep -q "schemaVersion: 1" ./remote-config-after.yaml; then
   exit 1
 fi
 
-# uninstall components using current version
+# using new solo to redeploy solo deployment chart to new version
+npm run solo-test -- node stop -i node1,node2 --deployment "${SOLO_DEPLOYMENT}"
+
+npm run solo-test -- network deploy -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" --pvcs --release-tag "${CONSENSUS_NODE_VERSION}" -q --settings-txt .github/workflows/support/v58-test/settings.txt
+
+npm run solo-test -- node setup -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" --release-tag "${CONSENSUS_NODE_VERSION}" -q
+npm run solo-test -- node start -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" -q
+
+# redeploy mirror-node to upgrade to a newer version
+npm run solo-test -- mirror-node deploy --deployment "${SOLO_DEPLOYMENT}" --cluster-ref kind-${SOLO_CLUSTER_NAME} --pinger -q --dev
+
+# redeploy explorer and relay node to upgrade to a newer version
+npm run solo-test -- relay deploy -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" -q --dev
+npm run solo-test -- explorer deploy --deployment "${SOLO_DEPLOYMENT}" --cluster-ref kind-${SOLO_CLUSTER_NAME} --mirrorNamespace solo-e2e -q --dev
+
+# wait a few seconds for the pods to be ready before enabling port-forwarding
+sleep 10
+kubectl port-forward -n "${SOLO_NAMESPACE}" svc/haproxy-node1-svc 50211:50211 > /dev/null 2>&1 &
+kubectl port-forward -n "${SOLO_NAMESPACE}" svc/relay-node1-node2-hedera-json-rpc-relay 7546:7546 > /dev/null 2>&1 &
+kubectl port-forward -n "${SOLO_NAMESPACE}" svc/mirror-grpc 5600:5600 > /dev/null 2>&1 &
+kubectl port-forward -n "${SOLO_NAMESPACE}" svc/hiero-explorer 8080:80 > /dev/null 2>&1 &
+kubectl port-forward -n "${SOLO_NAMESPACE}" svc/mirror-rest 5551:80 > /dev/null 2>&1 &
+
+# Test transaction can still be sent and processed
+npm run solo-test -- account create --deployment "${SOLO_DEPLOYMENT}" --hbar-amount 100
+
+# Upgrade to v0.59.5
+npm run solo-test -- node upgrade -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" --upgrade-version v0.59.5 -q
+npm run solo-test -- account create --deployment "${SOLO_DEPLOYMENT}" --hbar-amount 100
+
+# Upgrade to latest version
+export CONSENSUS_NODE_VERSION=$(grep 'HEDERA_PLATFORM_VERSION' version.ts | sed -E "s/.*'([^']+)';/\1/")
+npm run solo-test -- node upgrade -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" --upgrade-version "${CONSENSUS_NODE_VERSION}" -q
+npm run solo-test -- account create --deployment "${SOLO_DEPLOYMENT}" --hbar-amount 100
+
+SKIP_IMPORTER_CHECK=true
+.github/workflows/script/solo_smoke_test.sh "${SKIP_IMPORTER_CHECK}"
+
+# uninstall components using current Solo version
 npm run solo-test -- explorer destroy --deployment "${SOLO_DEPLOYMENT}" --force
 npm run solo-test -- relay destroy -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" --cluster-ref kind-${SOLO_CLUSTER_NAME}
 npm run solo-test -- mirror-node destroy --deployment "${SOLO_DEPLOYMENT}" --force

.github/workflows/script/solo_smoke_test.sh

@@ -47,7 +47,7 @@ function check_port_forward ()
   # run background task for few minutes
   for i in {1..20}
   do
-    echo "Check port forward"
+    echo "Check port forward i = $i out of 20"
     ps -ef |grep port-forward
     sleep 5
   done &
@@ -134,13 +134,6 @@ function check_importer_log()
   fi
 }
 
-# if first parameter equals to account-init,
-# then call solo account init before deploy mirror and relay node
-if [ "$1" == "account-init" ]; then
-  echo "Call solo account init"
-  npm run solo-test -- account init --deployment "${SOLO_DEPLOYMENT}"
-fi
-
 echo "Change to parent directory"
 
 cd ../
@@ -160,4 +153,9 @@ sleep 30
 echo "Run mirror node acceptance test"
 helm test mirror -n solo-e2e --timeout 10m
 check_monitor_log
-check_importer_log
+
+if [ -n "$1" ]; then
+  echo "Skip mirror importer log check"
+else
+  check_importer_log
+fi

.github/workflows/script/update_md.sh

@@ -43,10 +43,10 @@ export SOLO_CLUSTER_REF_CONNECT_OUTPUT=$( cat ${BUILD_DIR}/cluster-ref-connect.l
 solo deployment create -n "${SOLO_NAMESPACE}" --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/deployment-create.log
 export SOLO_DEPLOYMENT_CREATE_OUTPUT=$( cat ${BUILD_DIR}/deployment-create.log | tee ${BUILD_DIR}/test.log )
 
-solo deployment add-cluster --deployment "${SOLO_DEPLOYMENT}" --cluster-ref kind-${SOLO_CLUSTER_NAME} --num-consensus-nodes 2 | tee ${BUILD_DIR}/deployment-add-cluster.log
+solo deployment add-cluster --deployment "${SOLO_DEPLOYMENT}" --cluster-ref kind-${SOLO_CLUSTER_NAME} --num-consensus-nodes 1 | tee ${BUILD_DIR}/deployment-add-cluster.log
 export SOLO_DEPLOYMENT_ADD_CLUSTER_OUTPUT=$( cat ${BUILD_DIR}/deployment-add-cluster.log | tee ${BUILD_DIR}/test.log )
 
-solo node keys --gossip-keys --tls-keys -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/keys.log
+solo node keys --gossip-keys --tls-keys --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/keys.log
 export SOLO_NODE_KEY_PEM_OUTPUT=$( cat ${BUILD_DIR}/keys.log | tee ${BUILD_DIR}/test.log )
 
 solo cluster-ref setup -s "${SOLO_CLUSTER_SETUP_NAMESPACE}" | tee ${BUILD_DIR}/cluster-setup.log
@@ -55,26 +55,26 @@ export SOLO_CLUSTER_SETUP_OUTPUT=$( cat ${BUILD_DIR}/cluster-setup.log | tee ${B
 solo block node add --deployment "${SOLO_DEPLOYMENT}" --cluster-ref kind-"${SOLO_CLUSTER_NAME}" "${CONSENSUS_NODE_FLAG[@]}" | tee ${BUILD_DIR}/block-node-add.log
 export SOLO_BLOCK_NODE_ADD_OUTPUT=$( cat ${BUILD_DIR}/block-node-add.log | tee ${BUILD_DIR}/test.log )
 
-solo network deploy -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/network-deploy.log
+solo network deploy --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/network-deploy.log
 export SOLO_NETWORK_DEPLOY_OUTPUT=$( cat ${BUILD_DIR}/network-deploy.log | tee ${BUILD_DIR}/test.log )
 
-solo node setup -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" "${CONSENSUS_NODE_FLAG[@]}" | tee ${BUILD_DIR}/node-setup.log
+solo node setup --deployment "${SOLO_DEPLOYMENT}" "${CONSENSUS_NODE_FLAG[@]}" | tee ${BUILD_DIR}/node-setup.log
 export SOLO_NODE_SETUP_OUTPUT=$( cat ${BUILD_DIR}/node-setup.log | tee ${BUILD_DIR}/test.log )
 
-solo node start -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/node-start.log
+solo node start --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/node-start.log
 export SOLO_NODE_START_OUTPUT=$( cat ${BUILD_DIR}/node-start.log | tee ${BUILD_DIR}/test.log )
 
 # shellcheck disable=SC2086
 solo mirror-node deploy --deployment "${SOLO_DEPLOYMENT}" --cluster-ref kind-${SOLO_CLUSTER_NAME} -q | tee ${BUILD_DIR}/mirror-node-deploy.log
 export SOLO_MIRROR_NODE_DEPLOY_OUTPUT=$( cat ${BUILD_DIR}/mirror-node-deploy.log | tee ${BUILD_DIR}/test.log )
 
-solo relay deploy -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/relay-deploy.log
+solo relay deploy -i node1 --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/relay-deploy.log
 export SOLO_RELAY_DEPLOY_OUTPUT=$( cat ${BUILD_DIR}/relay-deploy.log | tee ${BUILD_DIR}/test.log )
 
 solo explorer deploy --deployment "${SOLO_DEPLOYMENT}" --cluster-ref kind-${SOLO_CLUSTER_NAME} -q | tee ${BUILD_DIR}/explorer-deploy.log
 export SOLO_EXPLORER_DEPLOY_OUTPUT=$( cat ${BUILD_DIR}/explorer-deploy.log | tee ${BUILD_DIR}/test.log )
 
-solo relay destroy -i node1,node2 --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/relay-destroy.log
+solo relay destroy -i node1 --deployment "${SOLO_DEPLOYMENT}" | tee ${BUILD_DIR}/relay-destroy.log
 export SOLO_RELAY_DESTROY_OUTPUT=$( cat ${BUILD_DIR}/relay-destroy.log | tee ${BUILD_DIR}/test.log )
 
 solo mirror-node destroy --deployment "${SOLO_DEPLOYMENT}" --force -q | tee ${BUILD_DIR}/mirror-node-destroy.log

.github/workflows/support/v58-test/settings.txt

@@ -0,0 +1,6 @@
+
+state.signedStateDisk,2 
+#addressBook.useRosterLifecycle, true
+#networkAdmin.diskNetworkExport, EVERY_BLOCK
+#networkAdmin.diskNetworkExportFile, network.json
+