[Feature] Update cosmos-sdk to v0.37.2 (#240)

* update to cosmos-v0.37.1

* fix oracle genesis export import feature & clear oracle prevote, vote, price when for-zero-height export

* append genesis test

* update cosmos-sdk to v0.37.2

* Bump Tendermint version to v0.32.6 to address p2p panic errors.

* Bump SDK version to v0.37.3

* merge

Makefile

@@ -65,7 +65,7 @@ BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)'
 # The below include contains the tools target.
 include contrib/devtools/Makefile
 
-all: install lint check
+all: install lint test
 
 build: go.sum
 ifeq ($(OS),Windows_NT)
@@ -86,7 +86,7 @@ else
 	go build -mod=readonly $(BUILD_FLAGS) -o build/contract_tests ./cmd/contract_tests
 endif
 
-install: go.sum check-ledger
+install: go.sum 
 	go install -mod=readonly $(BUILD_FLAGS) ./cmd/terrad
 	go install -mod=readonly $(BUILD_FLAGS) ./cmd/terracli
 
@@ -121,19 +121,19 @@ distclean: clean
 ### Testing
 
 
-check: check-unit check-build
-check-all: check check-race check-cover
+test: test-unit test-build
+test-all: test test-race test-cover
 
-check-unit:
+test-unit:
 	@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' ./...
 
-check-race:
+test-race:
 	@VERSION=$(VERSION) go test -mod=readonly -race -tags='ledger test_ledger_mock' ./...
 
-check-cover:
+test-cover:
 	@go test -mod=readonly -timeout 30m -race -coverprofile=coverage.txt -covermode=atomic -tags='ledger test_ledger_mock' ./...
 
-check-build: build
+test-build: build
 	@go test -mod=readonly -p 4 `go list ./cli_test/...` -tags=cli_test -v
 
 
@@ -195,5 +195,5 @@ include sims.mk
 .PHONY: all build-linux install install-debug \
 	go-mod-cache draw-deps clean build \
 	setup-transactions setup-contract-tests-data start-terra run-lcd-contract-tests contract-tests \
-	check check-all check-build check-cover check-ledger check-unit check-race
+	test test-all test-build test-cover test-unit test-race
 

README.md

@@ -20,7 +20,7 @@ Terra Core builds on [Tendermint](https://github.com/tendermint/tendermint) cons
 
 **WARNING**: Terra Core has mostly stabilized, but breaking changes may come regularly.
 
-**Note**: Requires [Go 1.12+](https://golang.org/dl/)
+**Note**: Requires [Go 1.13+](https://golang.org/dl/)
 
 ## Status
 

app/export.go

@@ -186,7 +186,7 @@ func (app *TerraApp) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList []s
 		return false
 	})
 
-  /* Handle market state. */
+	/* Handle market state. */
 
 	// clear all market pools
 	app.marketKeeper.SetTerraPoolDelta(ctx, sdk.ZeroDec())

app/sim_test.go

@@ -106,7 +106,16 @@ func appStateFn(
 		panic("cannot provide both a genesis file and a params file")
 
 	case genesisFile != "":
-		appState, simAccs, chainID = simapp.AppStateFromGenesisFileFn(r, accs, genesisTimestamp)
+		genesisDoc, accounts := simapp.AppStateFromGenesisFileFn(r)
+
+		if genesisTime == 0 {
+			// use genesis timestamp if no custom timestamp is provided (i.e no random timestamp)
+			genesisTimestamp = genesisDoc.GenesisTime
+		}
+
+		appState = genesisDoc.AppState
+		chainID = genesisDoc.ChainID
+		simAccs = accounts
 
 	case paramsFile != "":
 		appParams := make(simulation.AppParams)

contrib/devtools/Makefile

@@ -43,11 +43,8 @@ mkfile_dir := $(shell cd $(shell dirname $(mkfile_path)); pwd)
 ###
 
 TOOLS_DESTDIR  ?= $(GOPATH)/bin
-
-GOLANGCI_LINT   = $(TOOLS_DESTDIR)/golangci-lint
-GOIMPORTS       = $(TOOLS_DESTDIR)/goimports
-CLOG            = $(TOOLS_DESTDIR)/clog
-RUNSIM          = $(TOOLS_DESTDIR)/runsim
+GOLANGCI_LINT  = $(TOOLS_DESTDIR)/golangci-lint
+RUNSIM         = $(TOOLS_DESTDIR)/runsim
 
 all: tools
 
@@ -56,21 +53,23 @@ tools-stamp: $(GOIMPORTS) $(RUNSIM)
 	touch $@
 
 $(GOLANGCI_LINT): $(mkfile_dir)/install-golangci-lint.sh
-	bash $(mkfile_dir)/install-golangci-lint.sh $(TOOLS_DESTDIR) $(GOLANGCI_LINT_VERSION) $(GOLANGCI_LINT_HASHSUM)
-
-$(GOIMPORTS):
-	go get golang.org/x/tools/cmd/goimports@v0.0.0-20190628034336-212fb13d595e
-
-$(CLOG):
-	go get github.com/cosmos/tools/cmd/clog/
-
+	@echo "Installing golangci-lint..."
+	@bash $(mkfile_dir)/install-golangci-lint.sh $(TOOLS_DESTDIR) $(GOLANGCI_LINT_VERSION) $(GOLANGCI_LINT_HASHSUM)
+
+# Install the runsim binary with a temporary workaround of entering an outside
+# directory as the "go get" command ignores the -mod option and will polute the
+# go.{mod, sum} files.
+# 
+# ref: https://github.com/golang/go/issues/30515
 $(RUNSIM):
-	go get github.com/cosmos/tools/cmd/runsim/
+	@echo "Installing runsim..."
+	@(cd /tmp && go get github.com/cosmos/tools/cmd/runsim@v1.0.0)
 
 golangci-lint: $(GOLANGCI_LINT)
 
 tools-clean:
-	rm -f $(GOIMPORTS) $(CLOG) $(GOLANGCI_LINT)
+	rm -f $(GOLANGCI_LINT)
+	rm -f $(RUNSIM)
 	rm -f tools-stamp
 
-.PHONY: all tools tools-clean
+.PHONY: all tools tools-clean

contrib/gitian-build.sh

@@ -8,7 +8,7 @@
 set -euo pipefail
 
 GITIAN_CACHE_DIRNAME='.gitian-builder-cache'
-GO_DEBIAN_RELEASE='1.12.7-1'
+GO_DEBIAN_RELEASE='1.13.1-1'
 GO_TARBALL="golang-debian-${GO_DEBIAN_RELEASE}.tar.gz"
 GO_TARBALL_URL="https://salsa.debian.org/go-team/compiler/golang/-/archive/debian/${GO_DEBIAN_RELEASE}/${GO_TARBALL}"
 

contrib/gitian-descriptors/gitian-darwin.yml

@@ -23,11 +23,11 @@ remotes:
 - "url": "https://github.com/cosmos/terra.git"
   "dir": "terra"
 files:
-- "golang-debian-1.12.7-1.tar.gz"
+- "golang-debian-1.13.1-1.tar.gz"
 script: |
   set -e -o pipefail
 
-  GO_SRC_RELEASE=golang-debian-1.12.7-1
+  GO_SRC_RELEASE=golang-debian-1.13.1-1
   GO_SRC_TARBALL="${GO_SRC_RELEASE}.tar.gz"
   # Compile go and configure the environment
   export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""

contrib/gitian-descriptors/gitian-linux.yml

@@ -23,11 +23,11 @@ remotes:
 - "url": "https://github.com/cosmos/terra.git"
   "dir": "terra"
 files:
-- "golang-debian-1.12.7-1.tar.gz"
+- "golang-debian-1.13.1-1.tar.gz"
 script: |
   set -e -o pipefail
 
-  GO_SRC_RELEASE=golang-debian-1.12.7-1
+  GO_SRC_RELEASE=golang-debian-1.13.1-1
   GO_SRC_TARBALL="${GO_SRC_RELEASE}.tar.gz"
   # Compile go and configure the environment
   export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""

contrib/gitian-descriptors/gitian-windows.yml

@@ -23,11 +23,11 @@ remotes:
 - "url": "https://github.com/cosmos/terra.git"
   "dir": "terra"
 files:
-- "golang-debian-1.12.7-1.tar.gz"
+- "golang-debian-1.13.1-1.tar.gz"
 script: |
   set -e -o pipefail
 
-  GO_SRC_RELEASE=golang-debian-1.12.7-1
+  GO_SRC_RELEASE=golang-debian-1.13.1-1
   GO_SRC_TARBALL="${GO_SRC_RELEASE}.tar.gz"
   # Compile go and configure the environment
   export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""

docs/guide/installation.md

@@ -14,7 +14,11 @@ Hardware requirements for running a node:
 Install `go` by following the [official docs](https://golang.org/doc/install).
 
 {% hint style="info" %}
+<<<<<<< HEAD
+    **Go 1.13+ +** is required for Terra Core.
+=======
 **Go 1.12+** is required for Terra Core.
+>>>>>>> origin/develop
 {% endhint %}
 
 > _NOTE_: Before installing `terrad` and `terracli` binaries, let's add the golang binaries to your `PATH` variable. Open your `.bash_profile` or `.zshrc` and append `$HOME/go/bin` to your PATH variable \(i.e. `export PATH=$HOME/bin:$HOME/go/bin`\).
@@ -45,7 +49,7 @@ terra-money: 0.2.1
 git commit: 1fba7308fa226e971964cd6baad9527d4b51d9fc
 vendor hash: 1aec7edfad9888a967b3e9063e42f66b28f447e6
 build tags: netgo ledger
-go version go1.12.1 linux/amd64
+go version go1.13.1 linux/amd64
 ```
 
 ### Build Tags

go.mod

@@ -1,23 +1,22 @@
 module github.com/terra-project/core
 
-go 1.12
+go 1.13
 
 require (
-	github.com/cosmos/cosmos-sdk v0.37.0
+	github.com/cosmos/cosmos-sdk v0.37.3
 	github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d // indirect
-	github.com/cosmos/tools/cmd/runsim v1.0.0 // indirect
 	github.com/gorilla/mux v1.7.2
-	github.com/otiai10/copy v1.0.1
+	github.com/otiai10/copy v1.0.2
 	github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect
 	github.com/pkg/errors v0.8.1
 	github.com/rakyll/statik v0.1.6
 	github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.3
-	github.com/spf13/viper v1.3.2
+	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.4.0
 	github.com/tendermint/go-amino v0.15.0
-	github.com/tendermint/tendermint v0.32.2
-	github.com/tendermint/tm-db v0.1.1
-	golang.org/x/tools v0.0.0-20190628034336-212fb13d595e // indirect
+	github.com/tendermint/tendermint v0.32.6
+	github.com/tendermint/tm-db v0.2.0
+	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
 )