Merge PR: disable msg of dex && order with block height (#818)

* FINISH: disable msg of dex && order with block height * OPTIMIZE: typo * OPTIMIZE: msg text * OPTIMIZE: update MercuryHeight in Makefile
okx · Apr 15, 2021 · 2ff92b3 · 2ff92b3
1 parent 0ed74b4
commit 2ff92b3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -16,6 +16,7 @@ ServerName=okexchaind
 ClientName=okexchaincli
 # the height of the 1st block is GenesisHeight+1
 GenesisHeight=0
+MercuryHeight=2100000
 
 # process linker flags
 ifeq ($(VERSION),)
@@ -40,6 +41,7 @@ ldflags = -X $(GithubTop)/cosmos/cosmos-sdk/version.Version=$(Version) \
   -X $(GithubTop)/cosmos/cosmos-sdk/version.Tendermint=$(Tendermint) \
   -X $(GithubTop)/cosmos/cosmos-sdk/version.BuildTags=$(build_tags) \
   -X $(GithubTop)/tendermint/tendermint/types.startBlockHeightStr=$(GenesisHeight) \
+  -X $(GithubTop)/cosmos/cosmos-sdk/types.MILESTONE_MERCURY_HEIGHT=$(MercuryHeight) \
 
 
 ldflags += $(LDFLAGS)

diff --git a/x/dex/handler.go b/x/dex/handler.go
@@ -4,19 +4,23 @@ import (
 	"fmt"
 	"strconv"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/okex/exchain/x/common"
-
 	"github.com/okex/exchain/x/common/perf"
 	"github.com/okex/exchain/x/dex/types"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/tendermint/tendermint/crypto/tmhash"
 	"github.com/tendermint/tendermint/libs/log"
 )
 
 // NewHandler handles all "dex" type messages.
 func NewHandler(k IKeeper) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
+		// disable dex tx handler
+		if sdk.HigherThanMercury(ctx.BlockHeight()) {
+			return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "dex message has been disabled")
+		}
+
 		ctx = ctx.WithEventManager(sdk.NewEventManager())
 		logger := ctx.Logger().With("module", ModuleName)
 

diff --git a/x/order/handler.go b/x/order/handler.go
@@ -3,19 +3,18 @@ package order
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/okex/exchain/x/common"
 	"math"
 
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/tendermint/tendermint/crypto/tmhash"
-	"github.com/tendermint/tendermint/libs/log"
-	"github.com/willf/bitset"
-
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	"github.com/okex/exchain/x/common"
 	"github.com/okex/exchain/x/common/perf"
 	"github.com/okex/exchain/x/order/keeper"
 	"github.com/okex/exchain/x/order/types"
+	"github.com/tendermint/tendermint/crypto/tmhash"
+	"github.com/tendermint/tendermint/libs/log"
+	"github.com/willf/bitset"
 )
 
 func CalculateGas(msg sdk.Msg, params *types.Params) (gas uint64) {
@@ -34,6 +33,11 @@ func CalculateGas(msg sdk.Msg, params *types.Params) (gas uint64) {
 // NewOrderHandler returns the handler with version 0.
 func NewOrderHandler(keeper keeper.Keeper) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
+		// disable order tx handler
+		if sdk.HigherThanMercury(ctx.BlockHeight()) {
+			return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, "order message has been disabled")
+		}
+
 		gas := CalculateGas(msg, keeper.GetParams(ctx))
 
 		// consume gas that msg required, it will panic if gas is insufficient