Browse Source

Remove the maximum version constraint from Solana crates (#2667)

acheron 2 years ago
parent
commit
8717364f81

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

@@ -411,7 +411,7 @@ jobs:
             path: tests/declare-id
           - cmd: cd tests/typescript && anchor test --skip-lint && npx tsc --noEmit
             path: tests/typescript
-          - cmd: cd tests/zero-copy && rustup toolchain install 1.66.1-x86_64-unknown-linux-gnu && anchor test --skip-lint && cd programs/zero-copy && cargo test-bpf
+          - cmd: cd tests/zero-copy && anchor test --skip-lint && cd programs/zero-copy && cargo test-bpf
             path: tests/zero-copy
           - cmd: cd tests/chat && anchor test --skip-lint
             path: tests/chat

+ 1 - 1
CHANGELOG.md

@@ -32,7 +32,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - 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)).
-- spl: Add support for memo program ([#2660](https://github.com/coral-xyz/anchor/issues/2660)).
+- spl: Add support for memo program ([#2661](https://github.com/coral-xyz/anchor/pull/2661)).
 
 ### Fixes
 

+ 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.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"
+solana-client = "1.16"
+solana-cli-config = "1.16"
+solana-faucet = "1.16"
+solana-program = "1.16"
+solana-sdk = "1.16"
 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.16, <1.18"
-solana-sdk = ">=1.16, <1.18"
-solana-account-decoder = ">=1.16, <1.18"
+solana-account-decoder = "1.16"
+solana-client = "1.16"
+solana-sdk = "1.16"
 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.16, <1.18"
+solana-sdk = "1.16"
 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.16, <1.18"
+solana-program = "1.16"
 thiserror = "1"
 
 # TODO: Remove. This crate has been added to fix a build error with the 1.16.0 release.

+ 3 - 3
spl/Cargo.toml

@@ -14,21 +14,21 @@ dex = ["serum_dex"]
 devnet = []
 governance = []
 idl-build = ["anchor-lang/idl-build"]
+memo = ["spl-memo"]
 metadata = ["mpl-token-metadata"]
 mint = []
 shmem = []
 stake = ["borsh"]
 token = ["spl-token"]
 token_2022 = ["spl-token-2022"]
-memo = ["spl-memo"]
 
 [dependencies]
 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.16, <1.18"
+solana-program = "1.16"
 spl-associated-token-account = { version = "2.2", features = ["no-entrypoint"], optional = true }
+spl-memo = { version = "4", features = ["no-entrypoint"], optional = true }
 spl-token = { version = "4", features = ["no-entrypoint"], optional = true }
 spl-token-2022 = { version = "0.9", features = ["no-entrypoint"], optional = true }
-spl-memo = { version = "4", features = ["no-entrypoint"], optional = true }

+ 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.16, <1.18"
+solana-program-test = "1.16"