fix(tools): send chain metadata url from upgrade testing

Signed-off-by: Artur Troian <[email protected]>

Author: troian

make/test-upgrade.mk

@@ -25,9 +25,11 @@ SNAPSHOT_SOURCE         ?= sandbox
 
 ifeq ($(SNAPSHOT_SOURCE),mainnet)
 	SNAPSHOT_NETWORK    := akashnet-2
+	CHAIN_METADATA_URL  := https://raw.githubusercontent.com/akash-network/net/master/mainnet/meta.json
 else
 	ifeq ($(SNAPSHOT_SOURCE),sandbox)
 		SNAPSHOT_NETWORK    := sandbox-01
+		CHAIN_METADATA_URL  := https://raw.githubusercontent.com/akash-network/net/master/sandbox/meta.json
 	else
 $(error "invalid snapshot source $(SNAPSHOT_SOURCE)")
 	endif
@@ -44,6 +46,7 @@ $(AKASH_INIT):
 		--ufrom=$(UPGRADE_FROM) \
 		--uto=$(UPGRADE_TO) \
 		--config="$(PWD)/config.json" \
+		--chain-meta=$(CHAIN_METADATA_URL) \
 		--state-config=$(STATE_CONFIG) \
 		--snapshot-url=$(SNAPSHOT_URL) init
 	touch $@
@@ -66,20 +69,20 @@ test: init
 
 .PHONY: test-reset
 test-reset:
-	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) clean
-	#$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --gbv=$(GENESIS_BINARY_VERSION) bins
-	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) keys
-	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --state-config=$(STATE_CONFIG) --snapshot-url=$(SNAPSHOT_URL) prepare-state
+	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --chain-meta=$(CHAIN_METADATA_URL)  clean
+	#$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --gbv=$(GENESIS_BINARY_VERSION) --chain-meta=$(CHAIN_METADATA_URL) bins
+	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --chain-meta=$(CHAIN_METADATA_URL) keys
+	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --state-config=$(STATE_CONFIG) --snapshot-url=$(SNAPSHOT_URL) --chain-meta=$(CHAIN_METADATA_URL) prepare-state
 
 .PHONY: prepare-state
 prepare-state:
-	$(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) --chain-meta=$(CHAIN_METADATA_URL) prepare-state
 
 .PHONY: bins
 bins:
 ifneq ($(findstring build,$(SKIP)),build)
 bins:
-	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) bins
+	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --chain-meta=$(CHAIN_METADATA_URL) bins
 endif
 
 .PHONY: clean

script/upgrades.sh

@@ -439,21 +439,45 @@ function prepare_state() {
 			rm -f upgrade-info.json
 
 			popd
+		else
+			pushd "$(pwd)"
+			cd "${valdir}"
+
+			mkdir -p "data"
+
+			echo '{"height": "0", "round": 0, "step": 0}' > data/priv_validator_state.json
+
+			popd
+		fi
+
+		((cnt++)) || true
+	done
+
+	cnt=0
 
+	for val in $(jq -c '.validators[]' <<<"$config"); do
+		local valdir
+
+		valdir=$validators_dir/.akash${cnt}
+
+		if [[ $cnt -eq 0 ]]; then
 			$AKASH testnetify --home="$valdir" --testnet-rootdir="$validators_dir" --testnet-config="${STATE_CONFIG}" --yes || true
 		else
 			pushd "$(pwd)"
+
 			cd "${valdir}"
 
-			cp -r "${validators_dir}/.akash0/data" ./
+			rm -f "config/genesis.json"
 
-			pushd "$(pwd)"
+			cp -r "${validators_dir}/.akash0/config/genesis.json" "config/genesis.json"
 
-			cd "config"
+			local state
+			state=$(cat data/priv_validator_state.json)
 
-			ln -snf "../../.akash0/config/genesis.json" "genesis.json"
+			rm -rf "data"
+			cp -r "${validators_dir}/.akash0/data" ./
 
-			popd
+			echo "$state" > data/priv_validator_state.json
 			popd
 		fi
 
@@ -485,9 +509,6 @@ function clean() {
 		rm -rf "$cosmovisor_dir/current"
 		rm -rf "$cosmovisor_dir/upgrades/${UPGRADE_TO}/upgrade-info.json"
 
-#		mkdir -p "$valdir/data"
-#		echo '{"height":"0","round": 0,"step": 0}' | jq > "$valdir/data/priv_validator_state.json"
-
 		((cnt++)) || true
 	done
 }