Browse Source

update native programs to use 2.1

Ayush 9 months ago
parent
commit
f2971c1253
27 changed files with 610 additions and 89 deletions
  1. 9 8
      .github/workflows/solana-native.yml
  2. 574 55
      Cargo.lock
  3. 1 1
      basics/account-data/native/program/Cargo.toml
  4. 1 1
      basics/checking-accounts/native/program/Cargo.toml
  5. 1 1
      basics/close-account/native/program/Cargo.toml
  6. 1 1
      basics/counter/mpl-stack/Cargo.toml
  7. 1 1
      basics/counter/native/program/Cargo.toml
  8. 1 1
      basics/create-account/native/program/Cargo.toml
  9. 1 1
      basics/cross-program-invocation/native/programs/hand/Cargo.toml
  10. 1 1
      basics/cross-program-invocation/native/programs/lever/Cargo.toml
  11. 1 1
      basics/hello-solana/native/program/Cargo.toml
  12. 3 2
      basics/hello-solana/steel/Cargo.toml
  13. 1 1
      basics/pda-rent-payer/native/program/Cargo.toml
  14. 1 1
      basics/processing-instructions/native/program/Cargo.toml
  15. 1 1
      basics/program-derived-addresses/native/program/Cargo.toml
  16. 1 1
      basics/realloc/native/program/Cargo.toml
  17. 1 1
      basics/rent/native/program/Cargo.toml
  18. 1 1
      basics/repository-layout/native/program/Cargo.toml
  19. 1 1
      basics/transfer-sol/native/program/Cargo.toml
  20. 1 1
      tokens/create-token/native/program/Cargo.toml
  21. 1 1
      tokens/nft-minter/native/program/Cargo.toml
  22. 1 1
      tokens/pda-mint-authority/native/program/Cargo.toml
  23. 1 1
      tokens/spl-token-minter/native/program/Cargo.toml
  24. 1 1
      tokens/token-2022/mint-close-authority/native/program/Cargo.toml
  25. 1 1
      tokens/token-2022/non-transferable/native/program/Cargo.toml
  26. 1 1
      tokens/token-2022/transfer-fee/native/program/Cargo.toml
  27. 1 1
      tokens/transfer-tokens/native/program/Cargo.toml

+ 9 - 8
.github/workflows/solana-native.yml

@@ -179,26 +179,27 @@ jobs:
 
           # Install pnpm
           npm install --global pnpm
-      - name: Setup Solana stable
+      - name: Setup Solana Beta
         uses: heyAyushh/setup-solana@v5.5
         with:
-          solana-cli-version: stable
-      - name: Build and Test with Stable
+          solana-cli-version: beta
+      - name: Build and Test with Beta
         run: |
           source build_and_test.sh
           solana -V
           rustc -V
-          process_projects "stable"
-      - name: Setup Solana 1.18.17
+          process_projects "beta"
+      - name: Setup Solana Stable
         uses: heyAyushh/setup-solana@v5.5
         with:
-          solana-cli-version: 1.18.17
-      - name: Build and Test with 1.18.17
+          solana-cli-version: stable
+      - name: Build and Test with Stable
+        continue-on-error: true
         run: |
           source build_and_test.sh
           solana -V
           rustc -V
-          process_projects "1.18.17"
+          process_projects "stable"
 
       - name: Set failed projects output
         id: set-failed

File diff suppressed because it is too large
+ 574 - 55
Cargo.lock


+ 1 - 1
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.1"
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
 

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
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"

+ 1 - 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.1"

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
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.1"
 cross-program-invocatio-native-lever = { path = "../lever", features = ["cpi"] }
 
 [lib]

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 3 - 2
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"

+ 1 - 1
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.1"
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
 

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
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.1"
 borsh = "0.9.3"
 borsh-derive = "0.9.1"
 

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
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.1"
 
 [lib]
 crate-type = ["cdylib", "lib"]

+ 1 - 1
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.1"
 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" ] }

+ 1 - 1
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.1"
 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" }

+ 1 - 1
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.1"
 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" ] }

+ 1 - 1
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.1"
 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" ] }

+ 1 - 1
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.1"
 spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
 spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
 

+ 1 - 1
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.1"
 spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
 spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
 

+ 1 - 1
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.1"
 spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] }
 spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }
 

+ 1 - 1
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.1"
 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"] }

Some files were not shown because too many files changed in this diff