chore: allow queries to be routed to abci.Query (#20774)

scripts/build/build.mk

@@ -6,7 +6,7 @@ export COMMIT := $(shell git log -1 --format='%H')
 LEDGER_ENABLED ?= true
 BINDIR ?= $(GOPATH)/bin
 BUILDDIR ?= $(CURDIR)/build
-SIMAPP = ./simapp
+SIMAPP = simapp
 MOCKS_DIR = $(CURDIR)/tests/mocks
 HTTPS_GIT := https://github.com/cosmos/cosmos-sdk.git
 DOCKER := $(shell which docker)
@@ -49,6 +49,10 @@ ifeq (legacy,$(findstring legacy,$(COSMOS_BUILD_OPTIONS)))
   build_tags += app_v1
 endif
 
+ifeq (v2,$(findstring v2,$(COSMOS_BUILD_OPTIONS)))
+  SIMAPP = simapp/v2
+endif
+
 # DB backend selection
 ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS)))
   build_tags += gcc
@@ -123,7 +127,7 @@ build-linux-arm64:
 	GOOS=linux GOARCH=arm64 LEDGER_ENABLED=false $(MAKE) build
 
 $(BUILD_TARGETS): go.sum $(BUILDDIR)/
-	cd ${CURRENT_DIR}/simapp && go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./...
+	cd ${CURRENT_DIR}/${SIMAPP} && go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./...
 
 $(BUILDDIR)/:
 	mkdir -p $(BUILDDIR)/

scripts/simapp-v2-init.sh

@@ -5,13 +5,11 @@ set -o nounset
 set -x
 
 ROOT=$PWD
-SIMAPP_DIR="$ROOT/simapp/v2"
 
 SIMD="$ROOT/build/simdv2"
 CONFIG="${CONFIG:-$HOME/.simappv2/config}"
 
-cd "$SIMAPP_DIR"
-go build -o "$ROOT/build/simdv2" simdv2/main.go
+COSMOS_BUILD_OPTIONS=v2 make build     
 
 if [ -d "$($SIMD config home)" ]; then rm -r $($SIMD config home); fi
 
@@ -48,4 +46,4 @@ while ! $SIMD query block --type=height 5; do
   sleep 1
 done
 
-kill -9 "$SIMD_PID"
+kill -9 "$SIMD_PID"