fix: network upgrade test

Signed-off-by: Artur Troian <troian@users.noreply.github.com>

Author: troian

.github/workflows/tests.yaml

@@ -176,7 +176,9 @@ jobs:
       - name: configure variables
         run: |
           test_required=$(./script/upgrades.sh test-required ${{ github.ref }})
+          #snapshot_source=$(./script/upgrades.sh snapshot-source ${{ github.ref }})
           echo "TEST_REQUIRED=$test_required" >> $GITHUB_ENV
+          #echo "SNAPSHOT_SOURCE=$snapshot_source" >> $GITHUB_ENV
       - name: run test
         id: test
         if: env.TEST_REQUIRED != ''

make/test-upgrade.mk

@@ -21,6 +21,19 @@ UPGRADE_FROM            := $(shell cat $(ROOT_DIR)/meta.json | jq -r --arg name
 GENESIS_BINARY_VERSION  := $(shell cat $(ROOT_DIR)/meta.json | jq -r --arg name $(UPGRADE_TO) '.upgrades[$$name].from_binary' | tr -d '\n')
 UPGRADE_BINARY_VERSION  ?= local
 
+SNAPSHOT_SOURCE         ?= mainnet
+
+ifneq ($(SNAPSHOT_SOURCE),mainnet)
+	ifeq ($(SNAPSHOT_SOURCE),sandbox)
+		SNAPSHOT_NETWORK    := sandbox-01
+	else
+$(error "invalid snapshot source $(SNAPSHOT_SOURCE)")
+	endif
+else
+	SNAPSHOT_NETWORK    := akashnet-2
+endif
+
+SNAPSHOT_URL            ?= https://snapshots.akash.network/$(SNAPSHOT_NETWORK)/latest
 REMOTE_TEST_WORKDIR     ?= ~/go/src/github.com/akash-network/node
 REMOTE_TEST_HOST        ?=
 
@@ -49,7 +62,7 @@ test-reset:
 	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) clean
 	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --gbv=$(GENESIS_BINARY_VERSION) bins
 	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) keys
-	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --state-config=$(STATE_CONFIG) prepare-state
+	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --state-config=$(STATE_CONFIG) --snapshot-url=$(SNAPSHOT_URL) prepare-state
 
 .PHONY: prepare-state
 prepare-state:

script/upgrades.sh

@@ -595,6 +595,46 @@ case "$1" in
 			exit 1
 		fi
 
+		;;
+	snapshot-source)
+		shift
+
+		curr_ref=$1
+		snapshot_source="sandbox"
+
+		is_valid=$($semver validate "$curr_ref")
+
+		if [[ $is_valid == "valid" ]]; then
+			build=$($semver get build "$curr_ref")
+			if [[ -n $build ]]; then
+				# Split the input by dots, as only dot is allowed in semver build token
+				IFS='.' read -ra PARTS <<< "$build"
+				# Process pairs (key at even index, value at odd index)
+				for ((i=0; i<${#PARTS[@]}; i+=2)); do
+					key="${PARTS[i]}"
+					value="${PARTS[i+1]}"
+
+					# Skip if value is missing
+					if [ -z "$value" ]; then
+						continue
+					fi
+
+					case "$key" in
+						network)
+							snapshot_source=$value
+							;;
+						*)
+							;;
+					esac
+				done
+			fi
+		elif [[ $curr_ref == "mainnet/main" || $curr_ref == "main" ]]; then
+			snapshot_source="mainnet"
+		fi
+
+		echo -n "$snapshot_source"
+
+		exit 0
 		;;
 	test-required)
 		shift

tests/upgrade/test-cases.json

@@ -4,11 +4,6 @@
             "added": [
                 "07-tendermint",
                 "consensus"
-            ],
-            "removed": [
-                "crisis",
-                "agov",
-                "astaking"
             ]
         },
         "migrations": {

tests/upgrade/upgrade_test.go

@@ -1259,7 +1259,7 @@ loop:
 func (l *validator) scanner(stdout io.Reader, p publisher) error {
 	scanner := bufio.NewScanner(stdout)
 
-	serverStart := "INF starting node with ABCI Tendermint in-process"
+	serverStart := "INF starting node with ABCI "
 	replayBlocksStart := "INF ABCI Replay Blocks appHeight"
 	replayBlocksDone := "INF Replay: Done module=consensus"
 	executedBlock := "INF indexed block "
@@ -1268,6 +1268,11 @@ func (l *validator) scanner(stdout io.Reader, p publisher) error {
 	addingNewModule := "INF adding a new module: "
 	migratingModule := "INF migrating module "
 
+	rServerStart, err := regexp.Compile(`^` + serverStart + `(Tendermint|CometBFT) in-process`)
+	if err != nil {
+		return err
+	}
+
 	rNewModule, err := regexp.Compile(`^` + addingNewModule + `(.+) (.+)$`)
 	if err != nil {
 		return err
@@ -1287,6 +1292,10 @@ scan:
 		if strings.Contains(line, upgradeNeeded) {
 			evt.id = nodeEventUpgradeDetected
 		} else if strings.Contains(line, serverStart) {
+			res := rServerStart.FindAllStringSubmatch(line, -1)
+			if len(res) != 1 && len(res[0]) != 2 {
+				return fmt.Errorf("line \"%s\" does not match regex \"%s\"", line, rServerStart.String())
+			}
 			evt.id = nodeEventStart
 		} else if strings.Contains(line, replayBlocksStart) {
 			evt.id = nodeEventReplayBlocksStart

tests/upgrade/workers_test.go

@@ -6,19 +6,23 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	sdkmath "cosmossdk.io/math"
 	sdkclient "github.com/cosmos/cosmos-sdk/client"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	"github.com/stretchr/testify/require"
+
 	"pkg.akt.dev/go/cli/flags"
+	arpcclient "pkg.akt.dev/go/node/client"
 	aclient "pkg.akt.dev/go/node/client/discovery"
 	cltypes "pkg.akt.dev/go/node/client/types"
 	"pkg.akt.dev/go/node/client/v1beta3"
 	"pkg.akt.dev/go/sdkutil"
 
+	"pkg.akt.dev/node/app"
 	uttypes "pkg.akt.dev/node/tests/upgrade/types"
 )
 
@@ -34,8 +38,9 @@ var _ uttypes.TestWorker = (*postUpgrade)(nil)
 
 func (pu *postUpgrade) Run(ctx context.Context, t *testing.T, params uttypes.TestParams) {
 	encodingConfig := sdkutil.MakeEncodingConfig()
+	app.ModuleBasics().RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
-	rpcClient, err := sdkclient.NewClientFromNode(params.Node)
+	rpcClient, err := arpcclient.NewClient(ctx, params.Node)
 	require.NoError(t, err)
 
 	cctx := sdkclient.Context{}.