Merge pull request #10 from askibin/custody_fix

Fix collateral custody checks

Author: askibin

programs/perpetuals/src/instructions/close_position.rs

@@ -23,7 +23,7 @@ pub struct ClosePosition<'info> {
 
     #[account(
         mut,
-        constraint = receiving_account.mint == custody.mint,
+        constraint = receiving_account.mint == collateral_custody.mint,
         has_one = owner
     )]
     pub receiving_account: Box<Account<'info, TokenAccount>>,

programs/perpetuals/src/instructions/liquidate.rs

@@ -23,14 +23,14 @@ pub struct Liquidate<'info> {
 
     #[account(
         mut,
-        constraint = receiving_account.mint == custody.mint,
+        constraint = receiving_account.mint == collateral_custody.mint,
         constraint = receiving_account.owner == position.owner
     )]
     pub receiving_account: Box<Account<'info, TokenAccount>>,
 
     #[account(
         mut,
-        constraint = rewards_receiving_account.mint == custody.mint,
+        constraint = rewards_receiving_account.mint == collateral_custody.mint,
         constraint = rewards_receiving_account.owner == signer.key()
     )]
     pub rewards_receiving_account: Box<Account<'info, TokenAccount>>,

programs/perpetuals/src/state/custody.rs

@@ -408,10 +408,14 @@ impl Custody {
         if stats.open_positions > 0 {
             Ok(Position {
                 side,
-                price: math::checked_as_u64(math::checked_div(
-                    stats.weighted_price,
-                    stats.total_quantity,
-                )?)?,
+                price: if stats.total_quantity > 0 {
+                    math::checked_as_u64(math::checked_div(
+                        stats.weighted_price,
+                        stats.total_quantity,
+                    )?)?
+                } else {
+                    0
+                },
                 size_usd: stats.size_usd,
                 unrealized_loss_usd: stats.cumulative_interest_usd,
                 cumulative_interest_snapshot: stats.cumulative_interest_snapshot,