Use workspace version of spl-token and update it to 4.0.0.

Lightprotocol · Jul 1, 2024 · 51336de · 51336de
1 parent c43e380
commit 51336de
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 60 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,6 +40,8 @@ solana-transaction-status = "=1.18.11"
 anchor-lang = "=0.29.0"
 anchor-spl = "=0.29.0"
 
+spl-token = "=4.0.0"
+
 [patch.crates-io]
 "solana-account-decoder" = { git = "https://github.com/lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }
 "solana-accounts-db" = { git = "https://github.com/lightprotocol/agave", branch = "v1.18.11-enforce-cpi-tracking" }

diff --git a/examples/token-escrow/programs/token-escrow/Cargo.toml b/examples/token-escrow/programs/token-escrow/Cargo.toml
@@ -39,5 +39,5 @@ tokio = "1.36.0"
 light-prover-client = { path = "../../../../circuit-lib/light-prover-client", version = "0.2.1" }
 num-bigint = "0.4.4"
 num-traits = "0.2.18"
-spl-token = "3.5.0"
+spl-token = { workspace = true }
 anchor-spl = { workspace = true }
diff --git a/programs/compressed-token/Cargo.toml b/programs/compressed-token/Cargo.toml
@@ -27,7 +27,7 @@ idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"]
 [dependencies]
 anchor-lang = { workspace = true }
 anchor-spl = { workspace = true }
-spl-token = {version = "3.5.0", features = ["no-entrypoint"]}
+spl-token = { workspace = true, features = ["no-entrypoint"]}
 aligned-sized = { version = "0.2.1", path = "../../macros/aligned-sized" }
 account-compression = { version = "0.4.1", path = "../account-compression", features = ["cpi", "no-idl"] }
 light-system-program = { version = "0.4.1", path = "../system", features = ["cpi"] }

diff --git a/test-programs/account-compression-test/Cargo.toml b/test-programs/account-compression-test/Cargo.toml
@@ -29,7 +29,7 @@ tokio = "1.36.0"
 light-prover-client = {path = "../../circuit-lib/light-prover-client" }
 num-bigint = "0.4.4"
 num-traits = "0.2.18"
-spl-token = "3.5.0"
+spl-token = { workspace = true }
 anchor-spl = { workspace = true }
 anchor-lang = { workspace = true }
 light-compressed-token = { path = "../../programs/compressed-token"  , features = ["cpi"]}

diff --git a/test-programs/compressed-token-test/Cargo.toml b/test-programs/compressed-token-test/Cargo.toml
@@ -38,5 +38,5 @@ tokio = "1.36.0"
 light-prover-client = {path = "../../circuit-lib/light-prover-client" }
 num-bigint = "0.4.4"
 num-traits = "0.2.18"
-spl-token = "3.5.0"
+spl-token = { workspace = true }
 anchor-spl = { workspace = true }
diff --git a/test-programs/e2e-test/Cargo.toml b/test-programs/e2e-test/Cargo.toml
@@ -41,7 +41,7 @@ tokio = "1.36.0"
 light-prover-client = {path = "../../circuit-lib/light-prover-client" }
 num-bigint = "0.4.4"
 num-traits = "0.2.18"
-spl-token = "3.5.0"
+spl-token = { workspace = true }
 anchor-spl = { workspace = true }
 rand = "0.8"
 spl-concurrent-merkle-tree = { version = "0.2.0", default-features = false}
diff --git a/test-programs/registry-test/Cargo.toml b/test-programs/registry-test/Cargo.toml
@@ -28,7 +28,7 @@ tokio = "1.36.0"
 light-prover-client = {path = "../../circuit-lib/light-prover-client" }
 num-bigint = "0.4.4"
 num-traits = "0.2.18"
-spl-token = "3.5.0"
+spl-token = { workspace = true }
 anchor-spl = { workspace = true }
 anchor-lang = { workspace = true }
 light-registry = { path = "../../programs/registry"  , features = ["cpi"]}

diff --git a/test-programs/system-cpi-test/Cargo.toml b/test-programs/system-cpi-test/Cargo.toml
@@ -39,5 +39,5 @@ tokio = "1.36.0"
 light-prover-client = { path = "../../circuit-lib/light-prover-client", version = "0.2.1" }
 num-bigint = "0.4.4"
 num-traits = "0.2.18"
-spl-token = "3.5.0"
+spl-token = { workspace = true }
 anchor-spl = { workspace = true }
diff --git a/test-programs/system-test/Cargo.toml b/test-programs/system-test/Cargo.toml
@@ -28,7 +28,7 @@ tokio = "1.36.0"
 light-prover-client = {path = "../../circuit-lib/light-prover-client" }
 num-bigint = "0.4.4"
 num-traits = "0.2.18"
-spl-token = "3.5.0"
+spl-token = { workspace = true }
 anchor-spl = { workspace = true }
 anchor-lang = { workspace = true }
 light-compressed-token = { path = "../../programs/compressed-token"  , features = ["cpi"]}

diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
@@ -26,7 +26,7 @@ account-compression = { path = "../programs/account-compression", version = "0.4
 light-compressed-token = { path = "../programs/compressed-token", version = "0.4.1", features = ["cpi"] }
 light-system-program = { path = "../programs/system", version = "0.4.1", features = ["cpi"] }
 light-registry = { path = "../programs/registry", version = "0.4.1", features = ["cpi"] }
-spl-token = { version="3.5.0", features = ["no-entrypoint"] }
+spl-token = { workspace = true, features = ["no-entrypoint"] }
 solana-transaction-status = { workspace = true }
 tokio = "1.36"
 light-prover-client = { path = "../circuit-lib/light-prover-client", version = "0.2.1" }