dockerfile and dev container working, and anchor build working

Author: moosecat2

.devcontainer/Dockerfile

@@ -1,71 +1,48 @@
 #
-# Docker image to generate deterministic, verifiable builds of Anchor programs.
+# 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.18.1"
 
-# 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 \
-    && 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 xz-utils \
-    libssl-dev libudev-dev
-
-# Install Rust (latest via rustup, ensures toolchain components are present)
-RUN curl -fsSL https://sh.rustup.rs -o /tmp/rustup.sh && \
-    sh /tmp/rustup.sh -y && \
-    rustup component add rustfmt clippy && \
-    rm /tmp/rustup.sh
-
-# Install Node.js (pinned)
-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
-
-RUN node -v && npm -v && yarn -v
-
-# 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
-
-# Generate a default Solana keypair
-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
+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 && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN rustup component add rustfmt clippy
+
+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 vscode
 
 WORKDIR /workdir

.devcontainer/devcontainer.json

@@ -1,16 +1,16 @@
 {
-  "name": "Drift Protocol Development",
+  "name": "Drift Protocol Development (amd64, root)",
   "build": {
     "dockerfile": "Dockerfile",
     "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": "echo 'Dev container ready. Run: anchor build / anchor test / cargo build'",
   "customizations": {
     "vscode": {
       "extensions": [
@@ -27,17 +27,11 @@
   },
   "forwardPorts": [8899, 8900],
   "portsAttributes": {
-    "8899": {
-      "label": "Solana Test Validator",
-      "onAutoForward": "notify"
-    },
-    "8900": {
-      "label": "Solana Test Validator RPC",
-      "onAutoForward": "notify"
-    }
+    "8899": { "label": "Solana Test Validator", "onAutoForward": "notify" },
+    "8900": { "label": "Solana Test Validator RPC", "onAutoForward": "notify" }
   },
   "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"
   }
-}
+}

sdk/src/idl/drift.json

@@ -16245,13 +16245,6 @@
             "option": "publicKey"
           },
           "index": false
-        },
-        {
-          "name": "signer",
-          "type": {
-            "option": "publicKey"
-          },
-          "index": false
         }
       ]
     },