bigz/update-spot-tvl-invariant-check

programs/drift/src/controller/insurance.rs

@@ -555,17 +555,17 @@ pub fn settle_revenue_to_insurance_fund(
     )?;
 
     let depositors_claim =
-        validate_spot_market_vault_amount(spot_market, spot_market_vault_amount)?.cast::<u128>()?;
+        validate_spot_market_vault_amount(spot_market, spot_market_vault_amount)?;
 
     let mut token_amount = get_token_amount(
         spot_market.revenue_pool.scaled_balance,
         spot_market,
         &SpotBalanceType::Deposit,
     )?;
 
-    if depositors_claim < token_amount {
+    if depositors_claim < token_amount.cast()? {
         // only allow half of withdraw available when utilization is high
-        token_amount = depositors_claim.safe_div(2)?;
+        token_amount = depositors_claim.max(0).cast::<u128>()?.safe_div(2)?;
     }
 
     if spot_market.insurance_fund.user_shares > 0 {

programs/drift/src/controller/pnl.rs

@@ -129,7 +129,12 @@ pub fn settle_pnl(
         user_unsettled_pnl,
         now,
     )?;
-
+    crate::dlog!(
+        net_user_pnl,
+        max_pnl_pool_excess,
+        user_unsettled_pnl,
+        pnl_to_settle_with_user
+    );
     if user_unsettled_pnl == 0 {
         msg!("User has no unsettled pnl for market {}", market_index);
         return Ok(());

programs/drift/src/controller/spot_balance.rs

@@ -252,7 +252,7 @@ pub fn update_spot_balances(
         }
     }
 
-    if let SpotBalanceType::Borrow = update_direction {
+    if force_round_up && update_direction == &SpotBalanceType::Borrow {
         let deposit_token_amount = get_token_amount(
             spot_market.deposit_balance,
             spot_market,
@@ -293,13 +293,15 @@ pub fn transfer_spot_balances(
         return Ok(());
     }
 
-    validate!(
-        spot_market.deposit_balance >= from_spot_balance.balance(),
-        ErrorCode::InvalidSpotMarketState,
-        "spot_market.deposit_balance={} lower than individual spot balance={}",
-        spot_market.deposit_balance,
-        from_spot_balance.balance()
-    )?;
+    if from_spot_balance.balance_type() == &SpotBalanceType::Deposit {
+        validate!(
+            spot_market.deposit_balance >= from_spot_balance.balance(),
+            ErrorCode::InvalidSpotMarketState,
+            "spot_market.deposit_balance={} lower than individual spot balance={}",
+            spot_market.deposit_balance,
+            from_spot_balance.balance()
+        )?;
+    }
 
     update_spot_balances(
         token_amount.unsigned_abs(),

programs/drift/src/math/spot_withdraw.rs

@@ -252,7 +252,7 @@ pub fn get_max_withdraw_for_market_with_token_amount(
     max_withdraw_amount.safe_add(borrow_limit)
 }
 
-pub fn validate_spot_balances(spot_market: &SpotMarket) -> DriftResult<u64> {
+pub fn validate_spot_balances(spot_market: &SpotMarket) -> DriftResult<i64> {
     let depositors_amount: u64 = get_token_amount(
         spot_market.deposit_balance,
         spot_market,
@@ -266,13 +266,13 @@ pub fn validate_spot_balances(spot_market: &SpotMarket) -> DriftResult<u64> {
     )?
     .cast()?;
 
-    validate!(
-        depositors_amount >= borrowers_amount,
-        ErrorCode::SpotMarketBalanceInvariantViolated,
-        "depositors_amount={} less than borrowers_amount={}",
-        depositors_amount,
-        borrowers_amount
-    )?;
+    // validate!(
+    //     depositors_amount >= borrowers_amount,
+    //     ErrorCode::SpotMarketBalanceInvariantViolated,
+    //     "depositors_amount={} less than borrowers_amount={}",
+    //     depositors_amount,
+    //     borrowers_amount
+    // )?;
 
     let revenue_amount: u64 = get_token_amount(
         spot_market.revenue_pool.scaled_balance,
@@ -281,7 +281,9 @@ pub fn validate_spot_balances(spot_market: &SpotMarket) -> DriftResult<u64> {
     )?
     .cast()?;
 
-    let depositors_claim = depositors_amount - borrowers_amount;
+    let depositors_claim = depositors_amount
+        .cast::<i64>()?
+        .safe_sub(borrowers_amount.cast()?)?;
 
     validate!(
         revenue_amount <= depositors_amount,
@@ -299,11 +301,11 @@ pub fn validate_spot_balances(spot_market: &SpotMarket) -> DriftResult<u64> {
 pub fn validate_spot_market_vault_amount(
     spot_market: &SpotMarket,
     vault_amount: u64,
-) -> DriftResult<u64> {
+) -> DriftResult<i64> {
     let depositors_claim = validate_spot_balances(spot_market)?;
 
     validate!(
-        vault_amount >= depositors_claim,
+        vault_amount.cast::<i64>()? >= depositors_claim,
         ErrorCode::SpotMarketVaultInvariantViolated,
         "spot market vault ={} holds less than remaining depositor claims = {}",
         vault_amount,

test-scripts/run-anchor-tests.sh

@@ -4,59 +4,59 @@ if [ "$1" != "--skip-build" ]; then
 fi
 
 test_files=(
-  oracleFillPriceGuardrails.ts
-  perpLpJit.ts
-  spotSwap.ts
-  maxLeverageOrderParams.ts
-  multipleMakerOrders.ts
-  postOnlyAmmFulfillment.ts
-  imbalancePerpPnl.ts
-  delistMarket.ts
-  delistMarketLiq.ts
-  triggerSpotOrder.ts
-  serumTest.ts
-  phoenixTest.ts
-  liquidityProvider.ts
-  tradingLP.ts
-  insuranceFundStake.ts
-  liquidateSpot.ts
-  liquidateSpotSocialLoss.ts
-  referrer.ts
-  liquidatePerpPnlForDeposit.ts
-  liquidateBorrowForPerpPnl.ts
-  liquidatePerp.ts
-  liquidatePerpAndLp.ts
-  order.ts
-  spotDepositWithdraw.ts
-  prepegMarketOrderBaseAssetAmount.ts
-  updateAMM.ts
-  repegAndSpread.ts
-  driftClient.ts
-  ordersWithSpread.ts
-  marketOrder.ts
-  triggerOrders.ts
-  stopLimits.ts
-  userOrderId.ts
-  postOnly.ts
-  placeAndMakePerp.ts
-  placeAndMakeSpotOrder.ts
-  roundInFavorBaseAsset.ts
-  marketOrderBaseAssetAmount.ts
-  oracleOffsetOrders.ts
-  userDelegate.ts
-  subaccounts.ts
-  pyth.ts
-  userAccount.ts
-  admin.ts
-  assetTier.ts
-  pauseExchange.ts
-  whitelist.ts
-  updateK.ts
-  curve.ts
-  cappedSymFunding.ts
-  maxDeposit.ts
-  cancelAllOrders.ts
-  modifyOrder.ts
+#   oracleFillPriceGuardrails.ts
+#   perpLpJit.ts
+#   spotSwap.ts
+#   maxLeverageOrderParams.ts
+#   multipleMakerOrders.ts
+#   postOnlyAmmFulfillment.ts
+#   imbalancePerpPnl.ts
+#   delistMarket.ts
+#   delistMarketLiq.ts
+#   triggerSpotOrder.ts
+#   serumTest.ts
+#   phoenixTest.ts
+#   liquidityProvider.ts
+#   tradingLP.ts
+#   insuranceFundStake.ts
+#   liquidateSpot.ts
+#   liquidateSpotSocialLoss.ts
+#   referrer.ts
+#   liquidatePerpPnlForDeposit.ts
+#   liquidateBorrowForPerpPnl.ts
+#   liquidatePerp.ts
+#   liquidatePerpAndLp.ts
+#   order.ts
+  spotWithdrawUtil100.ts
+#   prepegMarketOrderBaseAssetAmount.ts
+#   updateAMM.ts
+#   repegAndSpread.ts
+#   driftClient.ts
+#   ordersWithSpread.ts
+#   marketOrder.ts
+#   triggerOrders.ts
+#   stopLimits.ts
+#   userOrderId.ts
+#   postOnly.ts
+#   placeAndMakePerp.ts
+#   placeAndMakeSpotOrder.ts
+#   roundInFavorBaseAsset.ts
+#   marketOrderBaseAssetAmount.ts
+#   oracleOffsetOrders.ts
+#   userDelegate.ts
+#   subaccounts.ts
+#   pyth.ts
+#   userAccount.ts
+#   admin.ts
+#   assetTier.ts
+#   pauseExchange.ts
+#   whitelist.ts
+#   updateK.ts
+#   curve.ts
+#   cappedSymFunding.ts
+#   maxDeposit.ts
+#   cancelAllOrders.ts
+#   modifyOrder.ts
 )
 
 for test_file in ${test_files[@]}; do