Skip to content
Merged
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
42 changes: 27 additions & 15 deletions src/liquidator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,13 @@ impl LiquidatorBot {
pyth_access_token.as_str(),
)
.expect("pyth price feed connects");
let pyth_price_feed =
crate::util::subscribe_price_feeds(pyth_feed_cli, &perp_market_ids, &spot_market_ids);

let pyth_price_feed: tokio::sync::mpsc::Receiver<_> = if config.use_spot_liquidation {
crate::util::subscribe_price_feeds(pyth_feed_cli, &perp_market_ids, &spot_market_ids)
} else {
crate::util::subscribe_price_feeds(pyth_feed_cli, &perp_market_ids, &[])
};

log::info!(target: TARGET, "subscribed pyth price feeds");

// start liquidation worker
Expand All @@ -470,6 +475,7 @@ impl LiquidatorBot {
market_state,
keeper_subaccount,
metrics: Arc::clone(&metrics),
use_spot_liquidation: config.use_spot_liquidation,
}),
liq_rx,
std::env::var("FILL_CU_LIMIT")
Expand Down Expand Up @@ -1352,6 +1358,7 @@ pub struct LiquidateWithMatchStrategy {
pub market_state: &'static MarketState,
pub keeper_subaccount: Pubkey,
pub metrics: Arc<Metrics>,
pub use_spot_liquidation: bool,
}

impl LiquidateWithMatchStrategy {
Expand Down Expand Up @@ -1724,18 +1731,23 @@ impl LiquidationStrategy for LiquidateWithMatchStrategy {
slot,
pyth_price_update,
);
Self::liquidate_spot(
self.drift.clone(),
Arc::clone(&self.metrics),
self.market_state.load(),
self.keeper_subaccount,
liquidatee,
user_account,
tx_sender.clone(),
priority_fee,
400_000,
slot,
)
.boxed()

if self.use_spot_liquidation {
Self::liquidate_spot(
self.drift.clone(),
Arc::clone(&self.metrics),
self.market_state.load(),
self.keeper_subaccount,
liquidatee,
user_account,
tx_sender.clone(),
priority_fee,
400_000,
slot,
)
.boxed()
} else {
async {}.boxed()
}
}
}
3 changes: 3 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ pub struct Config {
/// Run perp liquidator bot
#[clap(long, default_value = "false")]
pub liquidator: bool,
/// Use spot liquidation in liquidator
#[clap(long, default_value = "true")]
pub use_spot_liquidation: bool,
/// Run perp filler bot
#[clap(long, default_value = "true")]
pub filler: bool,
Expand Down