From 134bf54642d88325b8e7860e6c1d3a2daa726755 Mon Sep 17 00:00:00 2001 From: Jon C Date: Tue, 25 Jun 2024 11:42:12 +0200 Subject: [PATCH] program-error: Bump to 0.5.0 for Solana v2 compatibility --- Cargo.lock | 42 ++++++++++----------- libraries/pod/Cargo.toml | 2 +- libraries/program-error/Cargo.toml | 2 +- libraries/tlv-account-resolution/Cargo.toml | 2 +- libraries/type-length-value/Cargo.toml | 2 +- token-collection/program/Cargo.toml | 2 +- token-group/interface/Cargo.toml | 2 +- token-metadata/interface/Cargo.toml | 2 +- token/transfer-hook/interface/Cargo.toml | 2 +- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7145d454a8..694e56a8a0f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7239,7 +7239,7 @@ dependencies = [ "serde_json", "solana-program", "solana-zk-token-sdk", - "spl-program-error 0.4.1", + "spl-program-error 0.5.0", ] [[package]] @@ -7252,33 +7252,33 @@ dependencies = [ "bytemuck", "solana-program", "solana-zk-token-sdk", - "spl-program-error 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.4.1", ] [[package]] name = "spl-program-error" version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49065093ea91f57b9b2bd81493ff705e2ad4e64507a07dbc02b085778e02770e" dependencies = [ - "lazy_static", "num-derive", "num-traits", - "serial_test", "solana-program", - "solana-sdk", - "spl-program-error-derive 0.4.1", + "spl-program-error-derive 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "spl-program-error" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49065093ea91f57b9b2bd81493ff705e2ad4e64507a07dbc02b085778e02770e" +version = "0.5.0" dependencies = [ + "lazy_static", "num-derive", "num-traits", + "serial_test", "solana-program", - "spl-program-error-derive 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-sdk", + "spl-program-error-derive 0.4.1", "thiserror", ] @@ -7451,7 +7451,7 @@ dependencies = [ "solana-sdk", "spl-discriminator 0.3.0", "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "spl-program-error 0.5.0", "spl-type-length-value 0.4.3", ] @@ -7465,7 +7465,7 @@ dependencies = [ "solana-program", "spl-discriminator 0.2.2", "spl-pod 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-program-error 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.4.1", "spl-type-length-value 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7654,7 +7654,7 @@ dependencies = [ "solana-sdk", "spl-discriminator 0.3.0", "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "spl-program-error 0.5.0", "spl-token-2022 3.0.2", "spl-token-client", "spl-token-group-example", @@ -7687,7 +7687,7 @@ dependencies = [ "solana-program", "spl-discriminator 0.3.0", "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "spl-program-error 0.5.0", "spl-type-length-value 0.4.3", ] @@ -7701,7 +7701,7 @@ dependencies = [ "solana-program", "spl-discriminator 0.2.2", "spl-pod 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-program-error 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.4.1", ] [[package]] @@ -7762,7 +7762,7 @@ dependencies = [ "solana-program", "spl-discriminator 0.3.0", "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "spl-program-error 0.5.0", "spl-type-length-value 0.4.3", ] @@ -7776,7 +7776,7 @@ dependencies = [ "solana-program", "spl-discriminator 0.2.2", "spl-pod 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-program-error 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.4.1", "spl-type-length-value 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7913,7 +7913,7 @@ dependencies = [ "solana-program", "spl-discriminator 0.3.0", "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "spl-program-error 0.5.0", "spl-tlv-account-resolution 0.6.3", "spl-type-length-value 0.4.3", "tokio", @@ -7930,7 +7930,7 @@ dependencies = [ "solana-program", "spl-discriminator 0.2.2", "spl-pod 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-program-error 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.4.1", "spl-tlv-account-resolution 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "spl-type-length-value 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -7943,7 +7943,7 @@ dependencies = [ "solana-program", "spl-discriminator 0.3.0", "spl-pod 0.2.2", - "spl-program-error 0.4.1", + "spl-program-error 0.5.0", "spl-type-length-value-derive", ] @@ -7957,7 +7957,7 @@ dependencies = [ "solana-program", "spl-discriminator 0.2.2", "spl-pod 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "spl-program-error 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-program-error 0.4.1", ] [[package]] diff --git a/libraries/pod/Cargo.toml b/libraries/pod/Cargo.toml index 04099f02ecc..b2740baa306 100644 --- a/libraries/pod/Cargo.toml +++ b/libraries/pod/Cargo.toml @@ -18,7 +18,7 @@ bytemuck = { version = "1.16.1" } serde = { version = "1.0.203", optional = true } solana-program = "2.0.0" solana-zk-token-sdk = "2.0.0" -spl-program-error = { version = "0.4.0", path = "../program-error" } +spl-program-error = { version = "0.5.0", path = "../program-error" } [dev-dependencies] serde_json = "1.0.117" diff --git a/libraries/program-error/Cargo.toml b/libraries/program-error/Cargo.toml index c37f846a2c8..ae2c8adafa6 100644 --- a/libraries/program-error/Cargo.toml +++ b/libraries/program-error/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spl-program-error" -version = "0.4.1" +version = "0.5.0" description = "Library for Solana Program error attributes and derive macro for creating them" authors = ["Solana Labs Maintainers "] repository = "https://github.com/solana-labs/solana-program-library" diff --git a/libraries/tlv-account-resolution/Cargo.toml b/libraries/tlv-account-resolution/Cargo.toml index cbadd6c71e9..0993a1234b5 100644 --- a/libraries/tlv-account-resolution/Cargo.toml +++ b/libraries/tlv-account-resolution/Cargo.toml @@ -16,7 +16,7 @@ bytemuck = { version = "1.16.1", features = ["derive"] } serde = { version = "1.0.203", optional = true } solana-program = "2.0.0" spl-discriminator = { version = "0.3.0", path = "../discriminator" } -spl-program-error = { version = "0.4.0", path = "../program-error" } +spl-program-error = { version = "0.5.0", path = "../program-error" } spl-type-length-value = { version = "0.4.3", path = "../type-length-value" } spl-pod = { version = "0.2.2", path = "../pod" } diff --git a/libraries/type-length-value/Cargo.toml b/libraries/type-length-value/Cargo.toml index 4ef7fe8d87e..f2eb9cfaa1d 100644 --- a/libraries/type-length-value/Cargo.toml +++ b/libraries/type-length-value/Cargo.toml @@ -15,7 +15,7 @@ derive = ["dep:spl-type-length-value-derive"] bytemuck = { version = "1.16.1", features = ["derive"] } solana-program = "2.0.0" spl-discriminator = { version = "0.3.0", path = "../discriminator" } -spl-program-error = { version = "0.4.0", path = "../program-error" } +spl-program-error = { version = "0.5.0", path = "../program-error" } spl-type-length-value-derive = { version = "0.1", path = "./derive", optional = true } spl-pod = { version = "0.2.2", path = "../pod" } diff --git a/token-collection/program/Cargo.toml b/token-collection/program/Cargo.toml index a5ceded21c2..2018bd2e806 100644 --- a/token-collection/program/Cargo.toml +++ b/token-collection/program/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] solana-program = "2.0.0" spl-pod = { version = "0.2.2", path = "../../libraries/pod" } -spl-program-error = { version = "0.4.0" , path = "../../libraries/program-error" } +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-group-example = { version = "0.2", path = "../../token-group/example", features = ["no-entrypoint"] } spl-token-group-interface = { version = "0.2.3", path = "../../token-group/interface" } diff --git a/token-group/interface/Cargo.toml b/token-group/interface/Cargo.toml index 17cc1a3c2a8..13b2a313eff 100644 --- a/token-group/interface/Cargo.toml +++ b/token-group/interface/Cargo.toml @@ -12,7 +12,7 @@ bytemuck = "1.16.1" solana-program = "2.0.0" spl-discriminator = { version = "0.3.0" , path = "../../libraries/discriminator" } spl-pod = { version = "0.2.2" , path = "../../libraries/pod", features = ["borsh"] } -spl-program-error = { version = "0.4.0" , path = "../../libraries/program-error" } +spl-program-error = { version = "0.5.0" , path = "../../libraries/program-error" } [dev-dependencies] spl-type-length-value = { version = "0.4.3", path = "../../libraries/type-length-value", features = ["derive"] } diff --git a/token-metadata/interface/Cargo.toml b/token-metadata/interface/Cargo.toml index 3fd2b4e7981..721b5aee7ba 100644 --- a/token-metadata/interface/Cargo.toml +++ b/token-metadata/interface/Cargo.toml @@ -15,7 +15,7 @@ borsh = "1.5.1" serde = { version = "1.0.203", optional = true } solana-program = "2.0.0" spl-discriminator = { version = "0.3.0", path = "../../libraries/discriminator" } -spl-program-error = { version = "0.4.0", path = "../../libraries/program-error" } +spl-program-error = { version = "0.5.0", path = "../../libraries/program-error" } spl-type-length-value = { version = "0.4.3", path = "../../libraries/type-length-value" } spl-pod = { version = "0.2.2", path = "../../libraries/pod", features = [ "borsh", diff --git a/token/transfer-hook/interface/Cargo.toml b/token/transfer-hook/interface/Cargo.toml index 774b842304e..cc487f51b17 100644 --- a/token/transfer-hook/interface/Cargo.toml +++ b/token/transfer-hook/interface/Cargo.toml @@ -12,7 +12,7 @@ arrayref = "0.3.7" bytemuck = { version = "1.16.1", features = ["derive"] } solana-program = "2.0.0" spl-discriminator = { version = "0.3.0" , path = "../../../libraries/discriminator" } -spl-program-error = { version = "0.4.0" , path = "../../../libraries/program-error" } +spl-program-error = { version = "0.5.0" , path = "../../../libraries/program-error" } spl-tlv-account-resolution = { version = "0.6.3" , path = "../../../libraries/tlv-account-resolution" } spl-type-length-value = { version = "0.4.3" , path = "../../../libraries/type-length-value" } spl-pod = { version = "0.2.2", path = "../../../libraries/pod" }