blockworks-foundation
/
solana-program-library
mirror of https://github.com/blockworks-foundation/solana-program-library.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

associated-token-account: Revert to using spl-token-2022 (#2769) 

* associated-token-account: Revert to using spl-token-2022

* Clear up no-entrypoint feature for rust client
This commit is contained in:
Jon Cinque 2022-01-21 19:17:44 +01:00 committed by GitHub
parent 78e7a9538e
commit 54cb4ad1d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -3462,7 +3462,7 @@ dependencies = [
"solana-program",
"solana-program-test",
"solana-sdk",
"spl-token 3.3.0",
"spl-token-2022",
]
[[package]]

6
associated-token-account/program/Cargo.toml
View File

@ -10,11 +10,15 @@ edition = "2018"
[features]
no-entrypoint = []
test-bpf = []
# When spl-token depends on spl-token-client, which depends on this with no-entrypoint,
# all tests fail! Normally, we want no-entrypoint, except when testing spl-token
no-token-entrypoint = [ "spl-token/no-entrypoint" ]
default = [ "no-token-entrypoint" ]
[dependencies]
borsh = "0.9.1"
solana-program = "1.9.2"
spl-token = { version = "3.3", path = "../../token/program", features = ["no-entrypoint"] }
spl-token = { version = "0.1", path = "../../token/program-2022", package = "spl-token-2022" }
[dev-dependencies]
solana-program-test = "1.9.2"

6
token/rust/Cargo.toml
View File

@ -10,13 +10,15 @@ version = "0.0.1"
# When spl-token-2022 depends on this with no-entrypoint, all tests fail!
# Normally, we want no-entrypoint, except when testing spl-token-2022
[features]
default = [ "spl-token-2022/no-entrypoint" ]
default = [ "spl-token-2022/no-entrypoint", "spl-associated-token-account/no-token-entrypoint" ]
[dependencies]
async-trait = "0.1"
solana-client = "=1.9.2"
solana-program-test = "=1.9.2"
solana-sdk = "=1.9.2"
spl-associated-token-account = { version = "1.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] }
# We never want the entrypoint for ATA, but we want the entrypoint for token when
# testing token
spl-associated-token-account = { version = "1.0", path = "../../associated-token-account/program", features = ["no-entrypoint"], default-features = false }
spl-token-2022 = { version = "0.1", path="../program-2022" }
thiserror = "1.0"