add typescript test, fix order param market_type

drift-labs · Jan 11, 2024 · 3156829 · 3156829
1 parent 98ef362
commit 3156829
Show file tree

Hide file tree

Showing 6 changed files with 504 additions and 2 deletions.
diff --git a/programs/drift/src/state/order_params.rs b/programs/drift/src/state/order_params.rs
@@ -137,6 +137,7 @@ impl OrderParams {
         };
 
         let params = OrderParams {
+            market_type: MarketType::Perp,
             direction: direction_to_close,
             order_type: OrderType::Oracle,
             market_index: market.market_index,

diff --git a/programs/drift/src/state/user.rs b/programs/drift/src/state/user.rs
@@ -919,6 +919,14 @@ impl PerpPosition {
                 .map(|delta| delta.max(0))?
                 .safe_add(pnl_pool_excess.max(0))?;
 
+            if max_positive_pnl < unrealized_pnl {
+                msg!(
+                    "Claimable pnl below position upnl: {} < {}",
+                    max_positive_pnl,
+                    unrealized_pnl
+                );
+            }
+
             Ok(unrealized_pnl.min(max_positive_pnl))
         } else {
             Ok(unrealized_pnl)

diff --git a/sdk/src/math/funding.ts b/sdk/src/math/funding.ts
@@ -7,7 +7,7 @@ import {
 	ONE,
 	FUNDING_RATE_OFFSET_DENOMINATOR,
 } from '../constants/numericConstants';
-import { ContractTier, PerpMarketAccount, isVariant } from '../types';
+import { PerpMarketAccount, isVariant } from '../types';
 import { OraclePriceData } from '../oracles/types';
 import { calculateBidAskPrice } from './amm';
 import { calculateLiveOracleTwap } from './oracles';

diff --git a/test-scripts/run-anchor-tests.sh b/test-scripts/run-anchor-tests.sh
@@ -9,6 +9,7 @@ test_files=(
   stopLimits.ts
   oracleFillPriceGuardrails.ts
   perpLpJit.ts
+  perpLpRiskMitigation.ts
   spotSwap.ts
   maxLeverageOrderParams.ts
   multipleMakerOrders.ts

diff --git a/test-scripts/single-anchor-test.sh b/test-scripts/single-anchor-test.sh
@@ -4,7 +4,7 @@ if [ "$1" != "--skip-build" ]
     cp target/idl/drift.json sdk/src/idl/
 fi
 
-test_files=(perpLpJit.ts)
+test_files=(perpLpRiskMitigation.ts)
 
 for test_file in ${test_files[@]}; do
   ANCHOR_TEST_FILE=${test_file} anchor test --skip-build || exit 1;