From c473ad60dde4f087bd751d9fa895c8ec45ce7ed0 Mon Sep 17 00:00:00 2001
From: r-near <163825889+r-near@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:31:36 -0800
Subject: [PATCH 1/4] chore: use 1.83.0 for dev, 1.80.0 for building contract

---
 rust-toolchain | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rust-toolchain b/rust-toolchain
index f17e5a8..5947fcf 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,3 +1,4 @@
 [toolchain]
+channel = "1.83.0"
 components = ["clippy", "rustfmt"]
 targets = [ "wasm32-unknown-unknown" ]

From 6395f9f63dd713517866a57a22ea3e9a6264ee5f Mon Sep 17 00:00:00 2001
From: r-near <163825889+r-near@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:32:55 -0800
Subject: [PATCH 2/4] chore: default 1.83.0

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0da8c40..9767b07 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   RUST_BACKTRACE: full
-  MSRV: 1.80.0
+  MSRV: 1.83.0
 
 jobs:
   tests:

From 427a9dc7f13c5915b565675d8cb3386e06ae8a76 Mon Sep 17 00:00:00 2001
From: r-near <163825889+r-near@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:43:38 -0800
Subject: [PATCH 3/4] chore: multiple toolchains

---
 .github/workflows/test.yml | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9767b07..e867ce9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,8 @@ on:
 
 env:
   RUST_BACKTRACE: full
-  MSRV: 1.83.0
+  PRIMARY_RUST_VERSION: 1.83.0
+  MSRV: 1.80.0
 
 jobs:
   tests:
@@ -18,19 +19,38 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
 
-      - name: Install toolchain
+      # Install the primary Rust version first
+      - name: Install primary toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ env.PRIMARY_RUST_VERSION }}
+          override: false  # Don't override - we want multiple versions
+          target: wasm32-unknown-unknown
+
+      # Install the MSRV (Minimum Supported Rust Version)
+      - name: Install MSRV toolchain
         uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ env.MSRV }}
-          override: true
+          override: false  # Don't override - allow local rust-toolchain files to take precedence
           target: wasm32-unknown-unknown
 
       - uses: Swatinem/rust-cache@v1
         with:
-          key: rust-version-${{ env.MSRV }}-msrv-2
+          key: rust-multi-version-${{ env.PRIMARY_RUST_VERSION }}-${{ env.MSRV }}
+
+      - name: add wasm32-unknown-unknown for both toolchains
+        run: |
+          rustup target add wasm32-unknown-unknown --toolchain ${{ env.PRIMARY_RUST_VERSION }}
+          rustup target add wasm32-unknown-unknown --toolchain ${{ env.MSRV }}
 
-      - name: add wasm32-unknown-unknown
-        run: rustup target add wasm32-unknown-unknown
+      # Set the primary toolchain as default but allow local rust-toolchain files to override
+      - name: Set default toolchain
+        run: rustup default ${{ env.PRIMARY_RUST_VERSION }}
+
+      # List installed toolchains for debugging purposes
+      - name: Show installed toolchains
+        run: rustup toolchain list
 
       - name: cargo test
         run: cargo test --all --all-features
@@ -45,16 +65,16 @@ jobs:
       - name: Install toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ env.MSRV }}
+          toolchain: ${{ env.PRIMARY_RUST_VERSION }}
           override: true
           components: rustfmt, clippy
 
       - uses: Swatinem/rust-cache@v1
         with:
-          key: rust-version-${{ env.MSRV }}-msrv-2
+          key: rust-version-${{ env.PRIMARY_RUST_VERSION }}-fmt-clippy
 
       - name: cargo fmt
         run: cargo fmt --all -- --check
 
       - name: cargo clippy
-        run: cargo clippy --all --all-features --all-targets -- -D warnings
+        run: cargo clippy --all --all-features --all-targets -- -D warnings
\ No newline at end of file

From 284502ec66556cdf8aabd14dca29b68f5df6ef6a Mon Sep 17 00:00:00 2001
From: r-near <163825889+r-near@users.noreply.github.com>
Date: Mon, 24 Feb 2025 16:37:34 -0800
Subject: [PATCH 4/4] chore: don't commit channel?

---
 rust-toolchain | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rust-toolchain b/rust-toolchain
index 5947fcf..f17e5a8 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,4 +1,3 @@
 [toolchain]
-channel = "1.83.0"
 components = ["clippy", "rustfmt"]
 targets = [ "wasm32-unknown-unknown" ]