add fork pt.ForkTradeFixAssetDBX: fix create asset account db

plugin/dapp/trade/executor/util.go

@@ -48,7 +48,12 @@ func checkAsset(height int64, exec, symbol string) bool {
 }
 
 func createAccountDB(height int64, db db.KV, exec, symbol string) (*account.DB, error) {
-	if types.IsDappFork(height, pt.TradeX, pt.ForkTradeAssetX) {
+	if types.IsDappFork(height, pt.TradeX, pt.ForkTradeFixAssetDBX) {
+		if exec == "" {
+			exec = defaultAssetExec
+		}
+		return account.NewAccountDB(exec, symbol, db)
+	} else if types.IsDappFork(height, pt.TradeX, pt.ForkTradeAssetX) {
 		return account.NewAccountDB(exec, symbol, db)
 	}
 

plugin/dapp/trade/types/const.go

@@ -90,4 +90,6 @@ const (
 	ForkTradeBuyLimitX = "ForkTradeBuyLimit"
 	// ForkTradeIDX id without prefix
 	ForkTradeIDX = "ForkTradeID"
+	// ForkTradeFixCreateAssetDBX fix bug: order create before ForkTradeAssetX, cannot trade after ForkTradeAssetX
+	ForkTradeFixAssetDBX = "ForkTradeFixAssetDB"
 )

plugin/dapp/trade/types/trade.go

@@ -55,6 +55,7 @@ func init() {
 	types.RegisterDappFork(TradeX, ForkTradeBuyLimitX, 301000)
 	types.RegisterDappFork(TradeX, ForkTradeAssetX, 1010000)
 	types.RegisterDappFork(TradeX, ForkTradeIDX, 1450000)
+	types.RegisterDappFork(TradeX, ForkTradeFixAssetDBX, 2500000)
 }
 
 type tradeType struct {