solana native and steel bump to v2.0

.github/.ghaignore

@@ -38,3 +38,30 @@ tokens/token-2022/metadata/anchor
 
 # dependency issues
 tokens/token-2022/nft-meta-data-pointer/anchor-example/anchor
+
+tokens/token-2022/mint-close-authority/native
+tokens/token-2022/transfer-fee/native
+tokens/token-2022/non-transferable/native
+
+# all steel projects
+
+basics/account-data/steel
+basics/checking-accounts/steel
+basics/close-account/steel
+basics/counter/steel
+basics/create-account/steel
+basics/cross-program-invocation/steel
+basics/favorites/steel
+basics/pda-rent-payer/steel
+basics/processing-instructions/steel
+basics/program-derived-addresses/steel
+basics/realloc/steel
+basics/rent/steel
+basics/transfer-sol/steel
+
+tokens/escrow/steel
+
+tokens/pda-mint-authority/steel
+tokens/spl-token-minter/steel
+tokens/token-swap/steel
+tokens/transfer-tokens/steel

.github/workflows/solana-native.yml

@@ -106,7 +106,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 'lts/*'
           check-latest: true
       - name: Setup build environment
         id: setup
@@ -179,8 +179,8 @@ jobs:
 
           # Install pnpm
           npm install --global pnpm
-      - name: Setup Solana stable
-        uses: heyAyushh/setup-solana@v5.5
+      - name: Setup Solana Stable
+        uses: heyAyushh/setup-solana@v2.02
         with:
           solana-cli-version: stable
       - name: Build and Test with Stable
@@ -189,16 +189,17 @@ jobs:
           solana -V
           rustc -V
           process_projects "stable"
-      - name: Setup Solana 1.18.17
-        uses: heyAyushh/setup-solana@v5.5
+      - name: Setup Solana Beta
+        uses: heyAyushh/setup-solana@v2.02
         with:
-          solana-cli-version: 1.18.17
-      - name: Build and Test with 1.18.17
+          solana-cli-version: beta
+      - name: Build and Test with Beta
+        continue-on-error: true
         run: |
           source build_and_test.sh
           solana -V
           rustc -V
-          process_projects "1.18.17"
+          process_projects "beta"
 
       - name: Set failed projects output
         id: set-failed

.github/workflows/steel.yml

@@ -27,6 +27,9 @@ jobs:
       matrix: ${{ steps.matrix.outputs.matrix }}
     steps:
       - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
       - uses: dorny/paths-filter@v3
         id: changes
         if: github.event_name == 'pull_request'
@@ -37,6 +40,23 @@ jobs:
               - added|modified: '**/steel/**'
             workflow:
               - added|modified: '.github/workflows/steel.yml'
+
+      - name: Run fmt and clippy
+        run: |
+          readarray -t all_projects < <(echo '${{ needs.changes.outputs.changed_projects }}' | jq -r '.[]?')
+          for project in "${all_projects[@]}"; do
+            echo "::group::Checking ${project}"
+            if [ ! -f "${project}/Cargo.toml" ]; then
+              echo "::error::No Cargo.toml found in ${project}"
+              exit 1
+            fi
+            cd "${project}"
+            cargo fmt --check
+            cargo clippy --all-features -- -D warnings
+            cd - > /dev/null
+            echo "::endgroup::"
+          done
+
       - name: Analyze Changes
         id: analyze
         run: |
@@ -97,17 +117,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          components: rustfmt, clippy
-      - name: Run sccache-cache
-        if: github.event_name != 'release'
-        uses: mozilla-actions/[email protected]
-      - name: Set Rust cache env vars
-        if: github.event_name != 'release'
-        run: |
-          echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
-          echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
       - name: Run fmt and clippy
         run: |
           readarray -t all_projects < <(echo '${{ needs.changes.outputs.changed_projects }}' | jq -r '.[]?')
@@ -137,23 +146,20 @@ jobs:
       failed_projects: ${{ steps.set-failed.outputs.failed_projects }}
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - name: Run sccache-cache
-        if: github.event_name != 'release'
-        uses: mozilla-actions/[email protected]
-      - name: Set Rust cache env vars
-        if: github.event_name != 'release'
-        run: |
-          echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
-          echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
-      - uses: actions/cache@v3
+      - uses: dorny/paths-filter@v3
+        id: changes
+        if: github.event_name == 'pull_request'
         with:
-          path: ~/.cargo/bin/steel
-          key: ${{ runner.os }}-steel-cli
+          list-files: shell
+          filters: |
+            native:
+              - added|modified: '**/native/**'
+            workflow:
+              - added|modified: '.github/workflows/solana-native.yml'
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 'lts/*'
           check-latest: true
       - name: Setup build environment
         id: setup
@@ -168,8 +174,9 @@ jobs:
             echo "Building and Testing $project with Solana $solana_version"
             cd "$project" || return 1
 
-            # Install dependencies
+            # Check if this is a pnpm project or Steel CLI project
             if [ -f "package.json" ]; then
+              # Use pnpm for projects with package.json
               if ! pnpm install --frozen-lockfile; then
                 echo "::error::pnpm install failed for $project"
                 echo "$project: pnpm install failed with $solana_version" >> $GITHUB_WORKSPACE/failed_projects.txt
@@ -186,20 +193,14 @@ jobs:
               fi
 
               # Test
-              if ! pnpm build-and-test; then
+              if ! pnpm test; then
                 echo "::error::tests failed for $project"
                 echo "$project: tests failed with $solana_version" >> $GITHUB_WORKSPACE/failed_projects.txt
                 cd - > /dev/null
                 return 1
               fi
             else
-              # Use Steel CLI
-              if ! cargo install --quiet steel-cli; then
-                echo "::error::steel-cli installation failed for $project"
-                echo "$project: steel-cli installation failed with $solana_version" >> $GITHUB_WORKSPACE/failed_projects.txt
-                cd - > /dev/null
-                return 1
-              fi
+              # Use Steel CLI for pure Steel projects
 
               # Build
               if ! steel build; then
@@ -252,36 +253,30 @@ jobs:
           # Make the script executable
           chmod +x build_and_test.sh
 
-      - name: Setup Solana stable
-        uses: heyAyushh/setup-solana@v5.5
+      - name: Setup Solana Stable
+        uses: heyAyushh/setup-solana@v2.02
         with:
           solana-cli-version: stable
       - name: Build and Test with Stable
-        env:
-          SCCACHE_GHA_ENABLED: "true"
-          RUSTC_WRAPPER: "sccache"
         run: |
           source build_and_test.sh
           solana -V
           rustc -V
-          solana-keygen new --no-bip39-passphrase
+          solana-keygen new --no-bip39-passphrase --force
+          cargo install --quiet steel-cli
           process_projects "stable"
-          sccache --show-stats
-      - name: Setup Solana 1.18.17
-        uses: heyAyushh/[email protected]
+      - name: Setup Solana Beta
+        uses: heyAyushh/[email protected]
         with:
-          solana-cli-version: 1.18.17
-      - name: Build and Test with 1.18.17
-        env:
-          SCCACHE_GHA_ENABLED: "true"
-          RUSTC_WRAPPER: "sccache"
+          solana-cli-version: beta
+      - name: Build and Test with Beta
         run: |
           source build_and_test.sh
           solana -V
           rustc -V
           solana-keygen new --no-bip39-passphrase --force
-          process_projects "1.18.17"
-          sccache --show-stats
+          cargo install --quiet steel-cli
+          process_projects "beta"
 
       - name: Set failed projects output
         id: set-failed

README.md

@@ -2,6 +2,8 @@
 
 ## Onchain program examples for :anchor: Anchor :crab: Native Rust, [TS] TypeScript  and :snake: Python
 
+[![Native](https://github.com/solana-developers/program-examples/actions/workflows/solana-native.yml/badge.svg?event=schedule)](https://github.com/solana-developers/program-examples/actions/workflows/solana-native.yml) [![Anchor](https://github.com/solana-developers/program-examples/actions/workflows/anchor.yml/badge.svg?event=schedule)](https://github.com/solana-developers/program-examples/actions/workflows/anchor.yml)
+
 This repo contains Solana onchain programs (referred to as 'Smart Contracts' in other blockchains).
 
 > [!NOTE]

basics/account-data/native/program/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-solana-program = "=1.18.17"
+solana-program = "2.0"
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
 

basics/account-data/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 account-data-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "1.3"
-thiserror = "1.0"
+solana-program = "2.1"
+steel = "3.0"
+thiserror = "1.0"

basics/checking-accounts/native/program/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/checking-accounts/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 steel-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "1.3"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/close-account/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/close-account/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 close-account-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.1.0"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/counter/mpl-stack/Cargo.toml

@@ -14,4 +14,4 @@ default = []
 [dependencies]
 borsh = "0.9"
 shank = "0.0.8"
-solana-program = "=1.18.17"
+solana-program = "2.1"

basics/counter/native/program/Cargo.toml

@@ -13,4 +13,4 @@ default = []
 
 [dependencies]
 borsh = "0.9.3"
-solana-program = "=1.18.17"
+solana-program = "2.0"

basics/counter/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 counter-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.1.0"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/create-account/native/program/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/create-account/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 create-account-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.0"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/cross-program-invocation/native/programs/hand/Cargo.toml

@@ -10,7 +10,7 @@ cpi = ["no-entrypoint"]
 [dependencies]
 borsh = "0.10"
 borsh-derive = "0.10"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 cross-program-invocatio-native-lever = { path = "../lever", features = ["cpi"] }
 
 [lib]

basics/cross-program-invocation/native/programs/lever/Cargo.toml

@@ -10,7 +10,7 @@ cpi = ["no-entrypoint"]
 [dependencies]
 borsh = "0.10"
 borsh-derive = "0.10"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/cross-program-invocation/steel/hand/Cargo.toml

@@ -20,6 +20,6 @@ lever-program = { path = "../lever/program", version = "0.1.0", features = [
 ] }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.0"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/cross-program-invocation/steel/lever/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 lever-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.0"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/favorites/native/program/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 borsh = "0.9.3"
-solana-program = "2.0.14"
+solana-program = "2.0"
 borsh-derive = "0.9.1"
 
 [lib]

basics/favorites/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 steel-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "1.3"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/hello-solana/native/program/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/hello-solana/steel/Cargo.toml

@@ -13,9 +13,10 @@ readme = "./README.md"
 keywords = ["solana"]
 
 [workspace.dependencies]
+hello-solana-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "=2.0.13"
-steel = "=2.1.1"
+solana-program = "2.1"
+steel = "2.0"
 thiserror = "1.0"
 solana-sdk = "1.18"

basics/pda-rent-payer/native/program/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-solana-program = "=1.18.17"
+solana-program = "2.0"
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
 

basics/pda-rent-payer/steel/Cargo.toml

@@ -17,6 +17,6 @@ pda-rent-payer-api = { path = "./api", version = "0.1.0" }
 borsh = "1.5"
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.1"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/processing-instructions/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/processing-instructions/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 processing-instructions-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.1"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/program-derived-addresses/native/program/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-solana-program = "=1.18.17"
+solana-program = "2.0"
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
 

basics/program-derived-addresses/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 program-derived-addresses-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.1"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/realloc/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/realloc/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 realloc-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.0"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/rent/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/rent/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 rent_example-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "2.0"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

basics/repository-layout/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/transfer-sol/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 
 [lib]
 crate-type = ["cdylib", "lib"]

basics/transfer-sol/steel/Cargo.toml

@@ -16,6 +16,6 @@ keywords = ["solana"]
 transfer-sol-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = "1.3"
+solana-program = "2.1"
+steel = "3.0"
 thiserror = "1.0"

tokens/create-token/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "1.16.10"
+solana-program = "2.0"
 spl-token = { version = "4.0.0", features = [ "no-entrypoint" ] }
 spl-associated-token-account = { version = "2.0.0", features = [ "no-entrypoint" ] }
 mpl-token-metadata = { version = "1.11", features = [ "no-entrypoint" ] }

tokens/escrow/steel/Cargo.toml

@@ -16,7 +16,7 @@ keywords = ["solana"]
 escrow-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = { version = "2.0", features = ["spl"] }
+solana-program = "2.1"
+steel = { version = "3.0", features = ["spl"] }
 thiserror = "1.0"
-spl-token = "^4"
+spl-token = "^4"

tokens/nft-minter/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "1.16.10"
+solana-program = "2.0"
 spl-token = { version="4.0.0", features = [ "no-entrypoint" ] }
 spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
 mpl-token-metadata = { version="1.11" }

tokens/pda-mint-authority/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "1.16.10"
+solana-program = "2.0"
 spl-token = { version="4.0.0", features = [ "no-entrypoint" ] }
 spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
 mpl-token-metadata = { version="1.11", features = [ "no-entrypoint" ] }

tokens/pda-mint-authority/steel/Cargo.toml

@@ -16,8 +16,8 @@ keywords = ["solana"]
 pda-mint-authority-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = { version = "2.0", features = ["spl"] }
+solana-program = "2.1"
+steel = { version = "3.0", features = ["spl"] }
 thiserror = "1.0"
 mpl-token-metadata = { version = "4.1.2" }
 spl-token = "^4"

tokens/spl-token-minter/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "1.16.10"
+solana-program = "2.0"
 spl-token = { version="4.0.0", features = [ "no-entrypoint" ] }
 spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
 mpl-token-metadata = { version="1.11", features = [ "no-entrypoint" ] }

tokens/spl-token-minter/steel/Cargo.toml

@@ -16,8 +16,8 @@ keywords = ["solana"]
 spl-token-minter-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = { version = "2.0", features = ["spl"] }
+solana-program = "2.1"
+steel = { version = "3.0", features = ["spl"] }
 thiserror = "1.0"
 spl-token = "^4"
 mpl-token-metadata = { version = "4.1.2" }

tokens/token-2022/mint-close-authority/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "1.16.10"
+solana-program = "2.0"
 spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
 spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
 

tokens/token-2022/non-transferable/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
 spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
 

tokens/token-2022/transfer-fee/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.10.3"
 borsh-derive = "0.9.1"
-solana-program = "=1.18.17"
+solana-program = "2.0"
 spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
 spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
 

tokens/token-swap/steel/Cargo.toml

@@ -16,8 +16,8 @@ keywords = ["solana"]
 token-swap-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = { version = "2.0", features = ["spl"] }
+solana-program = "2.1"
+steel = { version = "3.0", features = ["spl"] }
 thiserror = "1.0"
 spl-token = "^4"
 spl-math = { version = "0.3.0", features = ["no-entrypoint"] }

tokens/transfer-tokens/native/program/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
-solana-program = "1.16.10"
+solana-program = "2.0"
 spl-token = { version="4.0.0", features = [ "no-entrypoint" ] }
 spl-associated-token-account = { version = "2.0.0", features = [ "no-entrypoint" ] }
 mpl-token-metadata = { version="1.11", features = ["no-entrypoint"] }

tokens/transfer-tokens/steel/Cargo.toml

@@ -16,8 +16,8 @@ keywords = ["solana"]
 transfer-tokens-api = { path = "./api", version = "0.1.0" }
 bytemuck = "1.14"
 num_enum = "0.7"
-solana-program = "1.18"
-steel = { version = "2.0", features = ["spl"] }
+solana-program = "2.1"
+steel = { version = "3.0", features = ["spl"] }
 thiserror = "1.0"
 spl-token = "^4"
 mpl-token-metadata = { version = "4.1.2" }