LayerZero-Labs · nazreen · Sep 4, 2025 · Sep 30, 2025 · Sep 30, 2025 · Sep 30, 2025
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "LayerZero Devtools",
-  "image": "ghcr.io/layerzero-labs/devtools-dev-base:shankar-ci-upgrade",
+  "image": "ghcr.io/layerzero-labs/devtools-dev-base:solana-examples-update-anchor-version-try-diff-toolchain-version",
   "mounts": ["type=volume,target=${containerWorkspaceFolder}/node_modules"],
   "runArgs": ["--env-file", ".env"],
   "features": {

diff --git a/.github/workflows/reusable-publish.yaml b/.github/workflows/reusable-publish.yaml
@@ -31,7 +31,7 @@ jobs:
 
     # We'll run the job on the prebuilt base image
     container:
-      image: ghcr.io/layerzero-labs/devtools-dev-base:shankar-ci-upgrade
+      image: ghcr.io/layerzero-labs/devtools-dev-base:solana-examples-update-anchor-version-try-diff-toolchain-version
 
     steps:
       - name: Checkout repo

diff --git a/.github/workflows/reusable-test.yaml b/.github/workflows/reusable-test.yaml
@@ -38,7 +38,7 @@ jobs:
 
     # We'll run the job on the prebuilt base image
     container:
-      image: ghcr.io/layerzero-labs/devtools-dev-base:shankar-ci-upgrade
+      image: ghcr.io/layerzero-labs/devtools-dev-base:solana-examples-update-anchor-version-try-diff-toolchain-version
 
     steps:
       - name: Checkout repo
@@ -107,11 +107,11 @@ jobs:
           JEST_TIMEOUT: 60_000  # Increase timeout for ARM builds
           TEST_TIMEOUT: 600_000 # 10 minutes timeout for long-running tests
           # We'll use the prebuilt base image
-          DEVTOOLS_BASE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-base:shankar-ci-upgrade
+          DEVTOOLS_BASE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-base:solana-examples-update-anchor-version-try-diff-toolchain-version
           # And the prebuilt hardhat EVM node image
-          DEVTOOLS_EVM_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-evm-hardhat:shankar-ci-upgrade
+          DEVTOOLS_EVM_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-evm-hardhat:solana-examples-update-anchor-version-try-diff-toolchain-version
           # And the prebuilt TON node image
-          DEVTOOLS_TON_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-ton-my-local-ton:shankar-ci-upgrade
+          DEVTOOLS_TON_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-ton-my-local-ton:solana-examples-update-anchor-version-try-diff-toolchain-version
           # Provided we have good quality Solana RPCs, we can enable Solana tests
           #
           # FIXME The Solana tests need to be ported to either use a stable deployment
@@ -175,17 +175,17 @@ jobs:
           LAYERZERO_EXAMPLES_REPOSITORY_URL: https://github.com/${{ github.repository }}.git
           LAYERZERO_EXAMPLES_REPOSITORY_REF: ${{ github.ref }}
           # We'll use the prebuilt base image
-          DEVTOOLS_BASE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-base:shankar-ci-upgrade
+          DEVTOOLS_BASE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-base:solana-examples-update-anchor-version-try-diff-toolchain-version
           # And the prebuilt hardhat EVM node image
-          DEVTOOLS_EVM_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-evm-hardhat:shankar-ci-upgrade
+          DEVTOOLS_EVM_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-evm-hardhat:solana-examples-update-anchor-version-try-diff-toolchain-version
           # Using the local Aptos testnet node
-          DEVTOOLS_APTOS_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-aptos-local-testnet:shankar-ci-upgrade
+          DEVTOOLS_APTOS_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-aptos-local-testnet:solana-examples-update-anchor-version-try-diff-toolchain-version
           # Using the local TON node - i do not know if this is working
-          DEVTOOLS_TON_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-ton-my-local-ton:shankar-ci-upgrade
+          DEVTOOLS_TON_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-ton-my-local-ton:solana-examples-update-anchor-version-try-diff-toolchain-version
           # Using the local Initia node
-          DEVTOOLS_INITIA_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-initia-localnet:shankar-ci-upgrade
+          DEVTOOLS_INITIA_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-initia-localnet:solana-examples-update-anchor-version-try-diff-toolchain-version
           # Using the local Solana test validator - may fail due to RPC issues
-          DEVTOOLS_SOLANA_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-solana-test-validator:shankar-ci-upgrade
+          DEVTOOLS_SOLANA_NODE_IMAGE: ghcr.io/layerzero-labs/devtools-dev-node-solana-test-validator:solana-examples-update-anchor-version-try-diff-toolchain-version
 
 
       # We'll collect the docker compose logs from all containers on failure

diff --git a/Dockerfile b/Dockerfile
@@ -112,7 +112,14 @@ RUN apt-get install --yes \
 ARG RUST_TOOLCHAIN_VERSION=1.84.1
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
     | sh -s -- -y --profile minimal --default-toolchain ${RUST_TOOLCHAIN_VERSION}
+# Ensure stable is installed and available
 RUN rustup toolchain install 1.84.1
+# Pre-install nightly toolchains used by Anchor IDL builds
+# Install both a pinned nightly and the moving 'nightly' channel with required components
+ARG RUST_NIGHTLY_VERSION=nightly-2025-05-01
+RUN rustup toolchain install ${RUST_NIGHTLY_VERSION} && \
+    rustup component add --toolchain ${RUST_NIGHTLY_VERSION} cargo rustfmt clippy
+ENV RUSTUP_TOOLCHAIN=${RUST_NIGHTLY_VERSION}
 RUN rustc --version
 
 ### Setup go

diff --git a/examples/lzapp-migration/README.md b/examples/lzapp-migration/README.md
@@ -16,7 +16,7 @@
 
 ## Requirements
 
-- Rust `nightly-2025-05-01`
+- Rust `1.84.1`
 - Anchor `0.31.1`
 - Solana CLI `2.2.20`
 - Docker `28.3.0`

diff --git a/examples/lzapp-migration/pnpm-lock.yaml b/examples/lzapp-migration/pnpm-lock.yaml
diff --git a/examples/oapp-solana/README.md b/examples/oapp-solana/README.md
@@ -25,7 +25,7 @@ For a more thorough walkthrough of how a Solana OApp works, refer to [Solana OAp
 
 ## Requirements
 
-- Rust `nightly-2025-05-01`
+- Rust `1.84.1`
 - Anchor `v0.31.1`
 - Solana CLI `v2.2.20`
 - Docker

diff --git a/examples/oapp-solana/pnpm-lock.yaml b/examples/oapp-solana/pnpm-lock.yaml
diff --git a/examples/oapp-solana/rust-toolchain.toml b/examples/oapp-solana/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2025-05-01"
+channel = "1.84.1"
diff --git a/examples/oft-solana/README.md b/examples/oft-solana/README.md
@@ -44,7 +44,7 @@
 
 ## Requirements
 
-- Rust `nightly-2025-05-01`
+- Rust `1.84.1`
 - Anchor `0.31.1`
 - Solana CLI `2.2.20`
 - Docker `28.3.0`

diff --git a/examples/oft-solana/pnpm-lock.yaml b/examples/oft-solana/pnpm-lock.yaml
diff --git a/examples/oft-solana/rust-toolchain.toml b/examples/oft-solana/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2025-05-01"
+channel = "1.84.1"
 components = ["rustfmt", "clippy"]