Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
Bump spl-ata to v1.1.2 (backport #28979) (#28989)
Browse files Browse the repository at this point in the history
* Bump spl-ata to v1.1.2 (#28979)

(cherry picked from commit 3d6eb16)

# Conflicts:
#	Cargo.lock
#	programs/bpf/Cargo.lock
#	tokens/Cargo.toml
#	transaction-status/Cargo.toml

* Fix conflicts

Co-authored-by: Tyera <tyera@solana.com>
  • Loading branch information
mergify[bot] and Tyera authored Nov 30, 2022
1 parent 35e6de6 commit 1455127
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 55 deletions.
34 changes: 8 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion fetch-spl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ fetch_program() {
fetch_program token 3.5.0 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader2111111111111111111111111111111111
fetch_program memo 1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo BPFLoader1111111111111111111111111111111111
fetch_program memo 3.0.0 MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr BPFLoader2111111111111111111111111111111111
fetch_program associated-token-account 1.1.1 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111
fetch_program associated-token-account 1.1.2 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111
fetch_program feature-proposal 1.0.0 Feat1YXHhH6t1juaWF74WLcfv4XoNocjXA6sPWHNgAse BPFLoader2111111111111111111111111111111111

echo "${genesis_args[@]}" > spl-genesis-args.sh
Expand Down
34 changes: 8 additions & 26 deletions programs/bpf/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tokens/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ solana-remote-wallet = { path = "../remote-wallet", version = "=1.14.10" }
solana-sdk = { path = "../sdk", version = "=1.14.10" }
solana-transaction-status = { path = "../transaction-status", version = "=1.14.10" }
solana-version = { path = "../version", version = "=1.14.10" }
spl-associated-token-account = { version = "=1.1.1" }
spl-associated-token-account = { version = "=1.1.2" }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
tempfile = "3.3.0"
thiserror = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion transaction-status/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ solana-measure = { path = "../measure", version = "=1.14.10" }
solana-metrics = { path = "../metrics", version = "=1.14.10" }
solana-sdk = { path = "../sdk", version = "=1.14.10" }
solana-vote-program = { path = "../programs/vote", version = "=1.14.10" }
spl-associated-token-account = { version = "=1.1.1", features = ["no-entrypoint"] }
spl-associated-token-account = { version = "=1.1.2", features = ["no-entrypoint"] }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
spl-token = { version = "=3.5.0", features = ["no-entrypoint"] }
spl-token-2022 = { version = "=0.5.0", features = ["no-entrypoint"] }
Expand Down

0 comments on commit 1455127

Please sign in to comment.