Add marketIndex,marketType to fill event

drift-labs · Feb 22, 2024 · c639aac · c639aac
1 parent 5e61bc0
commit c639aac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -433,6 +433,8 @@ event payloads can be distinguished by "channel" field and the "data" payload is
             "fee": "0.002581",
             "amount": "0.1",
             "price": "103.22087",
+            "marketIndex": 0,
+            "marketType": "perp",
             "orderId": 157,
             "ts": 1704777355,
             "signature": "2Cdo5Xgxj6uWY6dnWmuU5a8tH5fKC2K6YUqzVYKgnm8KkMVhPczBZrNEs4VGwEBMhgosifmNjBXSjFMWbGKJiqSz"

diff --git a/src/websocket.rs b/src/websocket.rs
@@ -199,6 +199,9 @@ enum AccountEvent {
         amount: Decimal,
         price: Decimal,
         order_id: u32,
+        market_index: u16,
+        #[serde(serialize_with = "ser_market_type")]
+        market_type: MarketType,
         ts: u64,
         signature: String,
     },
@@ -239,6 +242,8 @@ impl AccountEvent {
         ts: u64,
         decimals: u32,
         signature: &String,
+        market_index: u16,
+        market_type: MarketType,
     ) -> Self {
         let base_amount = Decimal::new(base_amount as i64, decimals);
         let price = Decimal::new(quote_amount as i64, PRICE_DECIMALS) / base_amount;
@@ -254,6 +259,8 @@ impl AccountEvent {
             amount: base_amount.normalize(),
             ts,
             signature: signature.to_string(),
+            market_index,
+            market_type,
         }
     }
 }
@@ -409,6 +416,8 @@ fn map_drift_event(
                     *ts,
                     decimals,
                     signature,
+                    *market_index,
+                    *market_type,
                 )
             } else {
                 AccountEvent::fill(
@@ -420,6 +429,8 @@ fn map_drift_event(
                     *ts,
                     decimals,
                     signature,
+                    *market_index,
+                    *market_type,
                 )
             };