Переглянути джерело

v2.2: deps: Relax spl dependencies (backport of #5704) (#5981)

* deps: Relax spl dependencies (#5704)

* deps: Relax spl dependencies

#### Problem

The sdk dependencies are now relaxed for non-binary crates in Agave, but
the spl crates are still pinned, which can lead to downstream build
issues like
[this CI run](https://github.com/anza-xyz/agave/actions/runs/14316385404/job/40123415833?pr=5629).

#### Summary of changes

Relax the SPL dependencies in the whole agave repo. Note that I didn't
pin binary crates with direct non-dev dependencies on SPL. The list
includes:

* bench-tps (for instruction-padding)
* CLI (for spl-memo)
* faucet (for spl-memo)
* tokens (for spl-token)

Since these are less mission-critical binaries, it seemed reasonable to
avoid the pinning, but let me know if you feel differently.

* Re-enable downstream jobs

* Pin spl versions in bin deps

(cherry picked from commit 6885f67d4350db6fe871f9b09d8456bf0efcad57)

# Conflicts:
#	Cargo.toml
#	svm/examples/Cargo.toml

* Fixup versions for v2.2

---------

Co-authored-by: Jon C <me@jonc.dev>
mergify[bot] 7 місяців тому
батько
коміт
8b7e54b4d1
6 змінених файлів з 15 додано та 15 видалено
  1. 7 7
      Cargo.toml
  2. 1 1
      bench-tps/Cargo.toml
  3. 1 1
      cli/Cargo.toml
  4. 1 1
      faucet/Cargo.toml
  5. 3 3
      svm/examples/Cargo.toml
  6. 2 2
      tokens/Cargo.toml

+ 7 - 7
Cargo.toml

@@ -561,15 +561,15 @@ solana-zk-keygen = { path = "zk-keygen", version = "=2.2.13" }
 solana-zk-sdk = { path = "zk-sdk", version = "=2.2.13" }
 solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=2.2.13" }
 solana-zk-token-sdk = { path = "zk-token-sdk", version = "=2.2.13" }
-spl-associated-token-account = "=6.0.0"
+spl-associated-token-account = "6.0.0"
 spl-instruction-padding = "0.3"
-spl-memo = "=6.0.0"
-spl-pod = "=0.5.0"
-spl-token = "=7.0.0"
-spl-token-2022 = "=7.0.0"
+spl-memo = "6.0.0"
+spl-pod = "0.5.0"
+spl-token = "7.0.0"
+spl-token-2022 = "7.0.0"
 spl-token-confidential-transfer-proof-extraction = "0.2.1"
-spl-token-group-interface = "=0.5.0"
-spl-token-metadata-interface = "=0.6.0"
+spl-token-group-interface = "0.5.0"
+spl-token-metadata-interface = "0.6.0"
 static_assertions = "1.1.0"
 stream-cancel = "0.8.2"
 strum = "0.24"

+ 1 - 1
bench-tps/Cargo.toml

@@ -43,7 +43,7 @@ solana-tps-client = { workspace = true }
 solana-tpu-client = { workspace = true }
 solana-transaction-status = { workspace = true }
 solana-version = { workspace = true }
-spl-instruction-padding = { workspace = true }
+spl-instruction-padding = { version = "=0.3.0", features = ["no-entrypoint"] }
 thiserror = { workspace = true }
 
 [dev-dependencies]

+ 1 - 1
cli/Cargo.toml

@@ -86,7 +86,7 @@ solana-transaction-status = { workspace = true }
 solana-udp-client = { workspace = true }
 solana-version = { workspace = true }
 solana-vote-program = { workspace = true }
-spl-memo = { workspace = true, features = ["no-entrypoint"] }
+spl-memo = { version = "=6.0.0", features = ["no-entrypoint"] }
 thiserror = { workspace = true }
 tiny-bip39 = { workspace = true }
 

+ 1 - 1
faucet/Cargo.toml

@@ -32,7 +32,7 @@ solana-system-interface = "=1.0"
 solana-system-transaction = "=2.2.1"
 solana-transaction = "=2.2.2"
 solana-version = { workspace = true }
-spl-memo = { workspace = true, features = ["no-entrypoint"] }
+spl-memo = { version = "=6.0.0", features = ["no-entrypoint"] }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 

+ 3 - 3
svm/examples/Cargo.toml

@@ -44,9 +44,9 @@ solana-version = { path = "../../version" }
 solana-test-validator = { path = "../../test-validator" }
 solana-transaction-context = { path = "../../transaction-context" }
 solana-transaction-status = { path = "../../transaction-status" }
-spl-associated-token-account = "=6.0.0"
-spl-token = "=7.0.0"
-spl-token-2022 = "=7.0.0"
+spl-associated-token-account = "6.0.0"
+spl-token = "7.0.0"
+spl-token-2022 = "7.0.0"
 termcolor = "1.4.1"
 thiserror = "1.0.68"
 tokio = "1.29.1"

+ 2 - 2
tokens/Cargo.toml

@@ -29,8 +29,8 @@ solana-rpc-client-api = { workspace = true }
 solana-sdk = "=2.2.2"
 solana-transaction-status = { workspace = true }
 solana-version = { workspace = true }
-spl-associated-token-account = { workspace = true }
-spl-token = { workspace = true, features = ["no-entrypoint"] }
+spl-associated-token-account = { version = "=6.0.0", features = ["no-entrypoint"] }
+spl-token = { version = "=7.0.0", features = ["no-entrypoint"] }
 tempfile = { workspace = true }
 thiserror = { workspace = true }