From f6df3d6032a863f34a424c065f93f01221585f56 Mon Sep 17 00:00:00 2001 From: Jon C Date: Fri, 26 Jan 2024 22:17:43 +0100 Subject: [PATCH] token-2022: Bump to v2 --- Cargo.lock | 32 +++++++++---------- .../program-test/Cargo.toml | 2 +- associated-token-account/program/Cargo.toml | 2 +- stake-pool/program/Cargo.toml | 2 +- token-collection/program/Cargo.toml | 2 +- token-group/example/Cargo.toml | 2 +- token-metadata/example/Cargo.toml | 2 +- token-swap/program/Cargo.toml | 2 +- token-upgrade/cli/Cargo.toml | 2 +- token-upgrade/program/Cargo.toml | 2 +- token-wrap/program/Cargo.toml | 2 +- token/cli/Cargo.toml | 2 +- token/client/Cargo.toml | 2 +- token/program-2022-test/Cargo.toml | 2 +- token/program-2022/Cargo.toml | 2 +- token/transfer-hook/cli/Cargo.toml | 2 +- token/transfer-hook/example/Cargo.toml | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d1e2daff7f..c5e8a9349d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6647,7 +6647,7 @@ dependencies = [ "num-traits", "solana-program", "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "thiserror", ] @@ -6660,7 +6660,7 @@ dependencies = [ "solana-sdk", "spl-associated-token-account 2.3.0", "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", ] [[package]] @@ -7222,7 +7222,7 @@ dependencies = [ "spl-math", "spl-pod 0.1.0", "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "test-case", "thiserror", ] @@ -7341,7 +7341,7 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "1.0.0" +version = "2.0.0" dependencies = [ "arrayref", "base64 0.21.7", @@ -7386,7 +7386,7 @@ dependencies = [ "spl-memo 4.0.0", "spl-pod 0.1.0", "spl-tlv-account-resolution 0.5.1", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-token-client", "spl-token-group-interface", "spl-token-metadata-interface 0.2.0", @@ -7423,7 +7423,7 @@ dependencies = [ "spl-associated-token-account 2.3.0", "spl-memo 4.0.0", "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-token-client", "spl-token-group-interface", "spl-token-metadata-interface 0.2.0", @@ -7451,7 +7451,7 @@ dependencies = [ "spl-associated-token-account 2.3.0", "spl-memo 4.0.0", "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-token-group-interface", "spl-token-metadata-interface 0.2.0", "spl-transfer-hook-interface 0.5.0", @@ -7468,7 +7468,7 @@ dependencies = [ "spl-discriminator 0.1.0", "spl-pod 0.1.0", "spl-program-error 0.3.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-token-client", "spl-token-group-example", "spl-token-group-interface", @@ -7485,7 +7485,7 @@ dependencies = [ "solana-sdk", "spl-discriminator 0.1.0", "spl-pod 0.1.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-token-client", "spl-token-group-interface", "spl-token-metadata-interface 0.2.0", @@ -7545,7 +7545,7 @@ dependencies = [ "solana-program-test", "solana-sdk", "spl-pod 0.1.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-token-client", "spl-token-metadata-interface 0.2.0", "spl-type-length-value 0.3.0", @@ -7595,7 +7595,7 @@ dependencies = [ "solana-sdk", "spl-math", "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "test-case", "thiserror", ] @@ -7623,7 +7623,7 @@ dependencies = [ "solana-program-test", "solana-sdk", "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-token-client", "test-case", "thiserror", @@ -7644,7 +7644,7 @@ dependencies = [ "solana-test-validator", "spl-associated-token-account 2.3.0", "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-token-client", "spl-token-upgrade", "tokio", @@ -7660,7 +7660,7 @@ dependencies = [ "solana-program", "spl-associated-token-account 2.3.0", "spl-token 4.0.0", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "thiserror", ] @@ -7681,7 +7681,7 @@ dependencies = [ "solana-sdk", "solana-test-validator", "spl-tlv-account-resolution 0.5.1", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-token-client", "spl-transfer-hook-interface 0.5.0", "strum 0.25.0", @@ -7698,7 +7698,7 @@ dependencies = [ "solana-program-test", "solana-sdk", "spl-tlv-account-resolution 0.5.1", - "spl-token-2022 1.0.0", + "spl-token-2022 2.0.0", "spl-transfer-hook-interface 0.5.0", "spl-type-length-value 0.3.0", ] diff --git a/associated-token-account/program-test/Cargo.toml b/associated-token-account/program-test/Cargo.toml index 48af756a0b1..6e6080c65bf 100644 --- a/associated-token-account/program-test/Cargo.toml +++ b/associated-token-account/program-test/Cargo.toml @@ -16,4 +16,4 @@ solana-program-test = "1.17.13" solana-sdk = "1.17.13" spl-associated-token-account = { version = "2", path = "../program", features = ["no-entrypoint"] } spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index bab7c837097..4ba177bef3c 100644 --- a/associated-token-account/program/Cargo.toml +++ b/associated-token-account/program/Cargo.toml @@ -18,7 +18,7 @@ num-derive = "0.4" num-traits = "0.2" solana-program = "1.17.13" spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } thiserror = "1.0" [lib] diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml index f5e8690577e..0e37d8f5590 100644 --- a/stake-pool/program/Cargo.toml +++ b/stake-pool/program/Cargo.toml @@ -24,7 +24,7 @@ solana-program = "1.17.13" solana-security-txt = "1.1.1" spl-math = { version = "0.2", path = "../../libraries/math", features = [ "no-entrypoint" ] } spl-pod = { version = "0.1", path = "../../libraries/pod", features = ["borsh"] } -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = [ "no-entrypoint" ] } +spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = [ "no-entrypoint" ] } thiserror = "1.0" bincode = "1.3.1" diff --git a/token-collection/program/Cargo.toml b/token-collection/program/Cargo.toml index e929c8c7f04..8079cd5bcdc 100644 --- a/token-collection/program/Cargo.toml +++ b/token-collection/program/Cargo.toml @@ -15,7 +15,7 @@ test-sbf = [] solana-program = "1.17.13" spl-pod = { version = "0.1.0", path = "../../libraries/pod" } spl-program-error = { version = "0.3.0" , path = "../../libraries/program-error" } -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } spl-token-group-example = { version = "0.1.0", path = "../../token-group/example", features = ["no-entrypoint"] } spl-token-group-interface = { version = "0.1.0", path = "../../token-group/interface" } spl-token-metadata-interface = { version = "0.2", path = "../../token-metadata/interface" } diff --git a/token-group/example/Cargo.toml b/token-group/example/Cargo.toml index c3fe78b50e6..d04fdf4e08b 100644 --- a/token-group/example/Cargo.toml +++ b/token-group/example/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] solana-program = "1.17.13" spl-pod = { version = "0.1.0", path = "../../libraries/pod" } -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } spl-token-group-interface = { version = "0.1.0", path = "../interface" } spl-type-length-value = { version = "0.3.0", path = "../../libraries/type-length-value" } diff --git a/token-metadata/example/Cargo.toml b/token-metadata/example/Cargo.toml index 36660799d33..ac6f8a1964c 100644 --- a/token-metadata/example/Cargo.toml +++ b/token-metadata/example/Cargo.toml @@ -13,7 +13,7 @@ test-sbf = [] [dependencies] solana-program = "1.17.13" -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } spl-token-metadata-interface = { version = "0.2.0", path = "../interface" } spl-type-length-value = { version = "0.3.0" , path = "../../libraries/type-length-value" } spl-pod = { version = "0.1.0", path = "../../libraries/pod" } diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml index 3e2f024c021..023ffda818b 100644 --- a/token-swap/program/Cargo.toml +++ b/token-swap/program/Cargo.toml @@ -20,7 +20,7 @@ num-traits = "0.2" solana-program = "1.17.13" spl-math = { version = "0.2", path = "../../libraries/math", features = [ "no-entrypoint" ] } spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = [ "no-entrypoint" ] } +spl-token-2022 = { version = "2.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 index a4cfa87ce6e..9f94712ca3d 100644 --- a/token-upgrade/cli/Cargo.toml +++ b/token-upgrade/cli/Cargo.toml @@ -21,7 +21,7 @@ solana-remote-wallet = "1.17.13" solana-sdk = "1.17.13" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] } spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } spl-token-client = { version = "0.8", 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 index 3763f9a5b27..ee0e114bb86 100644 --- 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 = "1.17.13" -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.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 index 1224e721b4a..47e1ad0dedf 100644 --- a/token-wrap/program/Cargo.toml +++ b/token-wrap/program/Cargo.toml @@ -17,7 +17,7 @@ num_enum = "0.7" solana-program = "1.17.13" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] } spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } -spl-token-2022 = { version = "1.0", path = "../../token/program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } thiserror = "1.0" [lib] diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml index 20a0fc55224..381f1bbf7c2 100644 --- a/token/cli/Cargo.toml +++ b/token/cli/Cargo.toml @@ -31,7 +31,7 @@ solana-transaction-status = "=1.17.13" spl-token = { version = "4.0", path = "../program", features = [ "no-entrypoint", ] } -spl-token-2022 = { version = "1.0", path = "../program-2022", features = [ +spl-token-2022 = { version = "2.0", path = "../program-2022", features = [ "no-entrypoint", ] } spl-token-client = { version = "0.8", path = "../client" } diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml index 330c59c8488..988d71bcbec 100644 --- a/token/client/Cargo.toml +++ b/token/client/Cargo.toml @@ -23,7 +23,7 @@ solana-sdk = "1.17.13" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] } spl-memo = { version = "4.0.0", path = "../../memo/program", features = ["no-entrypoint"] } spl-token = { version = "4.0", path="../program", features = [ "no-entrypoint" ] } -spl-token-2022 = { version = "1.0", path="../program-2022" } +spl-token-2022 = { version = "2.0", path="../program-2022" } spl-token-group-interface = { version = "0.1", path="../../token-group/interface" } spl-token-metadata-interface = { version = "0.2", path="../../token-metadata/interface" } spl-transfer-hook-interface = { version = "0.5", path="../transfer-hook/interface" } diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml index 9c6adb7876d..61bc63936a0 100644 --- a/token/program-2022-test/Cargo.toml +++ b/token/program-2022-test/Cargo.toml @@ -25,7 +25,7 @@ solana-sdk = "=1.17.13" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program" } spl-memo = { version = "4.0.0", path = "../../memo/program", features = ["no-entrypoint"] } spl-pod = { version = "0.1.0", path = "../../libraries/pod" } -spl-token-2022 = { version = "1.0", path="../program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path="../program-2022", features = ["no-entrypoint"] } spl-instruction-padding = { version = "0.1.0", path="../../instruction-padding/program", features = ["no-entrypoint"] } spl-tlv-account-resolution = { version = "0.5.0", path = "../../libraries/tlv-account-resolution" } spl-token-client = { version = "0.8", path = "../client" } diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml index 80866030877..c6ccbce88ae 100644 --- a/token/program-2022/Cargo.toml +++ b/token/program-2022/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spl-token-2022" -version = "1.0.0" +version = "2.0.0" description = "Solana Program Library Token 2022" authors = ["Solana Labs Maintainers "] 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 index ed76df04384..acbcc6e5307 100644 --- a/token/transfer-hook/cli/Cargo.toml +++ b/token/transfer-hook/cli/Cargo.toml @@ -28,7 +28,7 @@ serde_yaml = "0.9.30" [dev-dependencies] solana-test-validator = "=1.17.13" -spl-token-2022 = { version = "1.0", path = "../../program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../../program-2022", features = ["no-entrypoint"] } spl-token-client = { version = "0.8", path = "../../client" } [[bin]] diff --git a/token/transfer-hook/example/Cargo.toml b/token/transfer-hook/example/Cargo.toml index 84d3ff9e186..958aef16f48 100644 --- a/token/transfer-hook/example/Cargo.toml +++ b/token/transfer-hook/example/Cargo.toml @@ -15,7 +15,7 @@ test-sbf = [] arrayref = "0.3.7" solana-program = "1.17.13" spl-tlv-account-resolution = { version = "0.5" , path = "../../../libraries/tlv-account-resolution" } -spl-token-2022 = { version = "1.0", path = "../../program-2022", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../../program-2022", features = ["no-entrypoint"] } spl-transfer-hook-interface = { version = "0.5" , path = "../interface" } spl-type-length-value = { version = "0.3" , path = "../../../libraries/type-length-value" }