bump to cosmos-sdk v0.37.9-okchain6

okx · May 29, 2020 · b0c7959 · b0c7959
1 parent 5157b6c
commit b0c7959
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ ldflags += $(LDFLAGS)
 ldflags := $(strip $(ldflags))
 
 BUILD_FLAGS := -ldflags '$(ldflags)'  -gcflags "all=-N -l"
-
+BUILD_TESTNET_FLAGS := $(BUILD_FLAGS) -ldflags '-X github.com/okex/okchain/vendor/github.com/tendermint/tendermint/types.startBlockHeightStr=6028399'
 
 all: install
 
@@ -49,6 +49,10 @@ okchain:
 	go install -v $(BUILD_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/okchaind
 	go install -v $(BUILD_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/okchaincli
 
+testnet:
+	env GO111MODULE=off go install -v $(BUILD_TESTNET_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/okchaind
+	env GO111MODULE=off go install -v $(BUILD_TESTNET_FLAGS) -tags "$(BUILD_TAGS)" ./cmd/okchaincli
+
 test-unit:
 	@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' ./app/...
 	@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' ./x/backend/...

diff --git a/go.mod b/go.mod
@@ -44,7 +44,7 @@ require (
 )
 
 replace (
-	github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.37.9-okchain5
+	github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.37.9-okchain6
 	github.com/tendermint/iavl => github.com/okex/iavl v0.12.4-okchain
 	github.com/tendermint/tendermint => github.com/okex/tendermint v0.32.10-okchain1
 )
diff --git a/go.sum b/go.sum
@@ -194,8 +194,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/okex/cosmos-sdk v0.37.9-okchain5 h1:/f+t979c/MzGGOvp8wuY4Vxpu+jU0gUJ0PKCKhytsNE=
-github.com/okex/cosmos-sdk v0.37.9-okchain5/go.mod h1:HjW0+Q5rWWm+4CaK8f5CIN/xf38vkPA2xue1PB5Nk3A=
+github.com/okex/cosmos-sdk v0.37.9-okchain6 h1:4EzAhX+6Ouup7sRJZ4hj6wibCbgrcYte8Ym322pN/oo=
+github.com/okex/cosmos-sdk v0.37.9-okchain6/go.mod h1:HjW0+Q5rWWm+4CaK8f5CIN/xf38vkPA2xue1PB5Nk3A=
 github.com/okex/iavl v0.12.4-okchain h1:BAFmygzhx6k4KGnLrY87ZrJvRSb+wf8Oo4e2KhUwXcU=
 github.com/okex/iavl v0.12.4-okchain/go.mod h1:8LHakzt8/0G3/I8FUU0ReNx98S/EP6eyPJkAUvEXT/o=
 github.com/okex/tendermint v0.32.10-okchain1 h1:mEsl6YGb7mCkJaXZxnIZO6/jmF947X39wFa4oI8gKgE=