token-2022: Bump to v4 for Solana v2 compatibility (#6930)

solana-labs · Jun 25, 2024 · d0f48a6 · d0f48a6
1 parent 76bb0c8
commit d0f48a6
Show file tree

Hide file tree

Showing 17 changed files with 60 additions and 60 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/associated-token-account/program-test/Cargo.toml b/associated-token-account/program-test/Cargo.toml
@@ -16,4 +16,4 @@ solana-program-test = "2.0.0"
 solana-sdk = "2.0.0"
 spl-associated-token-account = { version = "3.0.2", path = "../program", features = ["no-entrypoint"] }
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml
@@ -20,7 +20,7 @@ solana-program = "2.0.0"
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = [
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = [
   "no-entrypoint",
 ] }
 thiserror = "1.0"

diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml
@@ -28,7 +28,7 @@ spl-math = { version = "0.2", path = "../../libraries/math", features = [
 spl-pod = { version = "0.3.0", path = "../../libraries/pod", features = [
   "borsh",
 ] }
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = [
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = [
   "no-entrypoint",
 ] }
 thiserror = "1.0"

diff --git a/token-collection/program/Cargo.toml b/token-collection/program/Cargo.toml
@@ -15,7 +15,7 @@ test-sbf = []
 solana-program = "2.0.0"
 spl-pod = { version = "0.3.0", path = "../../libraries/pod" }
 spl-program-error = { version = "0.5.0" , path = "../../libraries/program-error" }
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
 spl-token-group-example = { version = "0.2", path = "../../token-group/example", features = ["no-entrypoint"] }
 spl-token-group-interface = { version = "0.3.0", path = "../../token-group/interface" }
 spl-token-metadata-interface = { version = "0.4.0", path = "../../token-metadata/interface" }

diff --git a/token-group/example/Cargo.toml b/token-group/example/Cargo.toml
@@ -14,7 +14,7 @@ test-sbf = []
 [dependencies]
 solana-program = "2.0.0"
 spl-pod = { version = "0.3.0", path = "../../libraries/pod" }
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
 spl-token-group-interface = { version = "0.3.0", path = "../interface" }
 spl-type-length-value = { version = "0.5.0", path = "../../libraries/type-length-value" }
 

diff --git a/token-metadata/example/Cargo.toml b/token-metadata/example/Cargo.toml
@@ -13,7 +13,7 @@ test-sbf = []
 
 [dependencies]
 solana-program = "2.0.0"
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
 spl-token-metadata-interface = { version = "0.4.0", path = "../interface" }
 spl-type-length-value = { version = "0.5.0" , path = "../../libraries/type-length-value" }
 spl-pod = { version = "0.3.0", path = "../../libraries/pod" }

diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml
@@ -20,7 +20,7 @@ num-traits = "0.2"
 solana-program = "2.0.0"
 spl-math = { version = "0.2", path = "../../libraries/math", features = [ "no-entrypoint" ] }
 spl-token = { version = "6.0", path = "../../token/program", features = [ "no-entrypoint" ] }
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = [ "no-entrypoint" ] }
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = [ "no-entrypoint" ] }
 thiserror = "1.0"
 arbitrary = { version = "1.3", features = ["derive"], optional = true }
 roots = { version = "0.0.8", optional = true }

diff --git a/token-upgrade/cli/Cargo.toml b/token-upgrade/cli/Cargo.toml
@@ -21,7 +21,7 @@ solana-remote-wallet = "2.0.0"
 solana-sdk = "2.0.0"
 spl-associated-token-account = { version = "3.0.2", path = "../../associated-token-account/program", features = ["no-entrypoint"] }
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
 spl-token-client = { version = "0.10.0", path = "../../token/client" }
 spl-token-upgrade = { version = "0.1", path = "../program", features = ["no-entrypoint"] }
 tokio = { version = "1", features = ["full"] }

diff --git a/token-upgrade/program/Cargo.toml b/token-upgrade/program/Cargo.toml
@@ -16,7 +16,7 @@ num-derive = "0.4"
 num-traits = "0.2"
 num_enum = "0.7.2"
 solana-program = "2.0.0"
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
 thiserror = "1.0"
 
 [dev-dependencies]

diff --git a/token-wrap/program/Cargo.toml b/token-wrap/program/Cargo.toml
@@ -17,7 +17,7 @@ num_enum = "0.7"
 solana-program = "2.0.0"
 spl-associated-token-account = { version = "3.0.2", path = "../../associated-token-account/program", features = ["no-entrypoint"] }
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
-spl-token-2022 = { version = "3.0.2", path = "../../token/program-2022", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
 thiserror = "1.0"
 
 [lib]

diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml
@@ -31,7 +31,7 @@ solana-transaction-status = "2.0.0"
 spl-token = { version = "6.0", path = "../program", features = [
   "no-entrypoint",
 ] }
-spl-token-2022 = { version = "3.0.2", path = "../program-2022", features = [
+spl-token-2022 = { version = "4.0.0", path = "../program-2022", features = [
   "no-entrypoint",
 ] }
 spl-token-client = { version = "0.10.0", path = "../client" }

diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml
@@ -29,7 +29,7 @@ spl-memo = { version = "5.0", path = "../../memo/program", features = [
 spl-token = { version = "6.0", path = "../program", features = [
   "no-entrypoint",
 ] }
-spl-token-2022 = { version = "3.0.2", path = "../program-2022" }
+spl-token-2022 = { version = "4.0.0", path = "../program-2022" }
 spl-token-group-interface = { version = "0.3.0", path = "../../token-group/interface" }
 spl-token-metadata-interface = { version = "0.4.0", path = "../../token-metadata/interface" }
 spl-transfer-hook-interface = { version = "0.7.0", path = "../transfer-hook/interface" }

diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml
@@ -27,7 +27,7 @@ spl-memo = { version = "5.0.0", path = "../../memo/program", features = [
   "no-entrypoint",
 ] }
 spl-pod = { version = "0.3.0", path = "../../libraries/pod" }
-spl-token-2022 = { version = "3.0.2", path = "../program-2022", features = [
+spl-token-2022 = { version = "4.0.0", path = "../program-2022", features = [
   "no-entrypoint",
 ] }
 spl-instruction-padding = { version = "0.2.0", path = "../../instruction-padding/program", features = [

diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spl-token-2022"
-version = "3.0.2"
+version = "4.0.0"
 description = "Solana Program Library Token 2022"
 authors = ["Solana Labs Maintainers <[email protected]>"]
 repository = "https://github.com/solana-labs/solana-program-library"

diff --git a/token/transfer-hook/cli/Cargo.toml b/token/transfer-hook/cli/Cargo.toml
@@ -28,7 +28,7 @@ serde_yaml = "0.9.34"
 
 [dev-dependencies]
 solana-test-validator = "2.0.0"
-spl-token-2022 = { version = "3.0.2", path = "../../program-2022", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "4.0.0", path = "../../program-2022", features = ["no-entrypoint"] }
 spl-token-client = { version = "0.10.0", path = "../../client" }
 spl-transfer-hook-example = { version = "0.6.0", path = "../example" }
 

diff --git a/token/transfer-hook/example/Cargo.toml b/token/transfer-hook/example/Cargo.toml
@@ -17,7 +17,7 @@ forbid-additional-mints = []
 arrayref = "0.3.7"
 solana-program = "2.0.0"
 spl-tlv-account-resolution = { version = "0.7.0" , path = "../../../libraries/tlv-account-resolution" }
-spl-token-2022 = { version = "3.0.2",  path = "../../program-2022", features = ["no-entrypoint"] }
+spl-token-2022 = { version = "4.0.0",  path = "../../program-2022", features = ["no-entrypoint"] }
 spl-transfer-hook-interface = { version = "0.7.0" , path = "../interface" }
 spl-type-length-value = { version = "0.5.0" , path = "../../../libraries/type-length-value" }