Merge PR: max world state num (#819)

* update go mod * MercuryHeight=2500000 * update go mod * upgrade go mod Co-authored-by: Zhong Qiu <[email protected]>
okx · Apr 15, 2021 · 7859248 · 7859248
1 parent 90b22c0
commit 7859248
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ export GO111MODULE=on
 
 GithubTop=github.com
 
-Version=v0.17.2
+Version=v0.17.3
 CosmosSDK=v0.39.2
 Tendermint=v0.33.9
 Iavl=v0.14.3
@@ -16,7 +16,7 @@ ServerName=okexchaind
 ClientName=okexchaincli
 # the height of the 1st block is GenesisHeight+1
 GenesisHeight=0
-MercuryHeight=2100000
+MercuryHeight=2500000
 
 # process linker flags
 ifeq ($(VERSION),)

diff --git a/go.mod b/go.mod
@@ -54,7 +54,7 @@ require (
 )
 
 replace (
-	github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.39.2-exchain1
+	github.com/cosmos/cosmos-sdk => github.com/okex/cosmos-sdk v0.39.3-0.20210415083051-0d8e3e2acb52
 	github.com/tendermint/iavl => github.com/okex/iavl v0.14.3-exchain
 	github.com/tendermint/tendermint => github.com/okex/tendermint v0.33.9-exchain
 )
diff --git a/go.sum b/go.sum
@@ -500,8 +500,8 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/okex/cosmos-sdk v0.39.2-exchain1 h1:ue618CeIiCtcEKJqGxgumEgS2JlgLDbD8yUdnqS+/+o=
-github.com/okex/cosmos-sdk v0.39.2-exchain1/go.mod h1:Y1C2roqCVZ6gSYG31X77x4NLcbSGS9VP1GIiAE1imcc=
+github.com/okex/cosmos-sdk v0.39.3-0.20210415083051-0d8e3e2acb52 h1:J7rtuuAZ08TOXFAuLYu45CR7SA/p5MZ8pH4NbpoxD8U=
+github.com/okex/cosmos-sdk v0.39.3-0.20210415083051-0d8e3e2acb52/go.mod h1:Y1C2roqCVZ6gSYG31X77x4NLcbSGS9VP1GIiAE1imcc=
 github.com/okex/iavl v0.14.3-exchain h1:kwRIwpFD6B8mDDqoaxeUN3Pg2GW0Vr+sA+b86renWcA=
 github.com/okex/iavl v0.14.3-exchain/go.mod h1:vHLYxU/zuxBmxxr1v+5Vnd/JzcIsyK17n9P9RDubPVU=
 github.com/okex/tendermint v0.33.9-exchain h1:8JuPeB+NgfnPFa5ki89bspLAJzWeIV9C6OFSr1u5IsI=