Merge branch 'dlp' into devnet

Author: moosecat2

.devcontainer/Dockerfile

@@ -1,70 +1,56 @@
 #
-# Docker image to generate deterministic, verifiable builds of Anchor programs.
-# This must be run *after* a given ANCHOR_CLI version is published and a git tag
-# is released on GitHub.
+# Drift Protocol Dev Container
 #
 
 FROM --platform=linux/amd64 rust:1.70.0
 
 ARG DEBIAN_FRONTEND=noninteractive
-
 ARG SOLANA_CLI="1.16.27"
 ARG ANCHOR_CLI="0.29.0"
-ARG NODE_VERSION="20.19.5"
-
-# Create a non-root user
-ARG USERNAME=vscode
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-RUN groupadd --gid $USER_GID $USERNAME \
-    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME \
-    && apt-get update \
-    && apt-get install -y sudo \
-    && apt-get install -y bash \
-    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
-    && chmod 0440 /etc/sudoers.d/$USERNAME
-
-ENV HOME="/home/$USERNAME"
-ENV PATH="${HOME}/.cargo/bin:${PATH}"
-ENV PATH="${HOME}/.local/share/solana/install/active_release/bin:${PATH}"
-
-# Install base utilities.
-RUN mkdir -p /workdir && mkdir -p /tmp && \
-    apt-get update -qq && apt-get upgrade -qq && apt-get install -qq \
-    build-essential git curl wget jq pkg-config python3-pip \
-    libssl-dev libudev-dev
-
-# libssl1.1 is not needed for newer versions
-
-# Install rust.
-RUN curl "https://sh.rustup.rs" -sfo rustup.sh && \
-    sh rustup.sh -y && \
-    rustup component add rustfmt clippy
-
-# Install node / npm / yarn.
-RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - \
-    && apt-get install -y nodejs \
-    && apt-get install -y npm \
-    && npm install -g yarn ts-mocha typescript mocha
-
-# Install Solana tools (x86_64 version).
-RUN curl -sSfL https://github.com/solana-labs/solana/releases/download/v${SOLANA_CLI}/solana-release-x86_64-unknown-linux-gnu.tar.bz2 | tar -xjC /tmp && \
-    mv /tmp/solana-release/bin/* /usr/local/bin/ && \
-    rm -rf /tmp/solana-release
-
-# Install anchor.
-RUN cargo install --git https://github.com/coral-xyz/anchor --tag v${ANCHOR_CLI} anchor-cli --locked
-
-# Switch to the non-root user for the remaining setup
-USER $USERNAME
-
-RUN solana-keygen new --no-bip39-passphrase
-
-# Set up Solana config for local development
-RUN solana config set --url localhost
-
-# Create necessary directories
-RUN mkdir -p $HOME/.config/solana
-
-WORKDIR /workdir
+ARG NODE_VERSION="20.18.1"
+
+ENV HOME="/root"
+ENV PATH="/usr/local/cargo/bin:${PATH}"
+ENV PATH="/root/.local/share/solana/install/active_release/bin:${PATH}"
+
+RUN mkdir -p /workdir /tmp \
+  && apt-get update -qq \
+  && apt-get upgrade -qq \
+  && apt-get install -y --no-install-recommends \
+       build-essential git curl wget jq pkg-config python3-pip xz-utils ca-certificates \
+       libssl-dev libudev-dev bash software-properties-common \
+  && add-apt-repository 'deb http://deb.debian.org/debian bookworm main' \
+  && apt-get update -qq \
+  && apt-get install -y libc6 libc6-dev \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN rustup component add rustfmt
+
+RUN rustup install 1.78.0 \
+  && rustup component add rustfmt clippy --toolchain 1.78.0
+
+RUN curl -fsSL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" -o /tmp/node.tar.xz \
+  && tar -xJf /tmp/node.tar.xz -C /usr/local --strip-components=1 \
+  && rm /tmp/node.tar.xz \
+  && corepack enable \
+  && npm install -g ts-mocha typescript mocha \
+  && node -v && npm -v && yarn -v
+
+# Solana CLI (x86_64 build)
+RUN curl -sSfL "https://github.com/solana-labs/solana/releases/download/v${SOLANA_CLI}/solana-release-x86_64-unknown-linux-gnu.tar.bz2" \
+  | tar -xjC /tmp \
+  && mv /tmp/solana-release/bin/* /usr/local/bin/ \
+  && rm -rf /tmp/solana-release
+
+# Anchor CLI
+RUN cargo install --git https://github.com/coral-xyz/anchor --tag "v${ANCHOR_CLI}" anchor-cli --locked
+
+# Set up Solana key + config for root
+RUN solana-keygen new --no-bip39-passphrase --force \
+  && solana config set --url localhost
+
+RUN apt-get update && apt-get install -y zsh curl git \
+  && sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended \
+  && chsh -s /usr/bin/zsh root
+
+WORKDIR /workdir

.devcontainer/devcontainer.json

@@ -5,12 +5,12 @@
     "platform": "linux/amd64"
   },
   "workspaceFolder": "/workdir",
-  "remoteUser": "vscode",
+  "remoteUser": "root",
   "mounts": [
     "source=${localWorkspaceFolder},target=/workdir,type=bind,consistency=cached",
     "source=drift-target,target=/workdir/target,type=volume,consistency=delegated"
   ],
-  "postCreateCommand": "sudo chown -R vscode:vscode /workdir/target 2>/dev/null || true && echo 'Dev container ready! You can now run: anchor build, anchor test, cargo build, etc.' && echo 'To run tests: bash test-scripts/run-anchor-tests.sh'",
+  "postCreateCommand": "yarn config set ignore-package-manager true && echo 'Dev container ready! You can now run: anchor build, anchor test, cargo build, etc.'",
   "customizations": {
     "vscode": {
       "extensions": [
@@ -19,13 +19,24 @@
         "tamasfe.even-better-toml"
       ],
       "settings": {
+        "rust-analyzer.cachePriming.numThreads": 1,
         "rust-analyzer.cargo.buildScripts.enable": true,
         "rust-analyzer.procMacro.enable": true,
-        "terminal.integrated.defaultProfile.linux": "bash"
+        "rust-analyzer.checkOnSave": true,
+        "rust-analyzer.check.command": "clippy",
+        "rust-analyzer.server.extraEnv": {
+          "NODE_OPTIONS": "--max-old-space-size=4096",
+          "RUSTUP_TOOLCHAIN": "1.78.0-x86_64-unknown-linux-gnu"
+        },
+        "editor.formatOnSave": true,
+        "git.ignoreLimitWarning": true
       }
     }
   },
-  "forwardPorts": [8899, 8900],
+  "forwardPorts": [
+    8899,
+    8900
+  ],
   "portsAttributes": {
     "8899": {
       "label": "Solana Test Validator",
@@ -37,7 +48,7 @@
     }
   },
   "containerEnv": {
-    "ANCHOR_WALLET": "/home/vscode/.config/solana/id.json",
+    "ANCHOR_WALLET": "/root/.config/solana/id.json",
     "RUST_LOG": "solana_runtime::message_processor::stable_log=debug"
   }
 }

package.json

@@ -94,5 +94,6 @@
 		"chalk-template": "<1.1.1",
 		"supports-hyperlinks": "<4.1.1",
 		"has-ansi": "<6.0.1"
-	}
-}
+	},
+	"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+}

programs/drift/src/instructions/keeper.rs

@@ -3333,6 +3333,7 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
         ctx.accounts.amm_cache.load_zc_mut()?;
     let quote_market = &mut ctx.accounts.quote_market.load_mut()?;
     let mut quote_constituent = ctx.accounts.constituent.load_mut()?;
+    let lp_pool_key = ctx.accounts.lp_pool.key();
     let mut lp_pool = ctx.accounts.lp_pool.load_mut()?;
 
     let remaining_accounts_iter = &mut ctx.remaining_accounts.iter().peekable();
@@ -3486,6 +3487,7 @@ pub fn handle_settle_perp_to_lp_pool<'c: 'info, 'info>(
                 .cast::<i64>()?,
             lp_aum: lp_pool.last_aum,
             lp_price: lp_pool.get_price(lp_pool.token_supply)?,
+            lp_pool: lp_pool_key,
         });
 
         // Calculate new quote owed amount

programs/drift/src/instructions/lp_pool.rs

@@ -223,10 +223,7 @@ pub fn handle_update_lp_pool_aum<'c: 'info, 'info>(
 
     // Set USDC stable weight
     msg!("aum: {}", aum);
-    let total_stable_target_base = aum
-        .cast::<i128>()?
-        .safe_sub(crypto_delta.abs())?
-        .max(0_i128);
+    let total_stable_target_base = aum.cast::<i128>()?.safe_sub(crypto_delta)?;
     constituent_target_base
         .get_mut(lp_pool.quote_consituent_index as u32)
         .target_base = total_stable_target_base.cast::<i64>()?;
@@ -483,6 +480,7 @@ pub fn handle_lp_pool_swap<'c: 'info, 'info>(
         out_market_target_weight: out_target_weight,
         in_swap_id,
         out_swap_id,
+        lp_pool: lp_pool_key,
     })?;
 
     receive(
@@ -848,6 +846,7 @@ pub fn handle_lp_pool_add_liquidity<'c: 'info, 'info>(
             lp_pool.last_aum,
         )?,
         in_market_target_weight: in_target_weight,
+        lp_pool: lp_pool_key,
     })?;
 
     Ok(())
@@ -859,7 +858,6 @@ pub fn handle_view_lp_pool_add_liquidity_fees<'c: 'info, 'info>(
     in_amount: u128,
 ) -> Result<()> {
     let slot = Clock::get()?.slot;
-    let now = Clock::get()?.unix_timestamp;
     let state = &ctx.accounts.state;
     let lp_pool = ctx.accounts.lp_pool.load()?;
 
@@ -1041,7 +1039,7 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
         out_spot_market.get_max_confidence_interval_multiplier()?,
         0,
     )?;
-    let out_oracle = out_oracle.clone();
+    let out_oracle = *out_oracle;
 
     // TODO: check self.aum validity
 
@@ -1230,6 +1228,7 @@ pub fn handle_lp_pool_remove_liquidity<'c: 'info, 'info>(
             lp_pool.last_aum,
         )?,
         in_market_target_weight: out_target_weight,
+        lp_pool: lp_pool_key,
     })?;
 
     Ok(())
@@ -1244,7 +1243,6 @@ pub fn handle_view_lp_pool_remove_liquidity_fees<'c: 'info, 'info>(
     lp_to_burn: u64,
 ) -> Result<()> {
     let slot = Clock::get()?.slot;
-    let now = Clock::get()?.unix_timestamp;
     let state = &ctx.accounts.state;
     let lp_pool = ctx.accounts.lp_pool.load()?;
 
@@ -1371,6 +1369,7 @@ pub fn handle_deposit_to_program_vault<'c: 'info, 'info>(
     let remaining_accounts = &mut ctx.remaining_accounts.iter().peekable();
 
     let mut constituent = ctx.accounts.constituent.load_mut()?;
+    let lp_pool_key = constituent.lp_pool;
 
     if amount == 0 {
         return Err(ErrorCode::InsufficientDeposit.into());
@@ -1478,6 +1477,7 @@ pub fn handle_deposit_to_program_vault<'c: 'info, 'info>(
         last_token_balance: constituent.last_spot_balance_token_amount,
         interest_accrued_token_amount,
         amount_deposit_withdraw: amount,
+        lp_pool: lp_pool_key,
     });
     constituent.last_spot_balance_token_amount = new_token_balance;
     constituent.cumulative_spot_interest_accrued_token_amount = constituent
@@ -1515,7 +1515,7 @@ pub fn handle_withdraw_from_program_vault<'c: 'info, 'info>(
 
     controller::spot_balance::update_spot_market_cumulative_interest(
         &mut spot_market,
-        Some(&oracle_data),
+        Some(oracle_data),
         clock.unix_timestamp,
     )?;
     let token_balance_after_cumulative_interest_update = constituent
@@ -1561,6 +1561,7 @@ pub fn handle_withdraw_from_program_vault<'c: 'info, 'info>(
         last_token_balance: constituent.last_spot_balance_token_amount,
         interest_accrued_token_amount,
         amount_deposit_withdraw: amount,
+        lp_pool: constituent.lp_pool,
     });
     constituent.last_spot_balance_token_amount = new_token_balance;
     constituent.cumulative_spot_interest_accrued_token_amount = constituent

programs/drift/src/math/lp_pool.rs

@@ -10,7 +10,7 @@ pub mod perp_lp_pool_settlement {
         state::{amm_cache::CacheInfo, perp_market::PerpMarket, spot_market::SpotMarket},
         *,
     };
-    use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
+    use anchor_spl::token_interface::{TokenAccount, TokenInterface};
 
     #[derive(Debug, Clone, Copy)]
     pub struct SettlementResult {
@@ -55,7 +55,7 @@ pub mod perp_lp_pool_settlement {
         ctx: &SettlementContext,
         result: &SettlementResult,
     ) -> Result<()> {
-        if result.amount_transferred > ctx.max_settle_quote_amount as u64 {
+        if result.amount_transferred > ctx.max_settle_quote_amount {
             msg!(
                 "Amount to settle exceeds maximum allowed, {} > {}",
                 result.amount_transferred,
@@ -94,7 +94,8 @@ pub mod perp_lp_pool_settlement {
     }
 
     fn calculate_perp_to_lp_settlement(ctx: &SettlementContext) -> Result<SettlementResult> {
-        let amount_to_send = (ctx.quote_owed_from_lp.abs() as u64).min(ctx.max_settle_quote_amount);
+        let amount_to_send =
+            (ctx.quote_owed_from_lp.abs().cast::<u64>()?).min(ctx.max_settle_quote_amount);
 
         if ctx.fee_pool_balance >= amount_to_send as u128 {
             // Fee pool can cover entire amount

programs/drift/src/state/events.rs

@@ -790,6 +790,8 @@ pub struct LPSettleRecord {
     pub lp_aum: u128,
     // current mint price of lp
     pub lp_price: u128,
+    // lp pool pubkey
+    pub lp_pool: Pubkey,
 }
 
 #[event]
@@ -831,10 +833,12 @@ pub struct LPSwapRecord {
     pub out_market_target_weight: i64,
     pub in_swap_id: u64,
     pub out_swap_id: u64,
+    // lp pool pubkey
+    pub lp_pool: Pubkey,
 }
 
 impl Size for LPSwapRecord {
-    const SIZE: usize = 376;
+    const SIZE: usize = 408;
 }
 
 #[event]
@@ -869,10 +873,12 @@ pub struct LPMintRedeemRecord {
     /// PERCENTAGE_PRECISION
     pub in_market_current_weight: i64,
     pub in_market_target_weight: i64,
+    // lp pool pubkey
+    pub lp_pool: Pubkey,
 }
 
 impl Size for LPMintRedeemRecord {
-    const SIZE: usize = 328;
+    const SIZE: usize = 360;
 }
 
 #[event]
@@ -887,8 +893,9 @@ pub struct LPBorrowLendDepositRecord {
     pub last_token_balance: i64,
     pub interest_accrued_token_amount: i64,
     pub amount_deposit_withdraw: u64,
+    pub lp_pool: Pubkey,
 }
 
 impl Size for LPBorrowLendDepositRecord {
-    const SIZE: usize = 72;
+    const SIZE: usize = 104;
 }