merge master

Author: lowkeynicc

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+- program: support scaled ui extension ([#1894](https://github.com/drift-labs/protocol-v2/pull/1894))
+
 ### Fixes
 
 ### Breaking
@@ -20,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - program: post only respects reduce only ([#1878](https://github.com/drift-labs/protocol-v2/pull/1878))
 - program: add sequence id to exchange/mm oracle ([#1834](https://github.com/drift-labs/protocol-v2/pull/1834))
 - program: perp position max margin ratio ([#1847](https://github.com/drift-labs/protocol-v2/pull/1847))
+- program: add padding to swift messages ([#1845](https://github.com/drift-labs/protocol-v2/pull/1845))
 - program: rm lp ([#1755](https://github.com/drift-labs/protocol-v2/pull/1755))
 
 ### Fixes

programs/drift/src/controller/token.rs

@@ -199,3 +199,21 @@ pub fn transfer_checked_with_transfer_hook<'info>(
 
     solana_program::program::invoke_signed(&ix, &account_infos, signer_seeds).map_err(Into::into)
 }
+
+pub fn initialize_token_account<'info>(
+    token_program: &Interface<'info, TokenInterface>,
+    account: &AccountInfo<'info>,
+    owner: &AccountInfo<'info>,
+    mint: &InterfaceAccount<'info, Mint>,
+) -> Result<()> {
+    let cpi_program = token_program.to_account_info();
+    let accounts = ::anchor_spl::token_interface::InitializeAccount3 {
+        account: account.to_account_info(),
+        mint: mint.to_account_info(),
+        authority: owner.to_account_info(),
+    };
+    let cpi_ctx = anchor_lang::context::CpiContext::new(cpi_program, accounts);
+    ::anchor_spl::token_interface::initialize_account3(cpi_ctx)?;
+
+    Ok(())
+}

programs/drift/src/instructions/admin.rs

@@ -10,7 +10,7 @@ use pyth_solana_receiver_sdk::cpi::accounts::InitPriceUpdate;
 use pyth_solana_receiver_sdk::program::PythSolanaReceiver;
 use serum_dex::state::ToAlignedBytes;
 
-use crate::controller::token::close_vault;
+use crate::controller::token::{close_vault, initialize_token_account};
 use crate::error::ErrorCode;
 use crate::ids::{admin_hot_wallet, amm_spread_adjust_wallet, mm_oracle_crank_wallet};
 use crate::instructions::constraints::*;
@@ -146,15 +146,19 @@ pub fn handle_initialize_spot_market(
     let state = &mut ctx.accounts.state;
     let spot_market_pubkey = ctx.accounts.spot_market.key();
 
-    // protocol must be authority of collateral vault
-    if ctx.accounts.spot_market_vault.owner != state.signer {
-        return Err(ErrorCode::InvalidSpotMarketAuthority.into());
-    }
+    initialize_token_account(
+        &ctx.accounts.token_program,
+        &ctx.accounts.spot_market_vault,
+        &ctx.accounts.drift_signer,
+        &ctx.accounts.spot_market_mint,
+    )?;
 
-    // protocol must be authority of collateral vault
-    if ctx.accounts.insurance_fund_vault.owner != state.signer {
-        return Err(ErrorCode::InvalidInsuranceFundAuthority.into());
-    }
+    initialize_token_account(
+        &ctx.accounts.token_program,
+        &ctx.accounts.insurance_fund_vault,
+        &ctx.accounts.drift_signer,
+        &ctx.accounts.spot_market_mint,
+    )?;
 
     validate_borrow_rate(optimal_utilization, optimal_borrow_rate, max_borrow_rate, 0)?;
 
@@ -280,7 +284,7 @@ pub fn handle_initialize_spot_market(
         historical_oracle_data: historical_oracle_data_default,
         historical_index_data: historical_index_data_default,
         mint: ctx.accounts.spot_market_mint.key(),
-        vault: *ctx.accounts.spot_market_vault.to_account_info().key,
+        vault: ctx.accounts.spot_market_vault.key(),
         revenue_pool: PoolBalance {
             scaled_balance: 0,
             market_index: spot_market_index,
@@ -337,7 +341,7 @@ pub fn handle_initialize_spot_market(
         pool_id: 0,
         padding: [0; 40],
         insurance_fund: InsuranceFund {
-            vault: *ctx.accounts.insurance_fund_vault.to_account_info().key,
+            vault: ctx.accounts.insurance_fund_vault.key(),
             unstaking_period: THIRTEEN_DAY,
             total_factor: if_total_factor,
             user_factor: if_total_factor / 2,
@@ -4945,25 +4949,30 @@ pub struct InitializeSpotMarket<'info> {
         payer = admin
     )]
     pub spot_market: AccountLoader<'info, SpotMarket>,
+    #[account(
+        mint::token_program = token_program,
+    )]
     pub spot_market_mint: Box<InterfaceAccount<'info, Mint>>,
     #[account(
         init,
         seeds = [b"spot_market_vault".as_ref(), state.number_of_spot_markets.to_le_bytes().as_ref()],
         bump,
         payer = admin,
-        token::mint = spot_market_mint,
-        token::authority = drift_signer
+        space = get_vault_len(&spot_market_mint)?,
+        owner = token_program.key()
     )]
-    pub spot_market_vault: Box<InterfaceAccount<'info, TokenAccount>>,
+    /// CHECK: checked in `initialize_spot_market`
+    pub spot_market_vault: AccountInfo<'info>,
     #[account(
         init,
         seeds = [b"insurance_fund_vault".as_ref(), state.number_of_spot_markets.to_le_bytes().as_ref()],
         bump,
         payer = admin,
-        token::mint = spot_market_mint,
-        token::authority = drift_signer
+        space = get_vault_len(&spot_market_mint)?,
+        owner = token_program.key()
     )]
-    pub insurance_fund_vault: Box<InterfaceAccount<'info, TokenAccount>>,
+    /// CHECK: checked in `initialize_spot_market`
+    pub insurance_fund_vault: AccountInfo<'info>,
     #[account(
         constraint = state.signer.eq(&drift_signer.key())
     )]

programs/drift/src/instructions/constraints.rs

@@ -1,7 +1,9 @@
 use anchor_lang::accounts::account::Account;
 use anchor_lang::accounts::account_loader::AccountLoader;
 use anchor_lang::accounts::signer::Signer;
+use anchor_lang::prelude::*;
 use anchor_lang::prelude::{AccountInfo, Pubkey};
+use anchor_spl::token_interface::Mint;
 
 use crate::error::ErrorCode;
 use crate::msg;
@@ -145,3 +147,28 @@ pub fn exchange_not_paused(state: &Account<State>) -> anchor_lang::Result<()> {
     }
     Ok(())
 }
+
+pub fn get_vault_len(mint: &InterfaceAccount<Mint>) -> anchor_lang::Result<usize> {
+    let mint_info = mint.to_account_info();
+    let len = if *mint_info.owner == ::anchor_spl::token_2022::Token2022::id() {
+        use ::anchor_spl::token_2022::spl_token_2022::extension::{
+            BaseStateWithExtensions, ExtensionType, StateWithExtensions,
+        };
+        use ::anchor_spl::token_2022::spl_token_2022::state::{Account, Mint};
+        let mint_data = mint_info.try_borrow_data()?;
+        let mint_state = StateWithExtensions::<Mint>::unpack(&mint_data)?;
+        let mint_extensions = match mint_state.get_extension_types() {
+            Ok(extensions) => extensions,
+            // If we cant deserialize the mint, we use the default token account length
+            // Init token will fail if this size doesnt work, so worst case init account just fails
+            Err(_) => return Ok(::anchor_spl::token::TokenAccount::LEN),
+        };
+        let required_extensions =
+            ExtensionType::get_required_init_account_extensions(&mint_extensions);
+        ExtensionType::try_calculate_account_len::<Account>(&required_extensions)?
+    } else {
+        ::anchor_spl::token::TokenAccount::LEN
+    };
+
+    Ok(len)
+}

programs/drift/src/instructions/keeper.rs

@@ -762,6 +762,10 @@ pub fn place_signed_msg_taker_order<'c: 'info, 'info>(
         return Ok(());
     }
 
+    if let Some(max_margin_ratio) = verified_message_and_signature.max_margin_ratio {
+        taker.update_perp_position_max_margin_ratio(market_index, max_margin_ratio)?;
+    }
+
     // Dont place order if signed msg order already exists
     let mut taker_order_id_to_use = taker.next_order_id;
     let mut signed_msg_order_id =

programs/drift/src/state/events.rs

@@ -737,3 +737,112 @@ pub fn emit_buffers<T: AnchorSerialize + Discriminator>(
 
     Ok(())
 }
+
+#[event]
+#[derive(Default)]
+pub struct LPSettleRecord {
+    pub record_id: u64,
+    // previous settle unix timestamp
+    pub last_ts: i64,
+    // previous settle slot
+    pub last_slot: u64,
+    // current settle unix timestamp
+    pub ts: i64,
+    // current slot
+    pub slot: u64,
+    // amm perp market index
+    pub perp_market_index: u16,
+    // token amount to settle to lp (positive is from amm to lp, negative lp to amm)
+    pub settle_to_lp_amount: i64,
+    // quote pnl of amm since last settle
+    pub perp_amm_pnl_delta: i64,
+    // exchange fees earned by market/amm since last settle
+    pub perp_amm_ex_fee_delta: i64,
+    // current aum of lp
+    pub lp_aum: u128,
+    // current mint price of lp
+    pub lp_price: u128,
+}
+
+#[event]
+#[derive(Default)]
+pub struct LPSwapRecord {
+    pub ts: i64,
+    pub slot: u64,
+    pub authority: Pubkey,
+    /// precision: out market mint precision, gross fees
+    pub out_amount: u128,
+    /// precision: in market mint precision, gross fees
+    pub in_amount: u128,
+    /// precision: fee on amount_out, in market mint precision
+    pub out_fee: i128,
+    /// precision: fee on amount_in, out market mint precision
+    pub in_fee: i128,
+    // out spot market index
+    pub out_spot_market_index: u16,
+    // in spot market index
+    pub in_spot_market_index: u16,
+    // out constituent index
+    pub out_constituent_index: u16,
+    // in constituent index
+    pub in_constituent_index: u16,
+    /// precision: PRICE_PRECISION
+    pub out_oracle_price: i64,
+    /// precision: PRICE_PRECISION
+    pub in_oracle_price: i64,
+    /// LPPool last_aum, QUOTE_PRECISION
+    pub last_aum: u128,
+    pub last_aum_slot: u64,
+    /// PERCENTAGE_PRECISION
+    pub in_market_current_weight: i64,
+    /// PERCENTAGE_PRECISION
+    pub out_market_current_weight: i64,
+    /// PERCENTAGE_PRECISION
+    pub in_market_target_weight: i64,
+    /// PERCENTAGE_PRECISION
+    pub out_market_target_weight: i64,
+    pub in_swap_id: u64,
+    pub out_swap_id: u64,
+}
+
+impl Size for LPSwapRecord {
+    const SIZE: usize = 376;
+}
+
+#[event]
+#[derive(Default)]
+pub struct LPMintRedeemRecord {
+    pub ts: i64,
+    pub slot: u64,
+    pub authority: Pubkey,
+    pub description: u8,
+    /// precision: continutent mint precision, gross fees
+    pub amount: u128,
+    /// precision: fee on amount, constituent market mint precision
+    pub fee: i128,
+    // spot market index
+    pub spot_market_index: u16,
+    // constituent index
+    pub constituent_index: u16,
+    /// precision: PRICE_PRECISION
+    pub oracle_price: i64,
+    /// token mint
+    pub mint: Pubkey,
+    /// lp amount, lp mint precision
+    pub lp_amount: u64,
+    /// lp fee, lp mint precision
+    pub lp_fee: i64,
+    /// 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,
+    pub last_aum_slot: u64,
+    /// PERCENTAGE_PRECISION
+    pub in_market_current_weight: i64,
+    pub in_market_target_weight: i64,
+}
+
+impl Size for LPMintRedeemRecord {
+    const SIZE: usize = 328;
+}

programs/drift/src/state/order_params.rs

@@ -864,6 +864,7 @@ pub struct SignedMsgOrderParamsMessage {
     pub uuid: [u8; 8],
     pub take_profit_order_params: Option<SignedMsgTriggerOrderParams>,
     pub stop_loss_order_params: Option<SignedMsgTriggerOrderParams>,
+    pub max_margin_ratio: Option<u16>,
 }
 
 #[derive(AnchorSerialize, AnchorDeserialize, Clone, Default, Eq, PartialEq, Debug)]
@@ -874,6 +875,7 @@ pub struct SignedMsgOrderParamsDelegateMessage {
     pub uuid: [u8; 8],
     pub take_profit_order_params: Option<SignedMsgTriggerOrderParams>,
     pub stop_loss_order_params: Option<SignedMsgTriggerOrderParams>,
+    pub max_margin_ratio: Option<u16>,
 }
 
 #[derive(AnchorSerialize, AnchorDeserialize, Clone, Default, Eq, PartialEq, Debug)]