Merge branch 'develop' into refactor-status-message

Makefile

@@ -327,7 +327,7 @@ ifdef UPGRADE_TEST_FROM_SOURCE
 zetanode-upgrade: e2e-images
 	@echo "Building zetanode-upgrade from source"
 	$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime-source \
-		--build-arg OLD_VERSION='release/v23' \
+		--build-arg OLD_VERSION='release/v24' \
 		--build-arg NODE_VERSION=$(NODE_VERSION) \
 		--build-arg NODE_COMMIT=$(NODE_COMMIT)
 		.
@@ -336,7 +336,7 @@ else
 zetanode-upgrade: e2e-images
 	@echo "Building zetanode-upgrade from binaries"
 	$(DOCKER) build -t zetanode:old -f Dockerfile-localnet --target old-runtime \
-	--build-arg OLD_VERSION='https://github.com/zeta-chain/node/releases/download/v23.1.5' \
+	--build-arg OLD_VERSION='https://github.com/zeta-chain/node/releases/download/v24.0.0' \
 	--build-arg NODE_VERSION=$(NODE_VERSION) \
 	--build-arg NODE_COMMIT=$(NODE_COMMIT) \
 	.
@@ -409,7 +409,7 @@ test-sim-fullappsimulation:
 	$(call run-sim-test,"TestFullAppSimulation",TestFullAppSimulation,100,200,30m)
 
 test-sim-import-export:
-	$(call run-sim-test,"test-import-export",TestAppImportExport,50,100,30m)
+	$(call run-sim-test,"test-import-export",TestAppImportExport,100,200,30m)
 
 test-sim-after-import:
 	$(call run-sim-test,"test-sim-after-import",TestAppSimulationAfterImport,100,200,30m)
@@ -430,6 +430,12 @@ test-sim-after-import-long: runsim
 	@echo "Running application simulation-after-import. This may take several minute"
 	@$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) -ExitOnFail 500 50 TestAppSimulationAfterImport
 
+# Use to run all simulation tests quickly (for example, before a creating a PR)
+test-sim-quick:
+	$(call run-sim-test,"test-full-app-sim",TestFullAppSimulation,10,20,30m)
+	$(call run-sim-test,"test-import-export",TestAppImportExport,10,20,30m)
+	$(call run-sim-test,"test-sim-after-import",TestAppSimulationAfterImport,10,20,30m)
+
 .PHONY: \
 test-sim-nondeterminism \
 test-sim-fullappsimulation \
@@ -482,49 +488,6 @@ stop-eth-node-mainnet:
 clean-eth-node-mainnet:
 	cd contrib/rpc/ethereum && DOCKER_TAG=$(DOCKER_TAG) docker-compose down -v
 
-#ZETA
-
-#FULL-NODE-RPC-FROM-BUILT-IMAGE
-start-zetacored-rpc-mainnet:
-	cd contrib/rpc/zetacored && bash init_docker_compose.sh mainnet image $(DOCKER_TAG)
-
-stop-zetacored-rpc-mainnet:
-	cd contrib/rpc/zetacored && bash kill_docker_compose.sh mainnet false
-
-clean-zetacored-rpc-mainnet:
-	cd contrib/rpc/zetacored && bash kill_docker_compose.sh mainnet true
-
-#FULL-NODE-RPC-FROM-BUILT-IMAGE
-start-zetacored-rpc-testnet:
-	cd contrib/rpc/zetacored && bash init_docker_compose.sh athens3 image $(DOCKER_TAG)
-
-stop-zetacored-rpc-testnet:
-	cd contrib/rpc/zetacored && bash kill_docker_compose.sh athens3 false
-
-clean-zetacored-rpc-testnet:
-	cd contrib/rpc/zetacored && bash kill_docker_compose.sh athens3 true
-
-#FULL-NODE-RPC-FROM-LOCAL-BUILD
-start-zetacored-rpc-mainnet-localbuild:
-	cd contrib/rpc/zetacored && bash init_docker_compose.sh mainnet localbuild $(DOCKER_TAG)
-
-stop-zetacored-rpc-mainnet-localbuild:
-	cd contrib/rpc/zetacored && bash kill_docker_compose.sh mainnet false
-
-clean-zetacored-rpc-mainnet-localbuild:
-	cd contrib/rpc/zetacored && bash kill_docker_compose.sh mainnet true
-
-#FULL-NODE-RPC-FROM-LOCAL-BUILD
-start-zetacored-rpc-testnet-localbuild:
-	cd contrib/rpc/zetacored && bash init_docker_compose.sh athens3 localbuild $(DOCKER_TAG)
-
-stop-zetacored-rpc-testnet-localbuild:
-	cd contrib/rpc/zetacored && bash kill_docker_compose.sh athens3 false
-
-clean-zetacored-rpc-testnet-localbuild:
-	cd contrib/rpc/zetacored && bash kill_docker_compose.sh athens3 true
-
-
 ###############################################################################
 ###                               Debug Tools                               ###
 ###############################################################################