Skip to content

check user address when cancel order #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thanhson1085 merged 1 commit into from
Nov 19, 2019
Merged

check user address when cancel order #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions tomox/order_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ func (tomox *TomoX) ApplyOrder(coinbase common.Address, chain consensus.ChainCon
} else if big.NewInt(int64(nonce)).Cmp(order.Nonce) == 1 {
return nil, nil, ErrNonceTooLow
}
if order.Status == OrderStatusCancelled {
err := tomoXstatedb.CancelOrder(orderBook, order)
if err != nil {
log.Debug("Error when cancel order", "order", order)
return nil, nil, err
}
log.Debug("Exchange add user nonce:", "address", order.UserAddress, "status", order.Status, "nonce", nonce+1)
tomoXstatedb.SetNonce(order.UserAddress.Hash(), nonce+1)
return trades, rejects, nil
}
if order.Price.Sign() == 0 || common.BigToHash(order.Price).Big().Cmp(order.Price) != 0 {
log.Debug("Reject order price invalid", "price", order.Price)
rejects = append(rejects, order)
Expand All @@ -53,17 +63,6 @@ func (tomox *TomoX) ApplyOrder(coinbase common.Address, chain consensus.ChainCon
tomoXstatedb.SetNonce(order.UserAddress.Hash(), nonce+1)
return trades, rejects, nil
}

if order.Status == OrderStatusCancelled {
err := tomoXstatedb.CancelOrder(orderBook, order)
if err != nil {
log.Debug("Error when cancel order", "order", order)
return nil, nil, err
}
log.Debug("Exchange add user nonce:", "address", order.UserAddress, "status", order.Status, "nonce", nonce+1)
tomoXstatedb.SetNonce(order.UserAddress.Hash(), nonce+1)
return trades, rejects, nil
}
orderType := order.Type
// if we do not use auto-increment orderid, we must set price slot to avoid conflict
if orderType == tomox_state.Market {
Expand Down
4 changes: 2 additions & 2 deletions tomox/tomox_state/statedb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,8 @@ func (self *TomoXStateDB) CancelOrder(orderBook common.Hash, order *OrderItem) e
if stateOrderItem == nil || stateOrderItem.empty() {
return fmt.Errorf("Order item empty order book : %s , order id : %s , price : %s ", orderBook, orderIdHash.Hex(), priceHash.Hex())
}
if stateOrderItem.data.Hash != order.Hash {
return fmt.Errorf("Error Order Hash mismatch when cancel order book : %s , order id : %s , got : %s , expect : %s ", orderBook, orderIdHash.Hex(), stateOrderItem.data.Hash.Hex(), order.Hash.Hex())
if stateOrderItem.data.UserAddress != order.UserAddress {
return fmt.Errorf("Error Order User Address mismatch when cancel order book : %s , order id : %s , got : %s , expect : %s ", orderBook, orderIdHash.Hex(), stateOrderItem.data.UserAddress.Hex(), order.UserAddress.Hex())
}
self.journal = append(self.journal, cancelOrder{
orderBook: orderBook,
Expand Down