Merge pull request #557 from binance-chain/release/v0.5.6

prepare for releasing v0.5.6

CHANGELOG.md

@@ -1,10 +1,29 @@
 # Changelog
 
-## 0.5.4
+## 0.5.5
 
 IMPROVEMENTS
 
 * [\#518](https://github.com/binance-chain/node/pull/518) [Gov] Adapt to changes in cosmos
+* [\#521](https://github.com/binance-chain/node/pull/521) [List] Add check for list proposal hook.
+* [\#517](https://github.com/binance-chain/node/pull/517) [Validator] Split fee address and operator address
+* [\#516](https://github.com/binance-chain/node/pull/516) [Publish] IocNoFill semantic correct
+* [\#514](https://github.com/binance-chain/node/pull/514) [Upgrade] Support config for upgrade height
+* [\#509](https://github.com/binance-chain/node/pull/509) [MatchEngine] Make the lot size reasonable for low price
+* [\#498](https://github.com/binance-chain/node/pull/498) [MatchEngine] Rename price of TradingPair to list_price
+* [\#497](https://github.com/binance-chain/node/pull/497) [Build] Support `build-windows`
+* [\#496](https://github.com/binance-chain/node/pull/476) [StateSync] Cache latest snapshot in memory
+* [\#526](https://github.com/binance-chain/node/pull/518) [ApiServer] Add gov queries in api server
+
+
+BUG FIXES
+
+* [\#508](https://github.com/binance-chain/node/pull/508) [\#511](https://github.com/binance-chain/node/pull/511) [\#501](https://github.com/binance-chain/node/pull/501) [Dex] Fix all potential int64 overflows, remove all use of float64, and optimize some calculation
+* [\#478](https://github.com/binance-chain/node/pull/478) [Publish] Dump order ids for large expire message.
+
+## 0.5.4
+
+IMPROVEMENTS
 
 BUG FIXES
 

Gopkg.toml

@@ -37,12 +37,12 @@
 [[override]]
   name = "github.com/tendermint/tendermint"
   source = "github.com/binance-chain/bnc-tendermint"
-  version = "=v0.30.1-binance.2"
+  version = "=v0.30.1-binance.4"
 
 [[constraint]]
   name = "github.com/cosmos/cosmos-sdk"
   source = "github.com/binance-chain/bnc-cosmos-sdk"
-  version = "=v0.25.0-binance.15"
+  version = "=v0.25.0-binance.16"
 
 [[constraint]]
   name = "github.com/btcsuite/btcd"
@@ -87,4 +87,4 @@
 
 [[constraint]]
   name = "github.com/natefinch/lumberjack"
-  version = "2.1.0"
+  version = "2.1.0"

admin/handler.go

@@ -34,7 +34,7 @@ func GetHandler(config *config.Config) types.AbciQueryHandler {
 			}
 			res := abci.ResponseQuery{
 				Code:  uint32(sdk.ABCICodeOK),
-				Value: []byte{uint8(runtime.RunningMode)},
+				Value: []byte{uint8(runtime.GetRunningMode())},
 			}
 			return &res
 		}
@@ -47,20 +47,26 @@ func GetHandler(config *config.Config) types.AbciQueryHandler {
 			return &res
 		}
 
+		var runningMode runtime.Mode
 		if mode == "0" {
-			runtime.RunningMode = runtime.NormalMode
+			runningMode = runtime.NormalMode
 		} else if mode == "1" {
-			runtime.RunningMode = runtime.TransferOnlyMode
+			runningMode = runtime.TransferOnlyMode
 		} else if mode == "2" {
-			runtime.RunningMode = runtime.RecoverOnlyMode
+			runningMode = runtime.RecoverOnlyMode
 		} else {
 			res := sdk.ErrUnknownRequest("invalid mode").QueryResult()
 			return &res
 		}
+		err = runtime.UpdateRunningMode(config, runningMode)
+		if err != nil {
+			res := sdk.ErrUnknownRequest(err.Error()).QueryResult()
+			return &res
+		}
 
 		res := abci.ResponseQuery{
 			Code:  uint32(sdk.ABCICodeOK),
-			Value: []byte{uint8(runtime.RunningMode)},
+			Value: []byte{uint8(runtime.GetRunningMode())},
 		}
 		return &res
 	}

admin/tx.go

@@ -29,24 +29,25 @@ var TxBlackList = map[runtime.Mode][]string{
 }
 
 func TxNotAllowedError() sdk.Error {
-	return sdk.ErrInternal(fmt.Sprintf("The tx is not allowed, RunningMode: %v", runtime.RunningMode))
+	return sdk.ErrInternal(fmt.Sprintf("The tx is not allowed, RunningMode: %v", runtime.GetRunningMode()))
 }
 
 func IsTxAllowed(tx sdk.Tx) bool {
-	if runtime.RunningMode == runtime.NormalMode {
+	mode := runtime.GetRunningMode()
+	if mode == runtime.NormalMode {
 		return true
 	}
 
 	for _, msg := range tx.GetMsgs() {
-		if !isMsgAllowed(msg) {
+		if !isMsgAllowed(msg, mode) {
 			return false
 		}
 	}
 	return true
 }
 
-func isMsgAllowed(msg sdk.Msg) bool {
-	for _, msgType := range TxBlackList[runtime.RunningMode] {
+func isMsgAllowed(msg sdk.Msg, mode runtime.Mode) bool {
+	for _, msgType := range TxBlackList[mode] {
 		if msgType == msg.Type() {
 			return false
 		}

app/app.go

@@ -103,11 +103,6 @@ type BinanceChain struct {
 
 // NewBinanceChain creates a new instance of the BinanceChain.
 func NewBinanceChain(logger log.Logger, db dbm.DB, traceStore io.Writer, baseAppOptions ...func(*baseapp.BaseApp)) *BinanceChain {
-	// set running mode from cmd parameter or config
-	err := runtime.SetRunningMode(runtime.Mode(ServerContext.StartMode))
-	if err != nil {
-		cmn.Exit(err.Error())
-	}
 	// create app-level codec for txs and accounts
 	var cdc = Codec
 	// create composed tx decoder
@@ -122,7 +117,10 @@ func NewBinanceChain(logger log.Logger, db dbm.DB, traceStore io.Writer, baseApp
 		upgradeConfig:     ServerContext.UpgradeConfig,
 		publicationConfig: ServerContext.PublicationConfig,
 	}
+	// set upgrade config
+	app.setUpgradeConfig()
 	app.SetPruning(viper.GetString("pruning"))
+	app.initRunningMode()
 	app.SetCommitMultiStoreTracer(traceStore)
 
 	// mappers
@@ -135,7 +133,7 @@ func NewBinanceChain(logger log.Logger, db dbm.DB, traceStore io.Writer, baseApp
 	app.stakeKeeper = stake.NewKeeper(
 		cdc,
 		common.StakeStoreKey, common.TStakeStoreKey,
-		app.CoinKeeper, app.ParamHub.Subspace(stake.DefaultParamspace),
+		app.CoinKeeper, app.Pool, app.ParamHub.Subspace(stake.DefaultParamspace),
 		app.RegisterCodespace(stake.DefaultCodespace),
 	)
 	app.ValAddrCache = NewValAddrCache(app.stakeKeeper)
@@ -196,6 +194,7 @@ func NewBinanceChain(logger log.Logger, db dbm.DB, traceStore io.Writer, baseApp
 
 	// finish app initialization
 	app.SetInitChainer(app.initChainerFn())
+	app.SetBeginBlocker(app.BeginBlocker)
 	app.SetEndBlocker(app.EndBlocker)
 	app.MountStoresIAVL(
 		common.MainStoreKey,
@@ -213,7 +212,7 @@ func NewBinanceChain(logger log.Logger, db dbm.DB, traceStore io.Writer, baseApp
 	app.MountStoresTransient(common.TParamsStoreKey, common.TStakeStoreKey)
 
 	// block store required to hydrate dex OB
-	err = app.LoadCMSLatestVersion()
+	err := app.LoadCMSLatestVersion()
 	if err != nil {
 		cmn.Exit(err.Error())
 	}
@@ -228,10 +227,7 @@ func NewBinanceChain(logger log.Logger, db dbm.DB, traceStore io.Writer, baseApp
 	if err != nil {
 		cmn.Exit(err.Error())
 	}
-
-	// set upgrade config
-	app.setUpgradeConfig()
-
+
 	// remaining plugin init
 	app.initDex(tradingPairMapper)
 	app.initPlugins()
@@ -242,8 +238,14 @@ func NewBinanceChain(logger log.Logger, db dbm.DB, traceStore io.Writer, baseApp
 
 // setUpgradeConfig will overwrite default upgrade config
 func (app *BinanceChain) setUpgradeConfig() {
-	upgrade.Mgr.AddUpgradeHeight(upgrade.FixOrderSeqInPriceLevelName, app.upgradeConfig.FixOrderSeqInPriceLevelHeight)
-	upgrade.Mgr.AddUpgradeHeight(upgrade.FixDropFilledOrderSeqName, app.upgradeConfig.FixDropFilledOrderSeqHeight)
+	// upgrade.Mgr.AddUpgradeHeight(,)
+}
+
+func (app *BinanceChain) initRunningMode() {
+	err := runtime.RecoverFromFile(ServerContext.Config.RootDir, runtime.Mode(ServerContext.StartMode))
+	if err != nil {
+		cmn.Exit(err.Error())
+	}
 }
 
 func (app *BinanceChain) initDex(pairMapper dex.TradingPairMapper) {
@@ -433,6 +435,11 @@ func (app *BinanceChain) isBreatheBlock(height int64, lastBlockTime time.Time, b
 	}
 }
 
+func (app *BinanceChain) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) (res abci.ResponseBeginBlock) {
+	upgrade.Mgr.BeginBlocker(ctx)
+	return
+}
+
 func (app *BinanceChain) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
 	// lastBlockTime would be 0 if this is the first block.
 	lastBlockTime := app.CheckState.Ctx.BlockHeader().Time
@@ -473,27 +480,27 @@ func (app *BinanceChain) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) a
 		proposals = pub.CollectProposalsForPublish(passed, failed)
 	}
 
+	var completedUbd []stake.UnbondingDelegation
+	var validatorUpdates abci.ValidatorUpdates
+	if isBreatheBlock || ctx.RouterCallRecord()["stake"] {
+		// some endblockers without fees will execute after publish to make publication run as early as possible.
+		validatorUpdates, completedUbd = stake.EndBlocker(ctx, app.stakeKeeper)
+		app.ValAddrCache.ClearCache()
+	}
+
 	if app.publicationConfig.ShouldPublishAny() &&
 		pub.IsLive {
+		var stakeUpdates pub.StakeUpdates
+		stakeUpdates = pub.CollectStakeUpdatesForPublish(completedUbd)
 		if height >= app.publicationConfig.FromHeightInclusive {
-			app.publish(tradesToPublish, &proposals, blockFee, ctx, height, blockTime.UnixNano())
+			app.publish(tradesToPublish, &proposals, &stakeUpdates, blockFee, ctx, height, blockTime.UnixNano())
 		}
 
 		// clean up intermediate cached data
 		app.DexKeeper.ClearOrderChanges()
 		app.DexKeeper.ClearRoundFee()
 	}
 
-	var validatorUpdates abci.ValidatorUpdates
-	// TODO: confirm with zz height == 1 is only to keep consistent with testnet (Binance Chain Commit: d1f295b; Cosmos Release: =v0.25.0-binance.5; Tendermint Release: =v0.29.1-binance.2;),
-	//  otherwise, apphash fail
-	// I think we don't need it after next reset because at height = 1 validatorUpdates is nil
-	if isBreatheBlock || height == 1 || ctx.RouterCallRecord()["stake"] {
-		// some endblockers without fees will execute after publish to make publication run as early as possible.
-		validatorUpdates = stake.EndBlocker(ctx, app.stakeKeeper)
-		app.ValAddrCache.ClearCache()
-	}
-
 	//match may end with transaction failure, which is better to save into
 	//the EndBlock response. However, current cosmos doesn't support this.
 	//future TODO: add failure info.
@@ -645,7 +652,7 @@ func MakeCodec() *wire.Codec {
 	return cdc
 }
 
-func (app *BinanceChain) publish(tradesToPublish []*pub.Trade, proposalsToPublish *pub.Proposals, blockFee pub.BlockFee, ctx sdk.Context, height, blockTime int64) {
+func (app *BinanceChain) publish(tradesToPublish []*pub.Trade, proposalsToPublish *pub.Proposals, stakeUpdates *pub.StakeUpdates, blockFee pub.BlockFee, ctx sdk.Context, height, blockTime int64) {
 	pub.Logger.Info("start to collect publish information", "height", height)
 
 	var accountsToPublish map[string]pub.Account
@@ -690,6 +697,7 @@ func (app *BinanceChain) publish(tradesToPublish []*pub.Trade, proposalsToPublis
 		blockTime,
 		tradesToPublish,
 		proposalsToPublish,
+		stakeUpdates,
 		app.DexKeeper.OrderChanges,     // thread-safety is guarded by the signal from RemoveDoneCh
 		app.DexKeeper.OrderInfosForPub, // thread-safety is guarded by the signal from RemoveDoneCh
 		accountsToPublish,

app/config/config.go

@@ -5,10 +5,11 @@ import (
 	"path/filepath"
 	"text/template"
 
-	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/spf13/viper"
 	"github.com/tendermint/tendermint/libs/cli"
 	"github.com/tendermint/tendermint/libs/common"
+
+	"github.com/cosmos/cosmos-sdk/server"
 )
 
 var configTemplate *template.Template
@@ -44,10 +45,6 @@ orderKeeperConcurrency = {{ .BaseConfig.OrderKeeperConcurrency }}
 breatheBlockDaysCountBack = {{ .BaseConfig.BreatheBlockDaysCountBack }}
 
 [upgrade]
-# fixOrderSeqInPriceLevel height
-fixOrderSeqInPriceLevelHeight = {{ .UpgradeConfig.FixOrderSeqInPriceLevelHeight }}
-# fixDropFilledOrderSeq height
-fixDropFilledOrderSeqHeight = {{ .UpgradeConfig.FixDropFilledOrderSeqHeight }}
 
 [addr]
 # Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
@@ -284,14 +281,12 @@ func defaultBaseConfig() *BaseConfig {
 }
 
 type UpgradeConfig struct {
-	FixOrderSeqInPriceLevelHeight int64
-	FixDropFilledOrderSeqHeight   int64
+	// example
+	// FixXxxHeight int64 `mapstructure:"fixXxxHeight"`
 }
 
 func defaultUpgradeConfig() *UpgradeConfig {
 	return &UpgradeConfig{
-		FixDropFilledOrderSeqHeight:   2855000,
-		FixOrderSeqInPriceLevelHeight: 2855000,
 	}
 }
 

app/fee_distribution.go

@@ -8,17 +8,18 @@ import (
 	"github.com/binance-chain/node/common/fees"
 	"github.com/binance-chain/node/common/log"
 	"github.com/binance-chain/node/common/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/stake"
 )
 
 func NewValAddrCache(stakeKeeper stake.Keeper) *ValAddrCache {
-	return &ValAddrCache{
+	cache := &ValAddrCache{
 		cache:       make(map[string]sdk.AccAddress),
 		stakeKeeper: stakeKeeper,
 	}
+
+	return cache
 }
 
 type ValAddrCache struct {