remove incorrect usage of nav

Author: wphan

programs/drift/src/instructions/lp_pool.rs

@@ -889,7 +889,7 @@ pub fn handle_lp_pool_add_liquidity<'c: 'info, 'info>(
     in_constituent.sync_token_balance(ctx.accounts.constituent_in_token_account.amount);
 
     let dlp_total_supply = ctx.accounts.lp_mint.supply;
-    let lp_nav = if dlp_total_supply > 0 {
+    let lp_price = if dlp_total_supply > 0 {
         lp_pool.last_aum.safe_div(dlp_total_supply as u128)?
     } else {
         0
@@ -910,7 +910,7 @@ pub fn handle_lp_pool_add_liquidity<'c: 'info, 'info>(
         lp_mint: lp_pool.mint,
         lp_amount,
         lp_fee: lp_fee_amount,
-        lp_nav,
+        lp_price,
         mint_redeem_id,
         last_aum: lp_pool.last_aum,
         last_aum_slot: lp_pool.last_aum_slot,
@@ -1086,7 +1086,7 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
     out_constituent.sync_token_balance(ctx.accounts.constituent_out_token_account.amount);
 
     let dlp_total_supply = ctx.accounts.lp_mint.supply;
-    let lp_nav = if dlp_total_supply > 0 {
+    let lp_price = if dlp_total_supply > 0 {
         lp_pool.last_aum.safe_div(dlp_total_supply as u128)?
     } else {
         0
@@ -1107,7 +1107,7 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
         lp_mint: lp_pool.mint,
         lp_amount: lp_burn_amount,
         lp_fee: lp_fee_amount,
-        lp_nav,
+        lp_price,
         mint_redeem_id,
         last_aum: lp_pool.last_aum,
         last_aum_slot: lp_pool.last_aum_slot,

programs/drift/src/state/events.rs

@@ -804,8 +804,8 @@ pub struct LPMintRedeemRecord {
     pub lp_amount: u64,
     /// lp fee, lp mint precision
     pub lp_fee: i64,
-    /// lp nav, PRICE_PRECISION
-    pub lp_nav: u128,
+    /// the fair price of the lp token, PRICE_PRECISION
+    pub lp_price: u128,
     pub mint_redeem_id: u64,
     /// LPPool last_aum
     pub last_aum: u128,

programs/drift/src/state/lp_pool.rs

@@ -61,9 +61,6 @@ pub struct LPPool {
     // vault token mint
     pub mint: Pubkey, // 32, 96
 
-    /// token_supply? to simplify NAV calculation, or load from mint account
-    /// token_total_supply: u64
-
     /// The current number of VaultConstituents in the vault, each constituent is pda(LPPool.address, constituent_index)
     /// which constituent is the quote, receives revenue pool distributions. (maybe this should just be implied idx 0)
     /// pub quote_constituent_index: u16,
@@ -118,18 +115,6 @@ impl Size for LPPool {
 }
 
 impl LPPool {
-    pub fn get_nav(&self, mint: &Mint) -> Result<u128> {
-        match mint.supply {
-            0 => Ok(0),
-            supply => {
-                // TODO: assuming mint decimals = quote decimals = 6
-                self.last_aum
-                    .checked_div(supply.into())
-                    .ok_or(ErrorCode::MathError.into())
-            }
-        }
-    }
-
     pub fn get_price(&self, mint: &Mint) -> Result<u128> {
         match mint.supply {
             0 => Ok(0),

sdk/src/idl/drift.json

@@ -9224,8 +9224,6 @@
           {
             "name": "maxAum",
             "docs": [
-              "token_supply? to simplify NAV calculation, or load from mint account",
-              "token_total_supply: u64",
               "The current number of VaultConstituents in the vault, each constituent is pda(LPPool.address, constituent_index)",
               "which constituent is the quote, receives revenue pool distributions. (maybe this should just be implied idx 0)",
               "pub quote_constituent_index: u16,",
@@ -16587,7 +16585,7 @@
           "index": false
         },
         {
-          "name": "lpNav",
+          "name": "lpPrice",
           "type": "u128",
           "index": false
         },
@@ -18265,8 +18263,5 @@
       "name": "ConstituentOracleStale",
       "msg": "Constituent oracle is stale"
     }
-  ],
-  "metadata": {
-    "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
-  }
+  ]
 }

sdk/src/types.ts

@@ -766,7 +766,7 @@ export type LPMintRedeemRecord = {
 	lpMint: PublicKey;
 	lpAmount: BN;
 	lpFee: BN;
-	lpNav: BN;
+	lpPrice: BN;
 	mintRedeemId: BN;
 	lastAum: BN;
 	lastAumSlot: BN;