Merge branch 'master' into crispheaney/isolated-position

Author: crispheaney

.devcontainer/Dockerfile

@@ -1,54 +1,49 @@
 #
-# 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 rust:1.75
+FROM --platform=linux/amd64 rust:1.70.0
 
 ARG DEBIAN_FRONTEND=noninteractive
-
-ARG SOLANA_CLI="1.14.7"
-ARG ANCHOR_CLI="0.26.0"
-ARG NODE_VERSION="v18.16.0"
+ARG SOLANA_CLI="1.16.27"
+ARG ANCHOR_CLI="0.29.0"
+ARG NODE_VERSION="20.18.1"
 
 ENV HOME="/root"
-ENV PATH="${HOME}/.cargo/bin:${PATH}"
-ENV PATH="${HOME}/.local/share/solana/install/active_release/bin:${PATH}"
-ENV PATH="${HOME}/.nvm/versions/node/${NODE_VERSION}/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
-
-RUN wget http://nz2.archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb
-RUN dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
-
-# 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 -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
-ENV NVM_DIR="${HOME}/.nvm"
-RUN . $NVM_DIR/nvm.sh && \
-    nvm install ${NODE_VERSION} && \
-    nvm use ${NODE_VERSION} && \
-    nvm alias default node && \
-    npm install -g yarn && \
-    yarn add ts-mocha
-
-# Install Solana tools.
-RUN sh -c "$(curl -sSfL https://release.solana.com/v${SOLANA_CLI}/install)"
-
-# Install anchor.
-RUN cargo install --git https://github.com/coral-xyz/anchor avm --locked --force
-RUN avm install ${ANCHOR_CLI} && avm use ${ANCHOR_CLI}
-
-RUN solana-keygen new --no-bip39-passphrase
+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 && \
+    rm -rf /var/lib/apt/lists/*
+
+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
-#be sure to add `/root/.avm/bin` to your PATH to be able to run the installed binaries

.devcontainer/devcontainer.json

@@ -1,3 +1,54 @@
 {
-    "build": { "dockerfile": "Dockerfile" },
-  }
+  "name": "Drift Protocol Development",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "platform": "linux/amd64"
+  },
+  "workspaceFolder": "/workdir",
+  "remoteUser": "root",
+  "mounts": [
+    "source=${localWorkspaceFolder},target=/workdir,type=bind,consistency=cached",
+    "source=drift-target,target=/workdir/target,type=volume,consistency=delegated"
+  ],
+  "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": [
+        "rust-lang.rust-analyzer",
+        "ms-vscode.vscode-json",
+        "tamasfe.even-better-toml"
+      ],
+      "settings": {
+        "rust-analyzer.cachePriming.numThreads": 1,
+        "rust-analyzer.cargo.buildScripts.enable": true,
+        "rust-analyzer.procMacro.enable": true,
+        "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
+  ],
+  "portsAttributes": {
+    "8899": {
+      "label": "Solana Test Validator",
+      "onAutoForward": "notify"
+    },
+    "8900": {
+      "label": "Solana Test Validator RPC",
+      "onAutoForward": "notify"
+    }
+  },
+  "containerEnv": {
+    "ANCHOR_WALLET": "/root/.config/solana/id.json",
+    "RUST_LOG": "solana_runtime::message_processor::stable_log=debug"
+  }
+}

.github/workflows/main.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [master]
   pull_request:
-    branches: [master]
+    branches: [master, devnet]
 
 defaults:
   run:

CHANGELOG.md

@@ -9,7 +9,74 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+### Fixes
+
+### Breaking
+
+## [2.143.0] - 2025-10-22
+
+- program: relax filling conditions for low risk orders vs amm ([#1968](https://github.com/drift-labs/protocol-v2/pull/1968))
+- sdk: make oracle validity match program and propogate to dlob and math functions ([#1968](https://github.com/drift-labs/protocol-v2/pull/1968))
+
+### Features
+
+- program: make imf smoother between hlm and non hlm users ([#1969](https://github.com/drift-labs/protocol-v2/pull/1969))
+
+### Fixes
+
+### Breaking
+
+## [2.142.0] - 2025-10-14
+
+### Features
+
+- program: add titan to whitelisted swap programs ([#1952](https://github.com/drift-labs/protocol-v2/pull/1952))
+- program: allow hot wallet to increase max spread and pause funding ([#1957](https://github.com/drift-labs/protocol-v2/pull/1957))
+
+### Fixes
+
+### Breaking
+
+## [2.141.0] - 2025-10-03
+
+### Features
+
+- program: disallow builder to be escrow authority ([#1930](https://github.com/drift-labs/protocol-v2/pull/1930))
+- dont panic on settle-pnl when no position ([#1928](https://github.com/drift-labs/protocol-v2/pull/1928))
+
+### Fixes
+
+### Breaking
+
+## [2.140.0] - 2025-09-29
+
+### Features
+
+- program: builder codes ([#1805](https://github.com/drift-labs/protocol-v2/pull/1805))
+
+### Fixes
+
+### Breaking
+
+## [2.139.0] - 2025-09-25
+
+### Features
+
+- program: all token 22 use immutable owner ([#1904](https://github.com/drift-labs/protocol-v2/pull/1904))
+- program: allow resolve perp pnl deficit if pnl pool isnt 0 but at deficit ([#1909](https://github.com/drift-labs/protocol-v2/pull/1909))
+- program: auction order params account for twap divergence ([#1882](https://github.com/drift-labs/protocol-v2/pull/1882))
+- program: add delegate stake if ([#1859](https://github.com/drift-labs/protocol-v2/pull/1859))
+
+### Fixes
+
+### Breaking
+
+## [2.138.0] - 2025-09-22
+
+### Features
+
 - program: support scaled ui extension ([#1894](https://github.com/drift-labs/protocol-v2/pull/1894))
+- Revert "Crispeaney/revert swift max margin ratio ([#1877](https://github.com/drift-labs/protocol-v2/pull/1877))
 
 ### Fixes
 

Cargo.lock

@@ -55,6 +55,48 @@ cargo test
 bash test-scripts/run-anchor-tests.sh
 ```
 
+# Development (with devcontainer)
+
+We've provided a devcontainer `Dockerfile` to help you spin up a dev environment with the correct versions of Rust, Solana, and Anchor for program development.
+
+Build the container and tag it `drift-dev`:
+```
+cd .devcontainer && docker build -t drift-dev .
+```
+
+Open a shell to the container:
+```
+# Find the container ID first
+docker ps
+
+# Then exec into it
+docker exec -it <CONTAINER_ID> /bin/bash
+```
+
+Alternatively use an extension provided by your IDE to make use of the dev container. For example on vscode/cursor:
+
+```
+1. Press Ctrl+Shift+P (or Cmd+Shift+P on Mac)
+2. Type "Dev Containers: Reopen in Container"
+3. Select it and wait for the container to build
+4. The IDE terminal should be targeting the dev container now
+```
+
+Use the dev container as you would a local build environment:
+```
+# build program
+anchor build
+
+# update idl
+anchor build -- --features anchor-test && cp target/idl/drift.json sdk/src/idl/drift.json
+
+# run cargo tests
+cargo test
+
+# run typescript tests
+bash test-scripts/run-anchor-tests.sh
+```
+
 # Bug Bounty
 
 Information about the Bug Bounty can be found [here](./bug-bounty/README.md)

README.md

@@ -50,7 +50,7 @@
 		"prettify:fix": "prettier --write './sdk/src/**/*.ts' './tests/**.ts' './cli/**.ts'",
 		"lint": "eslint . --ext ts --quiet --format unix",
 		"lint:fix": "eslint . --ext ts --fix",
-		"update-idl": "cp target/idl/drift.json sdk/src/idl/drift.json"
+		"update-idl": "anchor build -- --features anchor-test && cp target/idl/drift.json sdk/src/idl/drift.json"
 	},
 	"engines": {
 		"node": ">=12"

package.json

@@ -1,6 +1,6 @@
 [package]
 name = "drift"
-version = "2.137.0"
+version = "2.143.0"
 description = "Created with Anchor"
 edition = "2018"
 

programs/drift/Cargo.toml

@@ -11,7 +11,7 @@ use crate::controller::spot_balance::{
 };
 use crate::error::{DriftResult, ErrorCode};
 use crate::get_then_update_id;
-use crate::math::amm::calculate_quote_asset_amount_swapped;
+use crate::math::amm::{calculate_net_user_pnl, calculate_quote_asset_amount_swapped};
 use crate::math::amm_spread::{calculate_spread_reserves, get_spread_reserves};
 use crate::math::casting::Cast;
 use crate::math::constants::{
@@ -185,20 +185,33 @@ pub fn update_spreads(
     let max_ref_offset = market.amm.get_max_reference_price_offset()?;
 
     let reference_price_offset = if max_ref_offset > 0 {
-        let liquidity_ratio = amm_spread::calculate_inventory_liquidity_ratio(
-            market.amm.base_asset_amount_with_amm,
-            market.amm.base_asset_reserve,
-            market.amm.min_base_asset_reserve,
-            market.amm.max_base_asset_reserve,
-        )?;
+        let liquidity_ratio =
+            amm_spread::calculate_inventory_liquidity_ratio_for_reference_price_offset(
+                market.amm.base_asset_amount_with_amm,
+                market.amm.base_asset_reserve,
+                market.amm.min_base_asset_reserve,
+                market.amm.max_base_asset_reserve,
+            )?;
 
         let signed_liquidity_ratio =
             liquidity_ratio.safe_mul(market.amm.get_protocol_owned_position()?.signum().cast()?)?;
 
+        let deadband_pct = market.amm.get_reference_price_offset_deadband_pct()?;
+        let liquidity_fraction_after_deadband =
+            if signed_liquidity_ratio.unsigned_abs() <= deadband_pct {
+                0
+            } else {
+                signed_liquidity_ratio.safe_sub(
+                    deadband_pct
+                        .cast::<i128>()?
+                        .safe_mul(signed_liquidity_ratio.signum())?,
+                )?
+            };
+
         amm_spread::calculate_reference_price_offset(
             reserve_price,
             market.amm.last_24h_avg_funding_rate,
-            signed_liquidity_ratio,
+            liquidity_fraction_after_deadband,
             market.amm.min_order_size,
             market
                 .amm
@@ -966,7 +979,7 @@ pub fn calculate_perp_market_amm_summary_stats(
         .safe_add(fee_pool_token_amount)?
         .cast()?;
 
-    let net_user_pnl = amm::calculate_net_user_pnl(&perp_market.amm, perp_market_oracle_price)?;
+    let net_user_pnl = calculate_net_user_pnl(&perp_market.amm, perp_market_oracle_price)?;
 
     // amm's mm_fee can be incorrect with drifting integer math error
     let mut new_total_fee_minus_distributions = pnl_tokens_available.safe_sub(net_user_pnl)?;