Bump spl-token to v3.1.1 (backport #17951) (#17957)

* Bump spl-token to v3.1.1 (#17951)

(cherry picked from commit b7de369992)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	accounts-cluster-bench/Cargo.toml
#	programs/bpf/Cargo.lock
#	rpc/Cargo.toml
#	tokens/Cargo.toml

* Fix conflicts

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
mergify[bot]
2021-06-15 07:54:09 +00:00
committed by GitHub
parent b524e0a1a7
commit ff8f78199d
8 changed files with 149 additions and 241 deletions

View File

@@ -31,7 +31,7 @@ solana-stake-program = { path = "../programs/stake", version = "=1.6.12" }
solana-transaction-status = { path = "../transaction-status", version = "=1.6.12" }
solana-version = { path = "../version", version = "=1.6.12" }
spl-associated-token-account-v1-0 = { package = "spl-associated-token-account", version = "=1.0.2" }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.1", features = ["no-entrypoint"] }
tempfile = "3.1.0"
thiserror = "1.0"