Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion binaries/src/bin/websocket_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ struct Args {
#[arg(long)]
port: u16,

/// Enable to include orders from spot markets. This is "unsafe" because order statuses for new
/// orders from special addresses (e.g. the assistance fund and HIP-2) are not emitted so we
/// **unsafely** assume that these orders are all "Alo" limit orders. Default is false, meaning
/// that spot orders are ignored.
#[arg(long)]
include_spot_unsafe: Option<bool>, // Default is false

/// Compression level for WebSocket connections.
/// Accepts values in the range `0..=9`.
/// * `0` – compression disabled.
Expand All @@ -36,8 +43,10 @@ async fn main() -> Result<()> {
let full_address = format!("{}:{}", args.address, args.port);
println!("Running websocket server on {full_address}");

let ignore_spot = !args.include_spot_unsafe.unwrap_or(false);

let compression_level = args.websocket_compression_level.unwrap_or(/* Some compression */ 1);
run_websocket_server(&full_address, true, compression_level).await?;
run_websocket_server(&full_address, ignore_spot, compression_level).await?;

Ok(())
}
22 changes: 21 additions & 1 deletion server/src/listeners/order_book/state.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
listeners::order_book::{L2Snapshots, TimedSnapshots, utils::compute_l2_snapshots},
order_book::{
Coin, InnerOrder, Oid,
Coin, InnerOrder, Oid, Px,
multi_book::{OrderBooks, Snapshots},
},
prelude::*,
Expand Down Expand Up @@ -104,6 +104,26 @@ impl OrderBookState {
#[allow(clippy::unwrap_used)]
inner_order.convert_trigger(time.try_into().unwrap());
self.order_book.add_order(inner_order);
} else if diff.special_address() {
// Assume all orders from special addresses are Alo, Limit orders
let inner_order = InnerL4Order {
user: diff.user(),
coin,
side: diff.side(),
limit_px: Px::parse_from_str(diff.px().as_str())?,
sz,
oid: oid.value(),
timestamp: time,
trigger_condition: "N/A".to_string(),
is_trigger: false,
trigger_px: "0.0".to_string(),
is_position_tpsl: false,
reduce_only: false,
order_type: "Limit".to_string(),
tif: Some("Alo".to_string()),
cloid: None,
};
self.order_book.add_order(inner_order);
} else {
return Err(format!("Unable to find order opening status {diff:?}").into());
}
Expand Down
3 changes: 3 additions & 0 deletions server/src/order_book/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ impl Oid {
pub(crate) const fn new(value: u64) -> Self {
Self(value)
}
pub(crate) const fn value(self) -> u64 {
self.0
}
}

pub(crate) trait InnerOrder: Clone {
Expand Down
18 changes: 17 additions & 1 deletion server/src/types/node_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@ use chrono::NaiveDateTime;
use serde::{Deserialize, Serialize};

use crate::{
order_book::{Coin, Oid},
order_book::{Coin, Oid, Side},
types::{Fill, L4Order, OrderDiff},
};

const ASSISTANCE_FUND: Address = Address::repeat_byte(0xFE);
const HIP_2: Address = Address::repeat_byte(0xFF);

#[derive(Debug, Clone, Serialize, Deserialize)]
pub(crate) struct NodeDataOrderDiff {
user: Address,
oid: u64,
side: Side,
px: String,
coin: String,
pub(crate) raw_book_diff: OrderDiff,
Expand All @@ -29,6 +33,18 @@ impl NodeDataOrderDiff {
pub(crate) fn coin(&self) -> Coin {
Coin::new(&self.coin)
}
pub(crate) fn user(&self) -> Address {
self.user
}
pub(crate) fn side(&self) -> Side {
self.side
}
pub(crate) fn px(&self) -> String {
self.px.clone()
}
pub(crate) fn special_address(&self) -> bool {
self.user == ASSISTANCE_FUND || self.user == HIP_2
}
}

#[derive(Debug, Clone, Serialize, Deserialize)]
Expand Down
4 changes: 2 additions & 2 deletions server/src/types/subscription.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ impl Subscription {
match self {
Self::Trades { coin } => universe.contains(coin),
Self::L2Book { coin, n_sig_figs, n_levels, mantissa } => {
if !universe.contains(coin) || coin.starts_with('@') {
if !universe.contains(coin) {
info!("Invalid subscription: coin not found");
return false;
}
Expand Down Expand Up @@ -62,7 +62,7 @@ impl Subscription {
true
}
Self::L4Book { coin } => {
if !universe.contains(coin) || coin.starts_with('@') {
if !universe.contains(coin) {
info!("Invalid subscription: coin not found");
return false;
}
Expand Down