Revert "fix: handle hang-on-halt behavior from agoric-labs/cosmos-sdk…

…#305"

This reverts commit efcc3b0.

We decided to roll back the problematic change (agoric-labs/cosmos-sdk#305).

golang/cosmos/Makefile

@@ -47,7 +47,7 @@ SHARED_BUILD_FLAGS := -tags "$(build_tags)" -gcflags '$(gcflags)' -ldflags '$(sh
 
 all: compile-chain
 
-compile-chain: compile-agd compile-daemon compile-tools
+compile-chain: compile-agd compile-daemon
 compile-go: compile-agd compile-libdaemon
 compile-node: node-compile-gyp
 
@@ -77,9 +77,6 @@ compile-libdaemon: go-mod-cache
 	go build -v $(MOD_READONLY) $(SHARED_BUILD_FLAGS) -buildmode=c-shared \
 		-o build/libagcosmosdaemon.so ./cmd/libdaemon/main.go
 
-compile-tools:
-	go build -o build/runtillmsg ./cmd/runtillmsg
-
 go-mod-cache: go.sum
 	@echo "--> Download go modules to local cache"
 	@go mod download
@@ -109,7 +106,7 @@ t:
 
 TM_URL           := file://$(shell go list -m -f '{{ .Dir }}' github.com/tendermint/tendermint)/proto/tendermint
 GOGO_PROTO_URL   := file://$(shell go list -m -f '{{ .Dir }}' github.com/gogo/protobuf)
-IBC_PROTO_URL    := file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/ibc-go/v4)/proto/ibc/core
+IBC_PROTO_URL    := file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/ibc-go/v3)/proto/ibc/core
 COSMOS_SDK_PROTO_URL := file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/cosmos-sdk)/proto/cosmos
 
 GOGO_PROTO_TYPES  = third_party/proto/gogoproto

packages/cosmic-swingset/Makefile

@@ -156,16 +156,11 @@ scenario2-run-chain: ../vats/decentral-devnet-config.json
 		OTEL_EXPORTER_PROMETHEUS_PORT=$(OTEL_EXPORTER_PROMETHEUS_PORT) \
 		$(AGC) --home=t1/n0 start --log_level=warn $(AGC_START_ARGS)
 
-tools:
-	cd ../../golang/cosmos && make compile-tools
-
 # Run a chain with an explicit halt.
 BLOCKS_TO_RUN=3
-scenario2-run-chain-to-halt: t1/decentral-economy-config.json tools
+scenario2-run-chain-to-halt: t1/decentral-economy-config.json
 	CHAIN_BOOTSTRAP_VAT_CONFIG="$$PWD/t1/decentral-economy-config.json" \
-		DEBUG=$(DEBUG) PATH="$$PWD/bin:$$PATH" \
-		../../golang/cosmos/build/runtillmsg "halt application" \
-		"$(SDK_ROOT)/bin/agd" --home=t1/n0 start --log_level=warn --halt-height=$$(($(INITIAL_HEIGHT) + $(BLOCKS_TO_RUN))); \
+		$(AGC) --home=t1/n0 start --log_level=warn --halt-height=$$(($(INITIAL_HEIGHT) + $(BLOCKS_TO_RUN))); \
 		test "$$?" -eq 98
 	echo ran to $(INITIAL_HEIGHT) + $(BLOCKS_TO_RUN)