Fix/liquidation price

.github/workflows/build.yml

@@ -37,13 +37,11 @@ jobs:
         continue-on-error: false
         with:
           path: |
-            ~/.cargo/bin/
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
             target/            
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
+          restore-keys: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Format
         run: cargo fmt --all -- --check
       - name: Build

README.md

@@ -265,6 +265,8 @@ get extended position info for perps positions
 $ curl localhost:8080/v2/positionInfo/0
 ```
 
+note: unrealized PnL is based on the oracle price at time of query
+
 **Response**
 ```json
 {

src/controller.rs

@@ -3,7 +3,7 @@ use drift_sdk::{
     dlob::DLOBClient,
     event_subscriber::try_parse_log,
     event_subscriber::CommitmentConfig,
-    liquidation::calculate_liquidation_price,
+    liquidation::calculate_liquidation_price_and_unrealized_pnl,
     types::{
         Context, MarketId, MarketType, ModifyOrderParams, RpcSendTransactionConfig, SdkError,
         SdkResult, VersionedMessage,
@@ -208,23 +208,22 @@ impl AppState {
         market: Market,
     ) -> GatewayResult<PerpPosition> {
         let sub_account = self.resolve_sub_account(sub_account_id);
-        if let Some(perp_position) = self
-            .client
-            .perp_position(&sub_account, market.market_index)
-            .await?
-        {
-            let (oracle_price, user) = tokio::join!(
-                self.client.oracle_price(market.as_market_id()),
-                self.client.get_user_account(&sub_account)
-            );
-
-            let unrealized_pnl = perp_position.get_unrealized_pnl(oracle_price?);
-            let liquidation_price =
-                calculate_liquidation_price(&self.client, &user?, market.market_index).await?;
+        let (perp_position, user) = tokio::join!(
+            self.client.perp_position(&sub_account, market.market_index),
+            self.client.get_user_account(&sub_account),
+        );
+
+        if let Some(perp_position) = perp_position? {
+            let result = calculate_liquidation_price_and_unrealized_pnl(
+                &self.client,
+                &user?,
+                market.market_index,
+            )
+            .await?;
             let mut p: PerpPosition = perp_position.into();
             p.set_extended_info(PerpPositionExtended {
-                liquidation_price: Decimal::new(liquidation_price, PRICE_DECIMALS),
-                unrealized_pnl: Decimal::new(unrealized_pnl.unwrap() as i64, PRICE_DECIMALS),
+                liquidation_price: Decimal::new(result.liquidation_price, PRICE_DECIMALS),
+                unrealized_pnl: Decimal::new(result.unrealized_pnl as i64, PRICE_DECIMALS),
             });
 
             Ok(p)