Phoenix: Add trader field to PhoenixOrder

skynetcap · Nov 26, 2023 · 40a0ed7 · 40a0ed7
1 parent f155ba4
commit 40a0ed7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/phoenix/src/main/java/com/mmorrell/phoenix/model/PhoenixMarket.java b/phoenix/src/main/java/com/mmorrell/phoenix/model/PhoenixMarket.java
@@ -123,6 +123,7 @@ private static void normalizeOrders(PhoenixMarket market) {
                     PhoenixOrder.builder()
                             .price(price)
                             .size(size)
+                            .trader(market.getTraders().get((int) (order.getSecond().getTraderIndex() - 1)).getFirst())
                             .build()
             );
         });
@@ -144,6 +145,7 @@ private static void normalizeOrders(PhoenixMarket market) {
                     PhoenixOrder.builder()
                             .price(price)
                             .size(size)
+                            .trader(market.getTraders().get((int) (order.getSecond().getTraderIndex() - 1)).getFirst())
                             .build()
             );
         });

diff --git a/phoenix/src/main/java/com/mmorrell/phoenix/model/PhoenixOrder.java b/phoenix/src/main/java/com/mmorrell/phoenix/model/PhoenixOrder.java
@@ -2,12 +2,14 @@
 
 import lombok.Builder;
 import lombok.Data;
+import org.p2p.solanaj.core.PublicKey;
 
 @Data
 @Builder
 public class PhoenixOrder {
 
     private double price;
     private double size;
+    private PublicKey trader;
 
 }
diff --git a/phoenix/src/test/java/PhoenixTest.java b/phoenix/src/test/java/PhoenixTest.java
@@ -94,10 +94,12 @@ public void orderNormalizedTest() {
             log.info("Market: {}", market.getMarketId().toBase58());
             // log.info("Detail: {}", market);
             market.getBidListNormalized().forEach(phoenixOrder -> {
-                log.info(String.format("Bid: %.10f x %.4f", phoenixOrder.getPrice(), phoenixOrder.getSize()));
+                log.info(String.format("Bid: %.10f x %.4f, Trader: %s", phoenixOrder.getPrice(),
+                        phoenixOrder.getSize(), phoenixOrder.getTrader().toBase58()));
             });
             market.getAskListNormalized().forEach(phoenixOrder -> {
-                log.info(String.format("Ask: %.10f x %.4f", phoenixOrder.getPrice(), phoenixOrder.getSize()));
+                log.info(String.format("Ask: %.10f x %.4f, Trader: %s", phoenixOrder.getPrice(),
+                        phoenixOrder.getSize(), phoenixOrder.getTrader().toBase58()));
             });
         });
     }