implement pending removal order ids

pkg/types/ordermap.go

@@ -1,6 +1,11 @@
 package types
 
-import "sync"
+import (
+	"sync"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+)
 
 // OrderMap is used for storing orders by their order id
 type OrderMap map[uint64]Order
@@ -68,6 +73,7 @@ func (m OrderMap) Orders() (orders OrderSlice) {
 
 type SyncOrderMap struct {
 	orders         OrderMap
+	pendingRemoval map[uint64]time.Time
 
 	sync.RWMutex
 }
@@ -75,6 +81,7 @@ type SyncOrderMap struct {
 func NewSyncOrderMap() *SyncOrderMap {
 	return &SyncOrderMap{
 		orders:         make(OrderMap),
+		pendingRemoval: make(map[uint64]time.Time, 10),
 	}
 }
 
@@ -91,6 +98,8 @@ func (m *SyncOrderMap) Remove(orderID uint64) (exists bool) {
 		m.Lock()
 		m.orders.Remove(orderID)
 		m.Unlock()
+	} else {
+		m.pendingRemoval[orderID] = time.Now()
 	}
 
 	return exists
@@ -98,7 +107,31 @@ func (m *SyncOrderMap) Remove(orderID uint64) (exists bool) {
 
 func (m *SyncOrderMap) Add(o Order) {
 	m.Lock()
+
+	match := false
+	if len(m.pendingRemoval) > 0 {
+		expireTime := time.Now().Add(-10 * time.Second)
+		newPendingRemoval := make(map[uint64]time.Time, 10)
+		for orderID, creationTime := range m.pendingRemoval {
+			if o.OrderID == orderID {
+				log.Warnf("found pending removal orderID = %d, removing order %+v from the store", orderID, o)
+				match = true
+				continue
+			}
+
+			if creationTime.Before(expireTime) {
+				continue
+			}
+
+			newPendingRemoval[orderID] = creationTime
+		}
+		m.pendingRemoval = newPendingRemoval
+	}
+
+	if !match {
 		m.orders.Add(o)
+	}
+
 	m.Unlock()
 }
 

scripts/max.sh

@@ -86,6 +86,20 @@ case "$command" in
             jq -r '.[] | "\(.id) \(.market) \(.side) \(.ord_type) \(if .ord_type | test("stop") then "stop@" + .stop_price else "" end) price = \(if .ord_type | test("market") then "any" else .price end) \t volume = \(.volume) \(.state)"'
         ;;
 
+    order)
+        if [[ $# < 1 ]] ; then
+            echo "$0 order [id]"
+            exit
+        fi
+
+        id=$1
+        declare -A orders_params=()
+        orders_params[id]=$id
+        myOrder orders_params | \
+            jq -r '.'
+        ;;
+
+
     cancel)
         if [[ $# < 1 ]] ; then
             echo "$0 cancel [oid]"

scripts/maxapi.sh

@@ -120,6 +120,11 @@ function myOrders()
     send_auth_request "GET" "/api/v2/orders" _params
 }
 
+function myOrder()
+{
+    local -n _params=$1
+    send_auth_request "GET" "/api/v2/order" _params
+}
 
 function myTrades()
 {