Unify version name constants in images

protocol/app/upgrades/v6.0.0/config/client.toml

@@ -0,0 +1,17 @@
+# This is a TOML config file.
+# For more information, see https://github.com/toml-lang/toml
+
+###############################################################################
+###                           Client Configuration                            ###
+###############################################################################
+
+# The network chain ID
+chain-id = ""
+# The keyring's backend, where the keys are stored (os|file|kwallet|pass|test|memory)
+keyring-backend = "os"
+# CLI output format (text|json)
+output = "text"
+# <host>:<port> to CometBFT RPC interface for this chain
+node = "tcp://localhost:26657"
+# Transaction broadcasting mode (sync|async)
+broadcast-mode = "sync"

protocol/testing/containertest/Dockerfile

@@ -7,6 +7,7 @@ COPY ./testing/containertest/preupgrade_genesis.json /dydxprotocol/preupgrade_ge
 COPY ./testing/genesis.sh /dydxprotocol/genesis.sh
 COPY ./daemons/pricefeed/client/constants/testdata /dydxprotocol/exchange_config
 COPY ./testing/delaymsg_config /dydxprotocol/delaymsg_config
+COPY ./testing/version/. /dydxprotocol/
 
 RUN go install cosmossdk.io/tools/cosmovisor/cmd/[email protected]
 

protocol/testing/containertest/containertest.sh

@@ -5,9 +5,9 @@ set -eo pipefail
 # This file should be run as part of `docker-compose.yml`.
 
 source "./genesis.sh"
+source "./version.sh"
 
 CHAIN_ID="localdydxprotocol"
-PREUPGRADE_VERSION="v5.1.0-rc2"
 
 # Define mnemonics for all validators.
 MNEMONICS=(

protocol/testing/containertest/testnet.go

@@ -9,6 +9,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/dydxprotocol/v4-chain/protocol/daemons/pricefeed/client/price_function/testexchange"
 	pricefeed "github.com/dydxprotocol/v4-chain/protocol/daemons/pricefeed/client/types"
+	"github.com/dydxprotocol/v4-chain/protocol/testing/version"
 	"github.com/dydxprotocol/v4-chain/protocol/testutil/constants"
 	pricefeed_testutil "github.com/dydxprotocol/v4-chain/protocol/testutil/pricefeed"
 	"github.com/ory/dockertest/v3"
@@ -24,9 +25,6 @@ const persistentPeers = "17e5e45691f0d01449c84fd4ae87279578cdd7ec@testnet-local-
 // Resources will expire in 10 minutes
 const resourceLifetimeSecs = 600
 
-// The version of that we're upgrading to (aka the current commit)
-const UpgradeToVersion = "v6.0.0"
-
 func monikers() map[string]string {
 	return map[string]string{
 		"alice": constants.AliceMnenomic,
@@ -158,7 +156,7 @@ func (t *Testnet) initializeNode(moniker string) (*Node, error) {
 			Env: []string{
 				"DAEMON_NAME=dydxprotocold",
 				fmt.Sprintf("DAEMON_HOME=/dydxprotocol/chain/.%s", moniker),
-				fmt.Sprintf("UPGRADE_TO_VERSION=%s", UpgradeToVersion),
+				fmt.Sprintf("UPGRADE_TO_VERSION=%s", version.CurrentVersion),
 			},
 			ExtraHosts: []string{
 				fmt.Sprintf("%s:host-gateway", testexchange.TestExchangeHost),

protocol/testing/containertest/testnet_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/cosmos/gogoproto/jsonpb"
 	"github.com/cosmos/gogoproto/proto"
 	"github.com/dydxprotocol/v4-chain/protocol/daemons/pricefeed/client/types"
+	"github.com/dydxprotocol/v4-chain/protocol/testing/version"
 	"github.com/dydxprotocol/v4-chain/protocol/testutil/constants"
 	"github.com/dydxprotocol/v4-chain/protocol/testutil/daemons/pricefeed/exchange_config"
 	assets "github.com/dydxprotocol/v4-chain/protocol/x/assets/types"
@@ -282,6 +283,6 @@ func TestUpgrade(t *testing.T) {
 	defer testnet.MustCleanUp()
 	node := testnet.Nodes["alice"]
 
-	err = UpgradeTestnet(constants.AliceAccAddress.String(), t, node, UpgradeToVersion)
+	err = UpgradeTestnet(constants.AliceAccAddress.String(), t, node, version.CurrentVersion)
 	require.NoError(t, err)
 }

protocol/testing/mainnet/Dockerfile

@@ -3,7 +3,7 @@ FROM dydxprotocol-base
 RUN apk add --no-cache bash jq aws-cli
 RUN go install cosmossdk.io/tools/cosmovisor/cmd/[email protected]
 
-COPY ./testing/current_version.sh /dydxprotocol/
+COPY ./testing/version/. /dydxprotocol/
 COPY ./testing/mainnet/. /dydxprotocol/
 
 ENV HOME /dydxprotocol

protocol/testing/mainnet/vars.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eo pipefail
 
-source "./current_version.sh"
+source "./version.sh"
 
 # Full node home directories will be set up for indices 0 to LAST_FULL_NODE_INDEX
 LAST_FULL_NODE_INDEX=5

protocol/testing/testnet/Dockerfile

@@ -3,7 +3,7 @@ FROM dydxprotocol-base
 RUN apk add --no-cache bash jq aws-cli
 RUN go install cosmossdk.io/tools/cosmovisor/cmd/[email protected]
 
-COPY ./testing/current_version.sh /dydxprotocol/
+COPY ./testing/version/. /dydxprotocol/
 COPY ./testing/testnet/. /dydxprotocol/
 
 ENV HOME /dydxprotocol

protocol/testing/testnet/vars.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eo pipefail
 
-source "./current_version.sh"
+source "./version.sh"
 
 # Full node home directories will be set up for indices 0 to LAST_FULL_NODE_INDEX
 LAST_FULL_NODE_INDEX=2

protocol/testing/version/README.md

@@ -0,0 +1 @@
+This directory contains files to configure version names used for upgrade tests and internal nodes. These versions are used for things such as upgrade proposals and cosmovisor directory names. When updating tests and images for a new version, most of the time you just need to change the `VERSION_CURRENT` and `VERSION_PREUPGRADE` files.

protocol/testing/version/VERSION_CURRENT

@@ -0,0 +1 @@
+v6.0.0

protocol/testing/version/VERSION_PREUPGRADE

@@ -0,0 +1 @@
+v5.2.0

protocol/testing/version/version.go

@@ -0,0 +1,6 @@
+package version
+
+import _ "embed"
+
+//go:embed VERSION_CURRENT
+var CurrentVersion string

protocol/testing/version/version.sh

@@ -0,0 +1,6 @@
+CURRENT_VERSION=$(<VERSION_CURRENT)
+PREUPGRADE_VERSION=$(<VERSION_PREUPGRADE)
+
+# Define the mapping from version to amd64 URL
+declare -A version_to_url
+version_to_url["$PREUPGRADE_VERSION"]="https://github.com/dydxprotocol/v4-chain/releases/download/protocol%2F$PREUPGRADE_VERSION/dydxprotocold-$PREUPGRADE_VERSION-linux-amd64.tar.gz"