add tx rules

plugin/dapp/exchange/executor/exchange.go

@@ -69,7 +69,7 @@ func (e *exchange) CheckTx(tx *types.Transaction, index int) error {
 		if !CheckPrice(price) {
 			return exchangetypes.ErrAssetPrice
 		}
-		if !types.CheckAmount(amount) {
+		if !CheckAmount(amount) {
 			return exchangetypes.ErrAssetAmount
 		}
 		if !CheckOp(op) {
@@ -82,6 +82,11 @@ func (e *exchange) CheckTx(tx *types.Transaction, index int) error {
 	return nil
 }
 
+//ExecutorOrder Exec 的时候 同时执行 ExecLocal
+func (e *exchange) ExecutorOrder() int64 {
+	return drivers.ExecLocalSameTime
+}
+
 // GetPayloadValue get payload value
 func (e *exchange) GetPayloadValue() types.Message {
 	return &exchangetypes.ExchangeAction{}

plugin/dapp/exchange/executor/exchange_test.go

@@ -87,7 +87,7 @@ func TestExchange(t *testing.T) {
 	accC1, _ := account.NewAccountDB(cfg, "paracross", "token.CCNY", stateDB)
 	accC1.SaveExecAccount(execAddr, &accountC)
 
-	accD1, _ := account.NewAccountDB(cfg, "token", "para", stateDB)
+	accD1, _ := account.NewAccountDB(cfg, "token", "CCNY", stateDB)
 	accD1.SaveExecAccount(execAddr, &accountD)
 
 	env := execEnv{
@@ -439,6 +439,94 @@ func TestExchange(t *testing.T) {
 	reply2 = msg.(*et.OrderList)
 	t.Log(reply2)
 	assert.Equal(t, 2, len(reply2.List))
+
+
+
+	//低于市场价得卖单测试
+	// orderlimit  bty:CCNY
+	tx, err = ety.Create("LimitOrder", &et.LimitOrder{LeftAsset: &et.Asset{Symbol: "bty", Execer: "coins"},
+		RightAsset: &et.Asset{Execer: "token", Symbol: "CCNY"}, Price: 4, Amount: 5 * types.Coin, Op: et.OpBuy})
+	assert.Nil(t, err)
+	tx, err = types.FormatTx(cfg, et.ExchangeX, tx)
+	assert.Nil(t, err)
+	tx, err = signTx(tx, PrivKeyD)
+	assert.Nil(t, err)
+	err = e.CheckTx(tx, 1)
+	assert.Nil(t, err)
+	env.blockHeight = env.blockHeight + 1
+	env.blockTime = env.blockTime + 20
+	env.difficulty = env.difficulty + 1
+	exec.SetEnv(env.blockHeight, env.blockTime, env.difficulty)
+	receipt, err = exec.Exec(tx, int(1))
+	if err != nil {
+		t.Error(err)
+	}
+	for _, kv := range receipt.KV {
+		stateDB.Set(kv.Key, kv.Value)
+	}
+	receiptData = &types.ReceiptData{Ty: receipt.Ty, Logs: receipt.Logs}
+	set, err = exec.ExecLocal(tx, receiptData, int(1))
+	if err != nil {
+		t.Error(err)
+	}
+	for _, kv := range set.KV {
+		kvdb.Set(kv.Key, kv.Value)
+	}
+	orderID6 := common.ToHex(tx.Hash())
+	//根据订单号，查询订单详情
+	msg, err = exec.Query(et.FuncNameQueryOrder, types.Encode(&et.QueryOrder{OrderID: orderID6}))
+	if err != nil {
+		t.Error(err)
+	}
+    t.Log(msg)
+
+	tx, err = ety.Create("LimitOrder", &et.LimitOrder{LeftAsset: &et.Asset{Symbol: "bty", Execer: "coins"},
+		RightAsset: &et.Asset{Execer: "token", Symbol: "CCNY"}, Price: 3, Amount: 10 * types.Coin, Op: et.OpSell})
+	assert.Nil(t, err)
+	tx, err = types.FormatTx(cfg, et.ExchangeX, tx)
+	assert.Nil(t, err)
+	tx, err = signTx(tx, PrivKeyC)
+	assert.Nil(t, err)
+	err = e.CheckTx(tx, 1)
+	assert.Nil(t, err)
+	env.blockHeight = env.blockHeight + 1
+	env.blockTime = env.blockTime + 20
+	env.difficulty = env.difficulty + 1
+	exec.SetEnv(env.blockHeight, env.blockTime, env.difficulty)
+	receipt, err = exec.Exec(tx, int(1))
+	if err != nil {
+		t.Error(err)
+	}
+	for _, kv := range receipt.KV {
+		stateDB.Set(kv.Key, kv.Value)
+	}
+	receiptData = &types.ReceiptData{Ty: receipt.Ty, Logs: receipt.Logs}
+	set, err = exec.ExecLocal(tx, receiptData, int(1))
+	if err != nil {
+		t.Error(err)
+	}
+	for _, kv := range set.KV {
+		kvdb.Set(kv.Key, kv.Value)
+	}
+	orderID7 := common.ToHex(tx.Hash())
+	//根据订单号，查询订单详情
+
+	msg, err = exec.Query(et.FuncNameQueryOrder, types.Encode(&et.QueryOrder{OrderID: orderID6}))
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log(msg)
+	reply = msg.(*et.Order)
+	acc = accD1.LoadExecAccount(string(Nodes[2]), execAddr)
+	t.Log(acc)
+	//assert.Equal(t, int32(et.Completed), reply.Status)
+	msg, err = exec.Query(et.FuncNameQueryOrder, types.Encode(&et.QueryOrder{OrderID: orderID7}))
+	if err != nil {
+		t.Error(err)
+	}
+	t.Log(msg)
+	reply = msg.(*et.Order)
+	assert.Equal(t, int32(et.Ordered), reply.Status)
 }
 
 func signTx(tx *types.Transaction, hexPrivKey string) (*types.Transaction, error) {

plugin/dapp/exchange/executor/exchangedb.go

@@ -85,6 +85,14 @@ func CheckCount(count int32) bool {
 	return count <= 20 && count >= 0
 }
 
+//最小交易1e8
+func CheckAmount(amount int64) bool {
+	if amount < types.Coin || amount >= types.MaxCoin {
+		return false
+	}
+	return true
+}
+
 func CheckDirection(direction int32) bool {
 	if direction == et.ListASC || direction == et.ListDESC {
 		return true
@@ -117,7 +125,7 @@ func (a *Action) LimitOrder(payload *et.LimitOrder) (*types.Receipt, error) {
 	if !CheckExchangeAsset(leftAsset, rightAsset) {
 		return nil, et.ErrAsset
 	}
-	if !types.CheckAmount(payload.GetAmount()) {
+	if !CheckAmount(payload.GetAmount()) {
 		return nil, et.ErrAssetAmount
 	}
 	if !CheckPrice(payload.GetPrice()) {
@@ -236,10 +244,17 @@ func (a *Action) RevokeOrder(payload *et.RevokeOrder) (*types.Receipt, error) {
 }
 
 //撮合交易逻辑方法
+// 规则：
+//1.买单高于市场价，按价格由低往高撮合。
+//2.卖单低于市场价，按价格由高往低进行撮合。
+//3.价格相同按先进先出的原则进行撮合
+//4.买家获利得原则
 func (a *Action) matchLimitOrder(payload *et.LimitOrder, leftAccountDB, rightAccountDB *account.DB) (*types.Receipt, error) {
 	var logs []*types.ReceiptLog
 	var kvs []*types.KeyValue
 	var index int64
+	var price float64
+	var count int
 
 	or := &et.Order{
 		OrderID:    common.ToHex(a.txhash),
@@ -257,41 +272,145 @@ func (a *Action) matchLimitOrder(payload *et.LimitOrder, leftAccountDB, rightAcc
 		Index: a.GetIndex(),
 	}
 
-	//按先进先出的原则进行撮合
 	//单笔交易最多撮合100笔历史订单,最大可撮合得深度，系统得自我防护
-	for i := 0; i < 20; i++ {
-		orderIDs, err := findOrderIDListByPrice(a.localDB, payload.GetLeftAsset(), payload.GetRightAsset(), payload.GetPrice(), a.OpSwap(payload.Op), et.ListASC, index)
-		if err == types.ErrNotFound {
+	for {
+		if count > et.MaxCount {
 			break
 		}
-		if err != nil {
-			return nil, err
+		marketDepthList, err := QueryMarketDepth(a.localDB, payload.GetLeftAsset(), payload.GetRightAsset(), a.OpSwap(payload.Op), price, et.Count)
+		if err == types.ErrNotFound {
+			break
 		}
-		for _, orderID := range orderIDs {
-			matchorder, err := findOrderByOrderID(a.statedb, orderID.ID)
-			if err != nil {
-				elog.Warn("matchLimitOrder.findOrderByOrderID", "order", "err", err.Error())
+		for _, marketDepth := range marketDepthList.List {
+			if count > et.MaxCount {
+				break
+			}
+			// 卖单价大于买单价
+			if payload.Op == et.OpBuy && marketDepth.Price > payload.GetPrice() {
 				continue
 			}
-			//同地址不能交易
-			if matchorder.Addr == a.fromaddr {
+			// 买单价小于卖单价
+			if payload.Op == et.OpSell && marketDepth.Price < payload.GetPrice() {
 				continue
 			}
-			//TODO 这里得逻辑是否需要调整?当匹配的单数过多，会导致receipt日志数量激增，理论上存在日志存储攻击，需要加下最大匹配深度，防止这种攻击发生
-			if matchorder.GetBalance() >= or.GetBalance() {
+			orderIDs, err := findOrderIDListByPrice(a.localDB, payload.GetLeftAsset(), payload.GetRightAsset(), marketDepth.Price, a.OpSwap(payload.Op), et.ListASC, index)
+			if err == types.ErrNotFound {
+				continue
+			}
+			for _, orderID := range orderIDs {
+				matchorder, err := findOrderByOrderID(a.statedb, orderID.ID)
+				if err != nil {
+					elog.Warn("matchLimitOrder.findOrderByOrderID", "order", "err", err.Error())
+					continue
+				}
+				//同地址不能交易
+				if matchorder.Addr == a.fromaddr {
+					continue
+				}
+				//TODO 这里得逻辑是否需要调整?当匹配的单数过多，会导致receipt日志数量激增，理论上存在日志存储攻击，需要加下最大匹配深度，防止这种攻击发生
+				if matchorder.GetBalance() >= or.GetBalance() {
+					if payload.Op == et.OpSell {
+						//转移冻结资产
+						receipt, err := rightAccountDB.ExecTransferFrozen(matchorder.Addr, a.fromaddr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), payload.Price))
+						if err != nil {
+							elog.Error("matchLimitOrder.ExecTransferFrozen", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), payload.Price), "err", err.Error())
+							return nil, err
+						}
+						logs = append(logs, receipt.Logs...)
+						kvs = append(kvs, receipt.KV...)
+
+						//解冻多余资金
+						if payload.Price < matchorder.GetLimitOrder().Price {
+							receipt, err := rightAccountDB.ExecActive(matchorder.Addr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), matchorder.GetLimitOrder().Price-payload.Price))
+							if err != nil {
+								elog.Error("matchLimitOrder.ExecActive", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), matchorder.GetLimitOrder().Price-payload.Price), "err", err.Error())
+								return nil, err
+							}
+							logs = append(logs, receipt.Logs...)
+							kvs = append(kvs, receipt.KV...)
+						}
+						//将达成交易的相应资产结算
+						receipt, err = leftAccountDB.ExecTransfer(a.fromaddr, matchorder.Addr, a.execaddr, a.calcActualCost(payload.Op, or.GetBalance(), payload.Price))
+						if err != nil {
+							elog.Error("matchLimitOrder.ExecTransfer", "addr", a.fromaddr, "execaddr", a.execaddr, "amount", a.calcActualCost(payload.Op, or.GetBalance(), payload.Price), "err", err.Error())
+							return nil, err
+						}
+						logs = append(logs, receipt.Logs...)
+						kvs = append(kvs, receipt.KV...)
+					}
+					if payload.Op == et.OpBuy {
+						//转移冻结资产
+						receipt, err := leftAccountDB.ExecTransferFrozen(matchorder.Addr, a.fromaddr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), matchorder.GetLimitOrder().Price))
+						if err != nil {
+							elog.Error("matchLimitOrder.ExecTransferFrozen", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), matchorder.GetLimitOrder().Price), "err", err.Error())
+							return nil, err
+						}
+						logs = append(logs, receipt.Logs...)
+						kvs = append(kvs, receipt.KV...)
+						//将达成交易的相应资产结算
+						receipt, err = rightAccountDB.ExecTransfer(a.fromaddr, matchorder.Addr, a.execaddr, a.calcActualCost(payload.Op, or.GetBalance(), matchorder.GetLimitOrder().Price))
+						if err != nil {
+							elog.Error("matchLimitOrder.ExecTransfer", "addr", a.fromaddr, "execaddr", a.execaddr, "amount", a.calcActualCost(payload.Op, or.GetBalance(), matchorder.GetLimitOrder().Price), "err", err.Error())
+							return nil, err
+						}
+						logs = append(logs, receipt.Logs...)
+						kvs = append(kvs, receipt.KV...)
+					}
+
+					// match receiptorder,涉及赋值先手顺序，代码顺序不可变
+					matchorder.Status = func(a, b int64) int32 {
+						if a > b {
+							return et.Ordered
+						}
+						return et.Completed
+					}(matchorder.GetBalance(), or.GetBalance())
+					matchorder.Balance = matchorder.GetBalance() - or.GetBalance()
+					//记录本次成交得量
+					matchorder.Executed = or.GetBalance()
+
+					a.updateStateDBCache(matchorder)
+					kvs = append(kvs, a.GetKVSet(matchorder)...)
+
+					or.Executed = or.Executed + or.GetBalance()
+					or.Status = et.Completed
+					or.Balance = 0
+					//update receipt order
+					re.Order = or
+					re.MatchOrders = append(re.MatchOrders, matchorder)
+
+					a.updateStateDBCache(or)
+					kvs = append(kvs, a.GetKVSet(or)...)
+					//statedb 更新
+					receiptlog := &types.ReceiptLog{Ty: et.TyLimitOrderLog, Log: types.Encode(re)}
+					logs = append(logs, receiptlog)
+					receipts := &types.Receipt{Ty: types.ExecOk, KV: kvs, Logs: logs}
+					return receipts, nil
+				}
 				if payload.Op == et.OpSell {
 					//转移冻结资产
-					receipt, err := rightAccountDB.ExecTransferFrozen(matchorder.Addr, a.fromaddr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), payload.GetPrice()))
+					receipt, err := rightAccountDB.ExecTransferFrozen(matchorder.Addr, a.fromaddr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, matchorder.GetBalance(), payload.Price))
 					if err != nil {
-						elog.Error("matchLimitOrder.ExecTransferFrozen", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), payload.GetPrice()), "err", err.Error())
+						elog.Error("matchLimitOrder.ExecTransferFrozen", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, matchorder.GetBalance(), payload.Price), "err", err.Error())
 						return nil, err
 					}
 					logs = append(logs, receipt.Logs...)
 					kvs = append(kvs, receipt.KV...)
+
+					//解冻成交部分 多余资金
+					if payload.Price < matchorder.GetLimitOrder().Price {
+						receipt, err := rightAccountDB.ExecActive(matchorder.Addr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), matchorder.GetLimitOrder().Price-payload.Price))
+						if err != nil {
+							elog.Error("matchLimitOrder.ExecActive", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), matchorder.GetLimitOrder().Price-payload.Price), "err", err.Error())
+							return nil, err
+						}
+						logs = append(logs, receipt.Logs...)
+						kvs = append(kvs, receipt.KV...)
+					}
+
 					//将达成交易的相应资产结算
-					receipt, err = leftAccountDB.ExecTransfer(a.fromaddr, matchorder.Addr, a.execaddr, a.calcActualCost(payload.Op, or.GetBalance(), payload.GetPrice()))
+					receipt, err = leftAccountDB.ExecTransfer(a.fromaddr, matchorder.Addr, a.execaddr, a.calcActualCost(payload.Op, matchorder.GetBalance(), payload.Price))
 					if err != nil {
-						elog.Error("matchLimitOrder.ExecTransfer", "addr", a.fromaddr, "execaddr", a.execaddr, "amount", a.calcActualCost(payload.Op, or.GetBalance(), payload.GetPrice()), "err", err.Error())
+						elog.Error("matchLimitOrder.ExecTransfer", "addr", a.fromaddr, "execaddr", a.execaddr, "amount", a.calcActualCost(payload.Op, matchorder.GetBalance(), payload.Price), "err", err.Error())
 						return nil, err
 					}
 					logs = append(logs, receipt.Logs...)
@@ -299,87 +418,23 @@ func (a *Action) matchLimitOrder(payload *et.LimitOrder, leftAccountDB, rightAcc
 				}
 				if payload.Op == et.OpBuy {
 					//转移冻结资产
-					receipt, err := leftAccountDB.ExecTransferFrozen(matchorder.Addr, a.fromaddr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), payload.GetPrice()))
+					receipt, err := leftAccountDB.ExecTransferFrozen(matchorder.Addr, a.fromaddr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, matchorder.GetBalance(), matchorder.GetLimitOrder().Price))
 					if err != nil {
-						elog.Error("matchLimitOrder.ExecTransferFrozen", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, or.GetBalance(), payload.GetPrice()), "err", err.Error())
+						elog.Error("matchLimitOrder.ExecTransferFrozen", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, matchorder.GetBalance(), matchorder.GetLimitOrder().Price), "err", err.Error())
 						return nil, err
 					}
 					logs = append(logs, receipt.Logs...)
 					kvs = append(kvs, receipt.KV...)
 					//将达成交易的相应资产结算
-					receipt, err = rightAccountDB.ExecTransfer(a.fromaddr, matchorder.Addr, a.execaddr, a.calcActualCost(payload.Op, or.GetBalance(), payload.GetPrice()))
+					receipt, err = rightAccountDB.ExecTransfer(a.fromaddr, matchorder.Addr, a.execaddr, a.calcActualCost(payload.Op, matchorder.GetBalance(), matchorder.GetLimitOrder().Price))
 					if err != nil {
-						elog.Error("matchLimitOrder.ExecTransfer", "addr", a.fromaddr, "execaddr", a.execaddr, "amount", a.calcActualCost(payload.Op, or.GetBalance(), payload.GetPrice()), "err", err.Error())
+						elog.Error("matchLimitOrder.ExecTransfer", "addr", a.fromaddr, "execaddr", a.execaddr, "amount", a.calcActualCost(payload.Op, matchorder.GetBalance(), matchorder.GetLimitOrder().Price), "err", err.Error())
 						return nil, err
 					}
 					logs = append(logs, receipt.Logs...)
 					kvs = append(kvs, receipt.KV...)
 				}
 
-				// match receiptorder,涉及赋值先手顺序，代码顺序不可变
-				matchorder.Status = func(a, b int64) int32 {
-					if a > b {
-						return et.Ordered
-					}
-					return et.Completed
-				}(matchorder.GetBalance(), or.GetBalance())
-				matchorder.Balance = matchorder.GetBalance() - or.GetBalance()
-				matchorder.Executed = matchorder.Executed + or.GetBalance()
-
-				a.updateStateDBCache(matchorder)
-				kvs = append(kvs, a.GetKVSet(matchorder)...)
-
-				or.Executed = or.Executed + or.GetBalance()
-				or.Status = et.Completed
-				or.Balance = 0
-				//update receipt order
-				re.Order = or
-				re.MatchOrders = append(re.MatchOrders, matchorder)
-
-				a.updateStateDBCache(or)
-				kvs = append(kvs, a.GetKVSet(or)...)
-				//statedb 更新
-				receiptlog := &types.ReceiptLog{Ty: et.TyLimitOrderLog, Log: types.Encode(re)}
-				logs = append(logs, receiptlog)
-				receipts := &types.Receipt{Ty: types.ExecOk, KV: kvs, Logs: logs}
-				return receipts, nil
-			}
-			if payload.Op == et.OpSell {
-				//转移冻结资产
-				receipt, err := rightAccountDB.ExecTransferFrozen(matchorder.Addr, a.fromaddr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, matchorder.GetBalance(), payload.GetPrice()))
-				if err != nil {
-					elog.Error("matchLimitOrder.ExecTransferFrozen", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, matchorder.GetBalance(), payload.GetPrice()), "err", err.Error())
-					return nil, err
-				}
-				logs = append(logs, receipt.Logs...)
-				kvs = append(kvs, receipt.KV...)
-				//将达成交易的相应资产结算
-				receipt, err = leftAccountDB.ExecTransfer(a.fromaddr, matchorder.Addr, a.execaddr, a.calcActualCost(payload.Op, matchorder.GetBalance(), payload.GetPrice()))
-				if err != nil {
-					elog.Error("matchLimitOrder.ExecTransfer", "addr", a.fromaddr, "execaddr", a.execaddr, "amount", a.calcActualCost(payload.Op, matchorder.GetBalance(), payload.GetPrice()), "err", err.Error())
-					return nil, err
-				}
-				logs = append(logs, receipt.Logs...)
-				kvs = append(kvs, receipt.KV...)
-			}
-			if payload.Op == et.OpBuy {
-				//转移冻结资产
-				receipt, err := leftAccountDB.ExecTransferFrozen(matchorder.Addr, a.fromaddr, a.execaddr, a.calcActualCost(matchorder.GetLimitOrder().Op, matchorder.GetBalance(), payload.GetPrice()))
-				if err != nil {
-					elog.Error("matchLimitOrder.ExecTransferFrozen", "addr", matchorder.Addr, "execaddr", a.execaddr, "amount", a.calcActualCost(matchorder.GetLimitOrder().Op, matchorder.GetBalance(), payload.GetPrice()), "err", err.Error())
-					return nil, err
-				}
-				logs = append(logs, receipt.Logs...)
-				kvs = append(kvs, receipt.KV...)
-				//将达成交易的相应资产结算
-				receipt, err = rightAccountDB.ExecTransfer(a.fromaddr, matchorder.Addr, a.execaddr, a.calcActualCost(payload.Op, matchorder.GetBalance(), payload.GetPrice()))
-				if err != nil {
-					elog.Error("matchLimitOrder.ExecTransfer", "addr", a.fromaddr, "execaddr", a.execaddr, "amount", a.calcActualCost(payload.Op, matchorder.GetBalance(), payload.GetPrice()), "err", err.Error())
-					return nil, err
-				}
-				logs = append(logs, receipt.Logs...)
-				kvs = append(kvs, receipt.KV...)
-
 				//涉及赋值先后顺序，不可颠倒
 				or.Balance = or.Balance - matchorder.Balance
 				or.Executed = or.Executed + matchorder.Balance
@@ -387,7 +442,7 @@ func (a *Action) matchLimitOrder(payload *et.LimitOrder, leftAccountDB, rightAcc
 				a.updateStateDBCache(or)
 
 				// match receiptorder
-				matchorder.Executed = matchorder.Executed + matchorder.GetBalance()
+				matchorder.Executed = matchorder.Balance
 				matchorder.Status = et.Completed
 				matchorder.Balance = 0
 				a.updateStateDBCache(matchorder)
@@ -395,13 +450,21 @@ func (a *Action) matchLimitOrder(payload *et.LimitOrder, leftAccountDB, rightAcc
 
 				re.Order = or
 				re.MatchOrders = append(re.MatchOrders, matchorder)
+				//撮合深度计数
+				count = count + 1
 			}
+			//查询数据不满足5条说明没有了,跳出循环
+			if len(orderIDs) < int(et.Count) {
+				break
+			}
+			index = orderIDs[len(orderIDs)-1].Index
 		}
+
 		//查询数据不满足5条说明没有了,跳出循环
-		if len(orderIDs) < int(et.Count) {
+		if len(marketDepthList.List) < int(et.Count) {
 			break
 		}
-		index = orderIDs[len(orderIDs)-1].Index
+		price = marketDepthList.List[len(marketDepthList.List)-1].Price
 	}
 
 	//冻结剩余未成交的资金
@@ -490,7 +553,7 @@ func Direction(op int32) int32 {
 }
 
 //这里price当作索引来用，首次查询不需要填值
-func QueryMarketDepth(localdb dbm.Lister, left, right *et.Asset, op int32, price float64, count int32) (types.Message, error) {
+func QueryMarketDepth(localdb dbm.Lister, left, right *et.Asset, op int32, price float64, count int32) (*et.MarketDepthList, error) {
 	prefix := calcMarketDepthPrefix(left, right, op)
 	key := calcMarketDepthKey(left, right, op, price)
 	var values [][]byte
@@ -548,6 +611,8 @@ func QueryCompletedOrderList(localdb dbm.Lister, statedb dbm.KV, left, right *et
 		}
 		//替换索引index
 		order.Index = orderID.Index
+		//替换已经成交得量
+		order.Executed = order.GetLimitOrder().Amount - order.Balance
 		orderList.List = append(orderList.List, order)
 	}
 
@@ -586,6 +651,8 @@ func QueryOrderList(localdb dbm.Lister, statedb dbm.KV, addr string, status, cou
 		}
 		//替换索引index
 		order.Index = orderID.Index
+		//替换已经成交得量
+		order.Executed = order.GetLimitOrder().Amount - order.Balance
 		orderList.List = append(orderList.List, order)
 	}
 	return &orderList, nil

plugin/dapp/exchange/executor/exec_local.go

@@ -103,11 +103,11 @@ func (e *exchange) updateIndex(receipt *exchangetypes.ReceiptExchange) (kvs []*t
 
 		if len(receipt.MatchOrders) > 0 {
 			//撮合交易更新
-			var balance int64
+			cache :=make(map[float64]int64)
 			for i, matchOrder := range receipt.MatchOrders {
 				if matchOrder.Status == exchangetypes.Completed {
 					// 删除原有状态orderID
-					kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthOrderKey(left, right, matchOrder.GetLimitOrder().Op, price, matchOrder.Index), Value: nil})
+					kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthOrderKey(left, right, matchOrder.GetLimitOrder().Op, matchOrder.GetLimitOrder().Price, matchOrder.Index), Value: nil})
 					//删除原有状态orderID
 					kvs = append(kvs, &types.KeyValue{Key: calcUserOrderIDKey(exchangetypes.Ordered, matchOrder.Addr, matchOrder.Index), Value: nil})
 					//更新状态为已完成,索引index,改为当前的index
@@ -115,28 +115,25 @@ func (e *exchange) updateIndex(receipt *exchangetypes.ReceiptExchange) (kvs []*t
 					//calcCompletedOrderKey
 					kvs = append(kvs, &types.KeyValue{Key: calcCompletedOrderKey(left, right, index+int64(i+1)), Value: types.Encode(&exchangetypes.OrderID{ID: matchOrder.OrderID, Index: index + int64(i+1)})})
 				}
-				if matchOrder.Status == exchangetypes.Ordered {
-					//只需统一更改市场深度状态，其他不需要处理
-					balance = balance + matchOrder.Balance
-				}
+				executed :=cache[matchOrder.GetLimitOrder().Price]
+				executed=executed+matchOrder.Executed
+				cache[matchOrder.GetLimitOrder().Price]=executed
 			}
 			//更改匹配市场深度
-			var matchDepth exchangetypes.MarketDepth
-			err = findObject(e.GetLocalDB(), calcMarketDepthKey(left, right, OpSwap(op), price), &matchDepth)
-			if err == types.ErrNotFound {
-				matchDepth.Price = price
-				matchDepth.LeftAsset = left
-				matchDepth.RightAsset = right
-				matchDepth.Op = OpSwap(op)
-				matchDepth.Amount = balance
-			} else {
-				matchDepth.Amount = matchDepth.Amount - receipt.Order.Executed
-			}
-			//marketDepth
-			kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthKey(left, right, OpSwap(op), price), Value: types.Encode(&matchDepth)})
-			if matchDepth.Amount == 0 {
-				//删除
-				kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthKey(left, right, OpSwap(op), price), Value: nil})
+			for pr,executed :=range cache{
+				var matchDepth exchangetypes.MarketDepth
+				err = findObject(e.GetLocalDB(), calcMarketDepthKey(left, right, OpSwap(op), pr), &matchDepth)
+				if err == types.ErrNotFound {
+				   continue
+				} else {
+					matchDepth.Amount = matchDepth.Amount - executed
+				}
+				//marketDepth
+				kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthKey(left, right, OpSwap(op), price), Value: types.Encode(&matchDepth)})
+				if matchDepth.Amount <= 0 {
+					//删除
+					kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthKey(left, right, OpSwap(op), price), Value: nil})
+				}
 			}
 		}
 		return
@@ -155,9 +152,9 @@ func (e *exchange) updateIndex(receipt *exchangetypes.ReceiptExchange) (kvs []*t
 		//calcCompletedOrderKey
 		kvs = append(kvs, &types.KeyValue{Key: calcCompletedOrderKey(left, right, index), Value: types.Encode(&exchangetypes.OrderID{ID: oderID, Index: index})})
 
+		cache :=make(map[float64]int64)
 		if len(receipt.MatchOrders) > 0 {
 			//撮合交易更新
-			var balance int64
 			for i, matchOrder := range receipt.MatchOrders {
 				if matchOrder.Status == exchangetypes.Completed {
 					// 删除原有状态orderID
@@ -170,28 +167,25 @@ func (e *exchange) updateIndex(receipt *exchangetypes.ReceiptExchange) (kvs []*t
 					kvs = append(kvs, &types.KeyValue{Key: calcCompletedOrderKey(left, right, index+int64(i+1)), Value: types.Encode(&exchangetypes.OrderID{ID: matchOrder.OrderID, Index: index + int64(i+1)})})
 
 				}
-				if matchOrder.Status == exchangetypes.Ordered {
-					//只需统一更改市场深度状态，其他不需要处理
-					balance = balance + matchOrder.Balance
-				}
+				executed :=cache[matchOrder.GetLimitOrder().Price]
+				executed=executed+matchOrder.Executed
+				cache[matchOrder.GetLimitOrder().Price]=executed
 			}
 			//更改match市场深度
-			var matchDepth exchangetypes.MarketDepth
-			err := findObject(e.GetLocalDB(), calcMarketDepthKey(left, right, OpSwap(op), price), &matchDepth)
-			if err == types.ErrNotFound {
-				matchDepth.Price = price
-				matchDepth.LeftAsset = left
-				matchDepth.RightAsset = right
-				matchDepth.Op = OpSwap(op)
-				matchDepth.Amount = balance
-			} else {
-				matchDepth.Amount = matchDepth.Amount - receipt.Order.Executed
-			}
-			//marketDepth
-			kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthKey(left, right, OpSwap(op), price), Value: types.Encode(&matchDepth)})
-			if matchDepth.Amount == 0 {
-				//删除
-				kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthKey(left, right, OpSwap(op), price), Value: nil})
+			for pr,executed :=range cache{
+				var matchDepth exchangetypes.MarketDepth
+				err := findObject(e.GetLocalDB(), calcMarketDepthKey(left, right, OpSwap(op), pr), &matchDepth)
+				if err == types.ErrNotFound {
+					continue
+				} else {
+					matchDepth.Amount = matchDepth.Amount - executed
+				}
+				//marketDepth
+				kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthKey(left, right, OpSwap(op), price), Value: types.Encode(&matchDepth)})
+				if matchDepth.Amount <= 0 {
+					//删除
+					kvs = append(kvs, &types.KeyValue{Key: calcMarketDepthKey(left, right, OpSwap(op), price), Value: nil})
+				}
 			}
 		}
 		return

plugin/dapp/exchange/types/exchange.go

@@ -55,10 +55,12 @@ const (
 	ListSeek = int32(2)
 )
 
-//单次list还回条数
+
 const (
+	//单次list还回条数
 	Count    = int32(5)
-	MaxCount = int32(20)
+	//系统最大撮合深度
+	MaxCount = 100
 )
 
 var (