Merge branch 'dlp' into devnet

Author: wphan

.devcontainer/Dockerfile

@@ -4,51 +4,67 @@
 # is released on GitHub.
 #
 
-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.19.5"
 
-ENV HOME="/root"
+# 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}"
-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
+# 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 -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)"
+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 avm --locked --force
-RUN avm install ${ANCHOR_CLI} && avm use ${ANCHOR_CLI}
+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
 
-WORKDIR /workdir
-#be sure to add `/root/.avm/bin` to your PATH to be able to run the installed binaries
+# Set up Solana config for local development
+RUN solana config set --url localhost
+
+# Create necessary directories
+RUN mkdir -p $HOME/.config/solana
+
+WORKDIR /workdir

.devcontainer/devcontainer.json

@@ -1,3 +1,43 @@
 {
-    "build": { "dockerfile": "Dockerfile" },
-  }
+  "name": "Drift Protocol Development",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "platform": "linux/amd64"
+  },
+  "workspaceFolder": "/workdir",
+  "remoteUser": "vscode",
+  "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'",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "rust-lang.rust-analyzer",
+        "ms-vscode.vscode-json",
+        "tamasfe.even-better-toml"
+      ],
+      "settings": {
+        "rust-analyzer.cargo.buildScripts.enable": true,
+        "rust-analyzer.procMacro.enable": true,
+        "terminal.integrated.defaultProfile.linux": "bash"
+      }
+    }
+  },
+  "forwardPorts": [8899, 8900],
+  "portsAttributes": {
+    "8899": {
+      "label": "Solana Test Validator",
+      "onAutoForward": "notify"
+    },
+    "8900": {
+      "label": "Solana Test Validator RPC",
+      "onAutoForward": "notify"
+    }
+  },
+  "containerEnv": {
+    "ANCHOR_WALLET": "/home/vscode/.config/solana/id.json",
+    "RUST_LOG": "solana_runtime::message_processor::stable_log=debug"
+  }
+}

README.md

@@ -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)

programs/drift/src/instructions/admin.rs

@@ -162,6 +162,16 @@ pub fn handle_initialize_spot_market(
         )?;
     }
 
+    let is_token_2022 = *ctx.accounts.spot_market_mint.to_account_info().owner == Token2022::id();
+    if is_token_2022 {
+        initialize_immutable_owner(&ctx.accounts.token_program, &ctx.accounts.spot_market_vault)?;
+
+        initialize_immutable_owner(
+            &ctx.accounts.token_program,
+            &ctx.accounts.insurance_fund_vault,
+        )?;
+    }
+
     initialize_token_account(
         &ctx.accounts.token_program,
         &ctx.accounts.spot_market_vault,

programs/drift/src/state/lp_pool.rs

@@ -270,11 +270,11 @@ impl LPPool {
             .price
             .cast::<u128>()?
             .safe_mul(in_amount_less_fees)?;
-        let lp_amount = if self.last_aum == 0 {
+        let lp_amount = if dlp_total_supply == 0 {
             token_amount_usd.safe_div(token_precision_denominator)?
         } else {
             token_amount_usd
-                .safe_mul(dlp_total_supply.max(1) as u128)?
+                .safe_mul(dlp_total_supply as u128)?
                 .safe_div(self.last_aum)?
                 .safe_div(token_precision_denominator)?
         };

sdk/src/constituentMap/constituentMap.ts

@@ -15,9 +15,9 @@ import { ZSTDDecoder } from 'zstddec';
 import { encodeName } from '../userName';
 import { getLpPoolPublicKey } from '../addresses/pda';
 
-const MAX_CONSTITUENT_SIZE_BYTES = 304; // TODO: update this when account is finalized
+const MAX_CONSTITUENT_SIZE_BYTES = 320; // TODO: update this when account is finalized
 
-const LP_POOL_NAME = 'test lp pool 2';
+const LP_POOL_NAME = 'test lp pool 3';
 
 export type ConstituentMapConfig = {
 	driftClient: DriftClient;