Merge pull request #103 from 0dotxyz/stage

1.10 + Improvements

Author: IliaZyrin

Cargo.lock

@@ -54,7 +54,7 @@ serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 signal-hook = "0.4.3"
 tiny_http = "0.12.0"
-tokio = { version = "1.50.0", features = ["rt", "macros"] }
+tokio = { version = "1.50.0", features = ["rt", "macros", "sync"] }
 warp = "0.4.2"
 
 yellowstone-grpc-client = "10.2.0"
@@ -65,16 +65,16 @@ switchboard-on-demand-client = { git = "https://github.com/switchboard-xyz/switc
 
 [dependencies.marginfi_type_crate]
 git = "https://github.com/mrgnlabs/marginfi-v2"
-tag = "mrgn-0.1.9-rc3"
-#rev = "4abf7d0a45e1f719a630487c2d09d3d1e9d36c85"
+#tag = "mrgn-0.1.10-rc1"
+rev = "e3c9b4e104d22c54aca180c31b90ff44c337f42d"
 package = "marginfi-type-crate"
 default-features = false
 features = ["client"]
 
 [dependencies.marginfi]
 git = "https://github.com/mrgnlabs/marginfi-v2"
-tag = "mrgn-0.1.9-rc3"
-#rev = "4abf7d0a45e1f719a630487c2d09d3d1e9d36c85"
+#tag = "mrgn-0.1.10-rc1"
+rev = "e3c9b4e104d22c54aca180c31b90ff44c337f42d"
 default-features = false
 features = ["client", "no-entrypoint", "custom-heap"]
 

Cargo.toml

@@ -4,7 +4,6 @@ YELLOWSTONE_X_TOKEN=<TOKEN>
 WALLET_KEYPAIR=<WALLET_KEYPAIR>
 COMPUTE_UNIT_PRICE_MICRO_LAMPORTS=1000
 MARGINFI_GROUP_KEY=4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8
-ADDRESS_LOOKUP_TABLES=HGmknUTUmeovMc9ryERNWG6UFZDFDVr9xrum3ZhyL4fC,5FuKF7C1tJji2mXZuJ14U9oDb37is5mmvYLf4KwojoF1,FEFhAFKz48P3w82Ds5VhvyEDwhRqu2FejmnuxEPZ8wNR
 
 # Minimum liquidation profit in USD
 MIN_PROFIT=1
@@ -19,14 +18,8 @@ SLIPPAGE_BPS=100
 # `${YELLOWSTONE_ENDPOINT}/${YELLOWSTONE_X_TOKEN}` (or just endpoint if token is empty).
 # RPC_URL=<RPC_URL>
 
-# Switchboard feeds that should not be cranked (cause they fail too often)
-UNSTABLE_SWB_FEEDS=<4YMdFbV8FaUv4FpE2gbZBReSFVzFKNPJZHirHwc2Psza,...>
 CROSSBAR_API_URL=<SWITCHBOARD_CROSSBAR_API_URL>
 
 # Port to check liquidator health state via HTTP. Example: http://localhost:3000/healthz
 # Defaults to 3000 if not set
 PORT=3000
-
-# Liquidation is skipped if there is less than this amount of tokens-to-be-used-for-repayment in the wallet. In USD.
-# Defaults to 0.001 if not set
-TOKEN_DUST_THRESHOLD=0.001

bin/env.template

@@ -1,3 +1,3 @@
 [toolchain]
 channel = "1.90.0"
-components = ["rustfmt", "clippy"]
+components = ["rustfmt", "clippy", "rust-analyzer"]

rust-toolchain.toml

@@ -7,7 +7,7 @@ mod tokens;
 pub use banks::is_switchboard_pull_setup;
 
 use std::{
-    collections::HashMap,
+    collections::{HashMap, HashSet},
     sync::{Arc, Mutex},
 };
 
@@ -18,6 +18,7 @@ use banks::BanksCache;
 use marginfi_type_crate::{
     constants::{ASSET_TAG_DEFAULT, ASSET_TAG_SOL, ASSET_TAG_STAKED, FEE_STATE_SEED},
     pdas::derive_kamino_lending_market_authority,
+    types::MarginfiGroup,
 };
 use mints::MintsCache;
 use oracles::OraclesCache;
@@ -82,6 +83,7 @@ impl GroupedLuts {
 pub struct Cache {
     pub signer_pk: Pubkey,
     pub marginfi_group_address: Pubkey,
+    pub marginfi_group: MarginfiGroup,
     pub marginfi_accounts: MarginfiAccountsCache,
     pub banks: BanksCache,
     pub mints: MintsCache,
@@ -112,15 +114,17 @@ impl Cache {
         signer_pk: Pubkey,
         marginfi_group_address: Pubkey,
         clock: Arc<Mutex<Clock>>,
+        excluded_mints: HashSet<Pubkey>,
     ) -> Self {
         let (global_fee_state_key, _) =
             Pubkey::find_program_address(&[FEE_STATE_SEED.as_bytes()], &marginfi_type_crate::ID);
         Self {
             signer_pk,
             marginfi_group_address,
+            marginfi_group: MarginfiGroup::default(),
             marginfi_accounts: MarginfiAccountsCache::default(),
             banks: BanksCache::default(),
-            mints: MintsCache::default(),
+            mints: MintsCache::new(excluded_mints),
             oracles: OraclesCache::default(),
             tokens: TokensCache::default(),
             clock,

src/cache.rs

@@ -58,6 +58,22 @@ impl MarginfiAccountsCache {
             .cloned()
     }
 
+    pub fn try_get_accounts_with_liabilities(&self) -> Result<Vec<Pubkey>> {
+        let inner = self.inner.read().map_err(|e| {
+            anyhow!(
+                "Failed to lock the marginfi accounts cache for liability lookup: {}",
+                e
+            )
+        })?;
+
+        Ok(inner
+            .accounts
+            .keys()
+            .filter(|account| !inner.accounts_without_liabilities.contains(account))
+            .copied()
+            .collect())
+    }
+
     pub fn try_get_accounts_for_bank_with_liabilities(
         &self,
         bank_address: &Pubkey,

src/cache/accounts.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 
 use anyhow::{anyhow, Result};
 use solana_sdk::{account::Account, pubkey::Pubkey};
@@ -9,9 +9,17 @@ use crate::wrappers::mint::MintWrapper;
 pub struct MintsCache {
     mints: HashMap<Pubkey, MintWrapper>,
     token_to_mint: HashMap<Pubkey, Pubkey>,
+    excluded_mints: HashSet<Pubkey>,
 }
 
 impl MintsCache {
+    pub fn new(excluded_mints: HashSet<Pubkey>) -> Self {
+        Self {
+            excluded_mints,
+            ..Default::default()
+        }
+    }
+
     pub fn insert(&mut self, mint_address: Pubkey, mint: Account, token_address: Pubkey) {
         self.mints
             .insert(mint_address, MintWrapper::new(token_address, mint));
@@ -26,14 +34,10 @@ impl MintsCache {
     }
 
     pub fn get_mints(&self) -> Vec<Pubkey> {
-        // TODO: remove once UXD & sUSD are sunset
         self.mints
             .keys()
+            .filter(|mint| !self.excluded_mints.contains(mint))
             .cloned()
-            .filter(|&mint| {
-                mint != Pubkey::from_str_const("7kbnvuGBxxj8AG9qp8Scn56muWGaRaFqxg1FsRp3PaFT")
-                    && mint != Pubkey::from_str_const("susdabGDNbhrnCa6ncrYo81u4s9GM8ecK2UwMyZiq4X")
-            })
             .collect()
     }
 

src/cache/mints.rs

@@ -67,6 +67,7 @@ impl CacheLoader {
         let marginfi_group =
             bytemuck::from_bytes::<MarginfiGroup>(&marginfi_group_account.data[8..]);
         cache.global_fee_wallet = marginfi_group.fee_state_cache.global_fee_wallet;
+        cache.marginfi_group = *marginfi_group;
 
         self.load_luts(cache)?;
         self.load_marginfi_accounts(cache)?;

src/cache_loader.rs

@@ -10,7 +10,7 @@ use crate::{
     },
     wrappers::liquidator_account::LiquidatorAccount,
 };
-use log::{error, info};
+use log::{error, info, warn};
 use solana_client::rpc_client::RpcClient;
 use solana_sdk::{signature::Keypair, signer::Signer};
 use std::{
@@ -34,7 +34,12 @@ pub fn run_liquidator(config: Eva01Config, stop_liquidator: Arc<AtomicBool>) ->
     let mut clock_manager = ClockManager::new(clock.clone(), config.rpc_url.clone())?;
 
     info!("Loading Cache...");
-    let mut cache = Cache::new(wallet_pubkey, config.marginfi_group_key, clock.clone());
+    let mut cache = Cache::new(
+        wallet_pubkey,
+        config.marginfi_group_key,
+        clock.clone(),
+        config.excluded_liquidation_mints.iter().copied().collect(),
+    );
 
     let cache_loader = CacheLoader::new(
         &config.wallet_keypair,
@@ -69,38 +74,46 @@ pub fn run_liquidator(config: Eva01Config, stop_liquidator: Arc<AtomicBool>) ->
         cache.clone(),
     )?;
 
+    let swb_fetcher_tx = geyser_tx.clone();
+    let integration_fetcher_tx = geyser_tx.clone();
+
     let geyser_service = GeyserService::new(
         config,
         accounts_to_track,
         geyser_tx,
         stop_liquidator.clone(),
     )?;
 
-    let swb_fetcher_cache = cache.clone();
-    let swb_fetcher_stop = stop_liquidator.clone();
-    let integration_fetcher_cache = cache.clone();
-    let integration_fetcher_stop = stop_liquidator.clone();
+    let swb_fetcher = SwbPriceFetcher::new(
+        swb_fetcher_api_url,
+        swb_fetcher_crossbar_url,
+        cache.clone(),
+        swb_fetcher_tx,
+        stop_liquidator.clone(),
+    );
+    let integration_fetcher = IntegrationAccountFetcher::new(
+        integration_fetcher_rpc_url,
+        cache.clone(),
+        integration_fetcher_tx,
+        stop_liquidator.clone(),
+    );
 
-    info!("Starting services...");
+    // Prime both fetchers before any service runs: the accounts they own are loaded from chain in
+    // a state marginfi rejects as stale (Switchboard feeds, Kamino reserves, JupLend lending
+    // states), so anything pricing a bank before their first cycle — the Liquidator's initial scan
+    // above all — fails on staleness instead of evaluating the account.
+    info!("Priming the fetcher-owned accounts...");
+    if let Err(e) = integration_fetcher.fetch_and_update() {
+        warn!("Failed to prime the integration accounts: {:?}", e);
+    }
+    if let Err(e) = swb_fetcher.fetch_and_update() {
+        warn!("Failed to prime the Switchboard prices: {:?}", e);
+    }
 
-    thread::spawn(move || {
-        SwbPriceFetcher::new(
-            swb_fetcher_api_url,
-            swb_fetcher_crossbar_url,
-            swb_fetcher_cache,
-            swb_fetcher_stop,
-        )
-        .start();
-    });
+    info!("Starting services...");
 
-    thread::spawn(move || {
-        IntegrationAccountFetcher::new(
-            integration_fetcher_rpc_url,
-            integration_fetcher_cache,
-            integration_fetcher_stop,
-        )
-        .start();
-    });
+    thread::spawn(move || swb_fetcher.start());
+    thread::spawn(move || integration_fetcher.start());
 
     let cloned_stop = stop_liquidator.clone();
     thread::spawn(move || clock_manager.start(cloned_stop));

src/cli/entrypoints.rs

@@ -12,6 +12,7 @@ pub struct Eva01Config {
     pub luts_group1: Vec<Pubkey>,
     pub luts_group2: Vec<Pubkey>,
     pub luts_group3: Vec<Pubkey>,
+    pub excluded_liquidation_mints: Vec<Pubkey>,
     pub min_profit: f64,
     pub healthcheck_port: u16,
     pub swb_program_id: Pubkey,
@@ -23,7 +24,6 @@ pub struct Eva01Config {
     pub titan_ws_endpoint: String,
     pub titan_api_key: String,
     pub jupiter_api_key: String,
-    pub use_fumarole: bool,
     /// Jito block-engine `sendBundle` endpoint; `None` uses the executor's built-in default.
     pub jito_block_engine_url: Option<String>,
     /// Hard cap on the Jito tip per bundle (lamports).
@@ -62,6 +62,8 @@ impl Eva01Config {
         let luts_group2 = parse_pubkey_list("ADDRESS_LOOKUP_TABLES_GROUP2").unwrap_or_default();
         let luts_group3 = parse_pubkey_list("ADDRESS_LOOKUP_TABLES_GROUP3").unwrap_or_default();
 
+        let excluded_liquidation_mints = parse_pubkey_list("EXCLUDED_LIQUIDATION_MINTS")?;
+
         let min_profit: f64 = std::env::var("MIN_PROFIT")
             .expect("MIN_PROFIT environment variable is not set")
             .parse()
@@ -102,8 +104,6 @@ impl Eva01Config {
         let jupiter_api_key = std::env::var("JUP_SWAP_API_KEY")
             .expect("JUP_SWAP_API_KEY environment variable is not set");
 
-        let use_fumarole = std::env::var("USE_FUMAROLE").is_ok_and(|x| x == "true");
-
         let jito_block_engine_url = std::env::var("JITO_BLOCK_ENGINE_URL").ok();
         // Default cap 0.001 SOL (matches Jito's typical max tip floor).
         let jito_tip_max_lamports: u64 = std::env::var("JITO_TIP_MAX_LAMPORTS")
@@ -122,6 +122,7 @@ impl Eva01Config {
             luts_group1,
             luts_group2,
             luts_group3,
+            excluded_liquidation_mints,
             min_profit,
             healthcheck_port,
             swb_program_id,
@@ -133,7 +134,6 @@ impl Eva01Config {
             titan_ws_endpoint,
             titan_api_key,
             jupiter_api_key,
-            use_fumarole,
             jito_block_engine_url,
             jito_tip_max_lamports,
             bundle_api_key,