Merge pull request #5000 from herman-korolevsky/develop

[Kraken] - Pass and receive client order id correctly. User reference…

Author: timmolter

xchange-kraken/src/main/java/org/knowm/xchange/kraken/service/KrakenTradeServiceRaw.java

@@ -225,12 +225,16 @@ public KrakenOrderResponse placeKrakenLimitOrder(LimitOrder limitOrder) throws I
                 type,
                 limitOrder.getLimitPrice().toPlainString(),
                 limitOrder.getOriginalAmount())
-            .withUserRefId(limitOrder.getUserReference())
             .withOrderFlags(limitOrder.getOrderFlags())
             .withLeverage(limitOrder.getLeverage())
             .withTimeInForce(timeInForceFromOrder(limitOrder).orElse(null));
 
-    getClientOrderId(limitOrder).ifPresent(krakenOrderBuilder::withClientOrderId);
+    Optional<String> clientOrderId = getClientOrderId(limitOrder);
+    if (clientOrderId.isPresent()) {
+      krakenOrderBuilder.withClientOrderId(clientOrderId.get());
+    } else {
+      krakenOrderBuilder.withUserRefId(limitOrder.getUserReference());
+    }
 
     return placeKrakenOrder(krakenOrderBuilder.buildOrder());
   }

xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/KrakenStreamingTradeService.java

@@ -137,7 +137,7 @@ else if ("stop".equals(orderType))
                 .timestamp(dto.opentm == null ? null : new Date((long) (dto.opentm * 1000L)))
                 .fee(dto.fee)
                 .flags(adaptFlags(dto.oflags))
-                .userReference(dto.userref == null ? null : Integer.toString(dto.userref))
+                .userReference(resolveUserReference(dto.cl_ord_id, dto.userref))
                 .build());
       }
     }
@@ -220,9 +220,16 @@ private List<UserTrade> adaptKrakenUserTrade(KrakenDtoUserTradeHolder[] ownTrade
                 .feeAmount(dto.fee)
                 .feeCurrency(currencyPair.counter)
                 .originalAmount(dto.vol)
+                .orderUserReference(resolveUserReference(dto.cl_ord_id, dto.userref))
                 .build());
       }
     }
     return result;
   }
+
+  private static String resolveUserReference(String cl_ord_id, Integer userref) {
+    return cl_ord_id == null
+        ? userref == null ? null : Integer.toString(userref)
+        : cl_ord_id;
+  }
 }

xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/dto/KrakenOpenOrder.java

@@ -2,14 +2,17 @@
 
 import java.math.BigDecimal;
 
-/** https://docs.kraken.com/websockets/#message-openOrders */
+/** https://docs.kraken.com/api/docs/websocket-v1/openorders */
 public class KrakenOpenOrder {
   /** Referral order transaction id that created this order */
   public String refid;
 
   /** user reference id */
   public Integer userref;
 
+  /** an optional, alphanumeric client identifier associated with this order */
+  public String cl_ord_id;
+
   /** status of order: */
   public String status;
 

xchange-stream-kraken/src/main/java/info/bitrich/xchangestream/kraken/dto/KrakenOwnTrade.java

@@ -6,6 +6,12 @@ public class KrakenOwnTrade {
   /** order responsible for execution of trade */
   public String ordertxid;
 
+  /** an optional, alphanumeric client identifier associated with this order. Available on update messages only. */
+  public String cl_ord_id;
+
+  /** an optional, numeric identifier associated with one or more orders. Available on update messages only. */
+  public Integer userref;
+
   /** Position trade id */
   public String postxid;