ソースを参照

Upgrade Solana to `1.17.0` (#2645)

acheron 2 年 前
コミット
5e7fb44518

+ 1 - 1
.github/workflows/no-caching-tests.yaml

@@ -11,7 +11,7 @@ jobs:
     uses: ./.github/workflows/reusable-tests.yaml
     with:
       cache: false
-      solana_cli_version: 1.16.0
+      solana_cli_version: 1.17.0
       solang_version: 0.3.2
       node_version: 18.18.0
       cargo_profile: release

+ 1 - 3
.github/workflows/reusable-tests.yaml

@@ -419,9 +419,7 @@ jobs:
             path: tests/ido-pool
           # - cmd: cd tests/cfo && anchor run test-with-build && cd deps/stake && git checkout Cargo.lock && cd ../swap && git checkout Cargo.lock
           #   path: tests/cfo
-          # TODO: Remove `1.14.18` installation if/when https://github.com/solana-labs/solana/issues/31960 is solved
-          # `auction-house` tests don't work with Solana `1.16.0`, downgrade to `1.14.18`
-          - cmd: cd tests/auction-house && solana-install init 1.14.18 && yarn --frozen-lockfile && anchor test --skip-lint && git checkout Cargo.lock
+          - cmd: cd tests/auction-house && yarn --frozen-lockfile && anchor test --skip-lint && git checkout Cargo.lock
             path: tests/auction-house
           - cmd: cd tests/floats && yarn --frozen-lockfile && anchor test --skip-lint && npx tsc --noEmit
             path: tests/floats

+ 1 - 1
.github/workflows/tests.yaml

@@ -14,7 +14,7 @@ jobs:
     uses: ./.github/workflows/reusable-tests.yaml
     with:
       cache: true
-      solana_cli_version: 1.16.0
+      solana_cli_version: 1.17.0
       solang_version: 0.3.2
       node_version: 18.18.0
       cargo_profile: debug

+ 2 - 0
CHANGELOG.md

@@ -30,6 +30,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - spl: Add `idl-build` feature. IDL build method will not work without enabling this feature when using `anchor-spl` ([#2629](https://github.com/coral-xyz/anchor/pull/2629)).
 - lang: Add support for type aliases in IDLs ([#2637](https://github.com/coral-xyz/anchor/pull/2637)).
 - cli: Add `test.upgradeable`, `test.genesis.upgradeable` setting in anchor.toml to support testing upgradeable programs ([#2641](https://github.com/coral-xyz/anchor/pull/2642)).
+- cli, client, lang, spl: Update Solana toolchain and dependencies to `1.17.0`, `1.16` remains supported ([#2645](https://github.com/coral-xyz/anchor/pull/2645)).
 
 ### Fixes
 
@@ -50,6 +51,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - spl: Update `mpl-token-metadata` dependency to use the client SDK instead of the program crate ([#2632](https://github.com/coral-xyz/anchor/pull/2632)).
 - ts: Remove `base64-js` dependency ([#2635](https://github.com/coral-xyz/anchor/pull/2635)).
 - syn: `IdlTypeDefinitionTy` enum has a new variant `Alias` ([#2637](https://github.com/coral-xyz/anchor/pull/2637)).
+- cli, client, lang, spl: Solana `1.14` is no longer supported, minimum required Solana version is `1.16.0` ([#2645](https://github.com/coral-xyz/anchor/pull/2645)).
 
 ## [0.28.0] - 2023-06-09
 

ファイルの差分が大きいため隠しています
+ 214 - 177
Cargo.lock


+ 1 - 1
bench/BINARY_SIZE.md

@@ -14,7 +14,7 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-Solana version: 1.16.0
+Solana version: 1.17.0
 
 | Program | Binary Size | +/-                    |
 | ------- | ----------- | ---------------------- |

+ 1 - 1
bench/COMPUTE_UNITS.md

@@ -14,7 +14,7 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-Solana version: 1.16.0
+Solana version: 1.17.0
 
 | Instruction                 | Compute Units | +/-                    |
 | --------------------------- | ------------- | ---------------------- |

+ 1 - 1
bench/STACK_MEMORY.md

@@ -14,7 +14,7 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-Solana version: 1.16.0
+Solana version: 1.17.0
 
 | Instruction                    | Stack Memory | +/-                  |
 | ------------------------------ | ------------ | -------------------- |

+ 5 - 5
cli/Cargo.toml

@@ -36,11 +36,11 @@ semver = "1.0.4"
 serde = { version = "1.0.122", features = ["derive"] }
 serde_json = "1.0"
 shellexpand = "2.1.0"
-solana-client = ">=1.14, <1.17"
-solana-cli-config = ">=1.14, <1.17"
-solana-faucet = ">=1.14, <1.17"
-solana-program = ">=1.14, <1.17"
-solana-sdk = ">=1.14, <1.17"
+solana-client = ">=1.16, <1.18"
+solana-cli-config = ">=1.16, <1.18"
+solana-faucet = ">=1.16, <1.18"
+solana-program = ">=1.16, <1.18"
+solana-sdk = ">=1.16, <1.18"
 solang-parser = "=0.3.2"
 syn = { version = "1.0.60", features = ["full", "extra-traits"] }
 tar = "0.4.35"

+ 3 - 3
client/Cargo.toml

@@ -17,9 +17,9 @@ anyhow = "1"
 futures = "0.3"
 regex = "1"
 serde = { version = "1", features = ["derive"] }
-solana-client = ">=1.14, <1.17"
-solana-sdk = ">=1.14, <1.17"
-solana-account-decoder = ">=1.14, <1.17"
+solana-client = ">=1.16, <1.18"
+solana-sdk = ">=1.16, <1.18"
+solana-account-decoder = ">=1.16, <1.18"
 thiserror = "1"
 tokio = { version = "1", features = ["rt", "sync"] }
 url = "2"

+ 1 - 1
client/example/Cargo.toml

@@ -20,5 +20,5 @@ events = { path = "../../tests/events/programs/events", features = ["no-entrypoi
 anyhow = "1.0.32"
 clap = { version = "4.2.4", features = ["derive"] }
 shellexpand = "2.1.0"
-solana-sdk = ">=1.14, <1.17"
+solana-sdk = ">=1.16, <1.18"
 tokio = { version = "1", features = ["full"] }

+ 1 - 1
lang/Cargo.toml

@@ -52,7 +52,7 @@ base64 = "0.13"
 bincode = "1"
 borsh = ">=0.9, <0.11"
 bytemuck = "1"
-solana-program = ">=1.14, <1.17"
+solana-program = ">=1.16, <1.18"
 thiserror = "1"
 
 # TODO: Remove. This crate has been added to fix a build error with the 1.16.0 release.

+ 2 - 2
setup_tests.sh → setup-tests.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 active_version=$(solana -V | awk '{print $2}')
-if [ "$active_version" != "1.16.0" ]; then
-  solana-install init 1.16.0
+if [ "$active_version" != "1.17.0" ]; then
+  solana-install init 1.17.0
 fi
 
 git submodule update --init --recursive --depth 1

+ 1 - 1
spl/Cargo.toml

@@ -26,7 +26,7 @@ anchor-lang = { path = "../lang", version = "0.28.0", features = ["derive"] }
 borsh = { version = ">=0.9, <0.11", optional = true }
 mpl-token-metadata = { version = "3.1.0", optional = true }
 serum_dex = { git = "https://github.com/openbook-dex/program/", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
-solana-program = ">=1.14, <1.17"
+solana-program = ">=1.16, <1.18"
 spl-associated-token-account = { version = "^1.1", features = ["no-entrypoint"], optional = true }
 spl-token = { version = "3.5", features = ["no-entrypoint"], optional = true }
 spl-token-2022 = { version = "0.6", features = ["no-entrypoint"], optional = true }

+ 1 - 1
tests/auction-house

@@ -1 +1 @@
-Subproject commit 667c2b3eeed196d053b7137ff4f407757788bb6c
+Subproject commit 93021530dfcd75b903cc3a3ef1c4b464c456d9c9

+ 2 - 2
tests/bench/bench.json

@@ -372,7 +372,7 @@
     }
   },
   "unreleased": {
-    "solanaVersion": "1.16.0",
+    "solanaVersion": "1.17.0",
     "result": {
       "binarySize": {
         "bench": 1075688
@@ -557,4 +557,4 @@
       }
     }
   }
-}
+}

+ 1 - 1
tests/zero-copy/programs/zero-copy/Cargo.toml

@@ -22,4 +22,4 @@ bytemuck = {version = "1.4.0", features = ["derive", "min_const_generics"]}
 
 [dev-dependencies]
 anchor-client = { path = "../../../../client", features = ["debug", "async"] }
-solana-program-test = ">=1.14, <1.17"
+solana-program-test = ">=1.16, <1.18"

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません