diff --git a/Cargo.lock b/Cargo.lock index 0aaac540b..eac248b50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3502,6 +3502,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "num-derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e98dc3b890f6c23a0f9d3d491a2823d0dea0fa656302a13dd225fa924112a8" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.3", +] + [[package]] name = "num-integer" version = "0.1.46" @@ -4036,9 +4047,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" dependencies = [ "unicode-ident", ] @@ -5340,7 +5351,7 @@ dependencies = [ "bincode", "bytemuck", "log", - "num-derive", + "num-derive 0.4.2", "num-traits", "solana-feature-set", "solana-log-collector", @@ -6402,7 +6413,7 @@ dependencies = [ "log", "memoffset 0.9.0", "num-bigint 0.4.6", - "num-derive", + "num-derive 0.4.2", "num-traits", "parking_lot 0.12.0", "rand 0.8.5", @@ -6513,7 +6524,7 @@ dependencies = [ "itertools 0.12.1", "libc", "log", - "num-derive", + "num-derive 0.4.2", "num-traits", "percentage", "rand 0.8.5", @@ -6665,7 +6676,7 @@ dependencies = [ "dialoguer", "hidapi", "log", - "num-derive", + "num-derive 0.4.2", "num-traits", "parking_lot 0.12.0", "qstring", @@ -6840,7 +6851,7 @@ dependencies = [ "memmap2 0.5.10", "mockall", "modular-bitfield", - "num-derive", + "num-derive 0.4.2", "num-traits", "num_cpus", "num_enum", @@ -6945,7 +6956,7 @@ dependencies = [ "libsecp256k1", "log", "memmap2 0.5.10", - "num-derive", + "num-derive 0.4.2", "num-traits", "num_enum", "pbkdf2 0.11.0", @@ -7577,7 +7588,7 @@ checksum = "637cadc921725d1804a451ea7d2dff83310a12b75e0b6c83a8bb67ebc02d10f1" dependencies = [ "bincode", "log", - "num-derive", + "num-derive 0.4.2", "num-traits", "serde", "serde_derive", @@ -7619,7 +7630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47f5ac026a972c9cbc6bd0f72f692f85ff9ceec961fc4bcb1f2550e6387e962c" dependencies = [ "bytemuck", - "num-derive", + "num-derive 0.4.2", "num-traits", "solana-log-collector", "solana-program-runtime", @@ -7643,7 +7654,7 @@ dependencies = [ "js-sys", "lazy_static", "merlin", - "num-derive", + "num-derive 0.4.2", "num-traits", "rand 0.8.5", "serde", @@ -7666,7 +7677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83029f0fac09633fc4463dd5a7d13959d1825dccf77889c6e617e2b1265fb2f1" dependencies = [ "bytemuck", - "num-derive", + "num-derive 0.4.2", "num-traits", "solana-feature-set", "solana-log-collector", @@ -7691,7 +7702,7 @@ dependencies = [ "itertools 0.12.1", "lazy_static", "merlin", - "num-derive", + "num-derive 0.4.2", "num-traits", "rand 0.8.5", "serde", @@ -7754,7 +7765,7 @@ checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" dependencies = [ "assert_matches", "borsh 1.5.3", - "num-derive", + "num-derive 0.4.2", "num-traits", "solana-program", "spl-token 6.0.0", @@ -7767,7 +7778,7 @@ name = "spl-associated-token-account" version = "6.0.0" dependencies = [ "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "solana-program", "spl-associated-token-account-client", @@ -7803,7 +7814,7 @@ name = "spl-binary-oracle-pair" version = "0.1.0" dependencies = [ "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "solana-program", "solana-program-test", @@ -7992,7 +8003,7 @@ dependencies = [ "base64 0.22.1", "bincode", "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "proptest", "serde", @@ -8025,7 +8036,7 @@ dependencies = [ "assert_matches", "bincode", "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "proptest", "serde", @@ -8048,7 +8059,7 @@ dependencies = [ "assert_matches", "bincode", "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "proptest", "serde", @@ -8073,7 +8084,7 @@ dependencies = [ "bincode", "borsh 1.5.3", "lazy_static", - "num-derive", + "num-derive 0.5.1", "num-traits", "serde", "serde_derive", @@ -8091,7 +8102,7 @@ dependencies = [ "arrayref", "bincode", "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "serde", "serde_derive", @@ -8147,7 +8158,7 @@ name = "spl-math-example" version = "0.1.0" dependencies = [ "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "solana-program", "solana-program-test", @@ -8192,7 +8203,7 @@ name = "spl-name-service" version = "0.3.0" dependencies = [ "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "solana-program", "solana-program-test", @@ -8222,7 +8233,7 @@ dependencies = [ "borsh 1.5.3", "bytemuck", "bytemuck_derive", - "num-derive", + "num-derive 0.5.1", "num-traits", "serde", "serde_json", @@ -8241,7 +8252,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" dependencies = [ - "num-derive", + "num-derive 0.4.2", "num-traits", "solana-program", "spl-program-error-derive 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -8253,7 +8264,7 @@ name = "spl-program-error" version = "0.6.0" dependencies = [ "lazy_static", - "num-derive", + "num-derive 0.5.1", "num-traits", "serial_test", "solana-program", @@ -8289,7 +8300,7 @@ name = "spl-record" version = "0.3.0" dependencies = [ "bytemuck", - "num-derive", + "num-derive 0.5.1", "num-traits", "solana-account-info", "solana-decode-error", @@ -8323,7 +8334,7 @@ dependencies = [ "arrayref", "bincode", "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "num_enum", "rand 0.8.5", @@ -8380,7 +8391,7 @@ dependencies = [ "bytemuck", "generic-array 0.14.7", "lazy_static", - "num-derive", + "num-derive 0.5.1", "num-traits", "num_enum", "rand 0.8.5", @@ -8408,7 +8419,7 @@ dependencies = [ "bincode", "borsh 1.5.3", "bytemuck", - "num-derive", + "num-derive 0.5.1", "num-traits", "num_enum", "proptest", @@ -8473,7 +8484,7 @@ dependencies = [ "bytemuck", "futures 0.3.31", "futures-util", - "num-derive", + "num-derive 0.5.1", "num-traits", "serde", "solana-account-info", @@ -8500,7 +8511,7 @@ checksum = "70a0f06ac7f23dc0984931b1fe309468f14ea58e32660439c1cef19456f5d0e3" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.4.2", "num-traits", "num_enum", "solana-program", @@ -8514,7 +8525,7 @@ dependencies = [ "arrayref", "bytemuck", "lazy_static", - "num-derive", + "num-derive 0.5.1", "num-traits", "num_enum", "proptest", @@ -8533,7 +8544,7 @@ checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.4.2", "num-traits", "num_enum", "solana-program", @@ -8557,7 +8568,7 @@ dependencies = [ "base64 0.22.1", "bytemuck", "lazy_static", - "num-derive", + "num-derive 0.5.1", "num-traits", "num_enum", "proptest", @@ -8779,7 +8790,7 @@ name = "spl-token-group-interface" version = "0.5.0" dependencies = [ "bytemuck", - "num-derive", + "num-derive 0.5.1", "num-traits", "solana-decode-error", "solana-instruction", @@ -8800,7 +8811,7 @@ dependencies = [ "arrayref", "assert_matches", "bytemuck", - "num-derive", + "num-derive 0.5.1", "num-traits", "proptest", "solana-program", @@ -8860,7 +8871,7 @@ name = "spl-token-metadata-interface" version = "0.6.0" dependencies = [ "borsh 1.5.3", - "num-derive", + "num-derive 0.5.1", "num-traits", "serde", "serde_json", @@ -8884,7 +8895,7 @@ dependencies = [ "arbitrary", "arrayref", "enum_dispatch", - "num-derive", + "num-derive 0.5.1", "num-traits", "proptest", "roots", @@ -8913,7 +8924,7 @@ dependencies = [ name = "spl-token-upgrade" version = "0.1.1" dependencies = [ - "num-derive", + "num-derive 0.5.1", "num-traits", "num_enum", "solana-program", @@ -9075,7 +9086,7 @@ version = "0.9.0" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.5.1", "num-traits", "solana-account-info", "solana-cpi", @@ -9112,7 +9123,7 @@ name = "spl-type-length-value" version = "0.7.0" dependencies = [ "bytemuck", - "num-derive", + "num-derive 0.5.1", "num-traits", "solana-account-info", "solana-decode-error", @@ -9260,6 +9271,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.2" diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index 8360d217e..de9eeb20f 100644 --- a/associated-token-account/program/Cargo.toml +++ b/associated-token-account/program/Cargo.toml @@ -13,7 +13,7 @@ test-sbf = [] [dependencies] borsh = "1.5.3" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-program = "2.1.0" spl-associated-token-account-client = { version = "2.0.0", path = "../client" } diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml index 72d270629..763100fcd 100644 --- a/binary-oracle-pair/program/Cargo.toml +++ b/binary-oracle-pair/program/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" test-sbf = [] [dependencies] -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-program = "2.1.0" spl-token = { version = "7.0", path = "../../token/program", features = [ diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml index 589aa85ff..af2068e27 100644 --- a/governance/addin-mock/program/Cargo.toml +++ b/governance/addin-mock/program/Cargo.toml @@ -15,7 +15,7 @@ test-sbf = [] arrayref = "0.3.9" bincode = "1.3.2" borsh = "1.5.3" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" serde = "1.0.217" serde_derive = "1.0.103" diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml index 5e3b36e58..5c1c5a2bd 100644 --- a/governance/chat/program/Cargo.toml +++ b/governance/chat/program/Cargo.toml @@ -15,7 +15,7 @@ test-sbf = [] arrayref = "0.3.9" bincode = "1.3.2" borsh = "1.5.3" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" serde = "1.0.217" serde_derive = "1.0.103" diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml index e85f57e81..2e8e2bcdd 100644 --- a/governance/program/Cargo.toml +++ b/governance/program/Cargo.toml @@ -15,7 +15,7 @@ test-sbf = [] arrayref = "0.3.9" bincode = "1.3.2" borsh = "1.5.3" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" serde = "1.0.217" serde_derive = "1.0.103" diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml index af15d1fda..8c791eb90 100644 --- a/governance/test-sdk/Cargo.toml +++ b/governance/test-sdk/Cargo.toml @@ -12,7 +12,7 @@ arrayref = "0.3.9" bincode = "1.3.2" borsh = "1.5.3" lazy_static = "1.5.0" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" serde = "1.0.217" serde_derive = "1.0.103" diff --git a/governance/tools/Cargo.toml b/governance/tools/Cargo.toml index bf8cdedef..eccaf7db0 100644 --- a/governance/tools/Cargo.toml +++ b/governance/tools/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" arrayref = "0.3.9" bincode = "1.3.2" borsh = "1.5.3" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" serde = "1.0.217" serde_derive = "1.0.103" diff --git a/libraries/math-example/Cargo.toml b/libraries/math-example/Cargo.toml index fe6e99554..ad39a59c8 100644 --- a/libraries/math-example/Cargo.toml +++ b/libraries/math-example/Cargo.toml @@ -13,7 +13,7 @@ test-sbf = [] [dependencies] borsh = "1.5.3" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-program = "2.1.0" spl-math = { path = "../math", version = "0.3.0" } diff --git a/libraries/pod/Cargo.toml b/libraries/pod/Cargo.toml index ccfc8ba3b..36b394acc 100644 --- a/libraries/pod/Cargo.toml +++ b/libraries/pod/Cargo.toml @@ -15,7 +15,7 @@ borsh = ["dep:borsh"] borsh = { version = "1.5.3", optional = true } bytemuck = { version = "1.21.0" } bytemuck_derive = { version = "1.8.1" } -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" serde = { version = "1.0.217", optional = true } solana-decode-error = "2.1.0" diff --git a/libraries/program-error/Cargo.toml b/libraries/program-error/Cargo.toml index 352655dc3..deaccbcff 100644 --- a/libraries/program-error/Cargo.toml +++ b/libraries/program-error/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" edition = "2021" [dependencies] -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-program = "2.1.0" spl-program-error-derive = { version = "0.4.1", path = "./derive" } diff --git a/libraries/tlv-account-resolution/Cargo.toml b/libraries/tlv-account-resolution/Cargo.toml index e95642cd4..f1f797f93 100644 --- a/libraries/tlv-account-resolution/Cargo.toml +++ b/libraries/tlv-account-resolution/Cargo.toml @@ -13,7 +13,7 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.21.0", features = ["derive"] } -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" serde = { version = "1.0.217", optional = true } solana-account-info = "2.1.0" diff --git a/libraries/type-length-value/Cargo.toml b/libraries/type-length-value/Cargo.toml index 0ef918ebb..871d94136 100644 --- a/libraries/type-length-value/Cargo.toml +++ b/libraries/type-length-value/Cargo.toml @@ -13,7 +13,7 @@ derive = ["dep:spl-type-length-value-derive"] [dependencies] bytemuck = { version = "1.21.0", features = ["derive"] } -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-account-info = "2.1.0" solana-decode-error = "2.1.0" diff --git a/name-service/program/Cargo.toml b/name-service/program/Cargo.toml index 977b2e996..0ba64fe31 100644 --- a/name-service/program/Cargo.toml +++ b/name-service/program/Cargo.toml @@ -20,7 +20,7 @@ test-sbf = [] solana-program = "2.1.0" num-traits = "0.2" borsh = "1.5.3" -num-derive = "0.4.2" +num-derive = "0.5.1" thiserror = "2.0.9" [dev-dependencies] diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml index 5d9ebe6fc..4c78a0a0b 100644 --- a/record/program/Cargo.toml +++ b/record/program/Cargo.toml @@ -13,7 +13,7 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.21.0", features = ["derive"] } -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-account-info = "2.1.0" solana-decode-error = "2.1.0" diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml index f7c1dd9b1..5ff5e5b4f 100644 --- a/single-pool/program/Cargo.toml +++ b/single-pool/program/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] arrayref = "0.3.9" borsh = "1.5.3" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" num_enum = "0.7.3" solana-program = "2.1.0" diff --git a/slashing/program/Cargo.toml b/slashing/program/Cargo.toml index fd135217b..9ef0d69fa 100644 --- a/slashing/program/Cargo.toml +++ b/slashing/program/Cargo.toml @@ -17,7 +17,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] } num_enum = "0.7.3" generic-array = { version = "0.14.7", features = ["serde"], default-features = false } bincode = "1.3.3" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-program = "2.1.0" serde = "1.0.217" # must match the serde_derive version, see https://github.com/serde-rs/serde/issues/2584#issuecomment-1685252251 diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml index 59710cc25..8366f9ca8 100644 --- a/stake-pool/program/Cargo.toml +++ b/stake-pool/program/Cargo.toml @@ -15,7 +15,7 @@ test-sbf = [] arrayref = "0.3.9" borsh = "1.5.3" bytemuck = "1.21" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" num_enum = "0.7.3" serde = "1.0.217" diff --git a/token-group/interface/Cargo.toml b/token-group/interface/Cargo.toml index 49a7c6332..d0e71b14c 100644 --- a/token-group/interface/Cargo.toml +++ b/token-group/interface/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] bytemuck = "1.21.0" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-decode-error = "2.1.0" solana-instruction = "2.1.0" diff --git a/token-lending/program/Cargo.toml b/token-lending/program/Cargo.toml index bff11a1ed..1fdae7922 100644 --- a/token-lending/program/Cargo.toml +++ b/token-lending/program/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] arrayref = "0.3.9" bytemuck = "1.21.0" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-program = "2.1.0" spl-token = { version = "7.0", path = "../../token/program", features = [ "no-entrypoint" ] } diff --git a/token-metadata/interface/Cargo.toml b/token-metadata/interface/Cargo.toml index c904c15a9..6a8e73a60 100644 --- a/token-metadata/interface/Cargo.toml +++ b/token-metadata/interface/Cargo.toml @@ -12,7 +12,7 @@ serde-traits = ["dep:serde", "spl-pod/serde-traits"] [dependencies] borsh = "1.5.3" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" serde = { version = "1.0.217", optional = true } solana-borsh = "2.1.0" diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml index b56bbe2ae..02f299b6c 100644 --- a/token-swap/program/Cargo.toml +++ b/token-swap/program/Cargo.toml @@ -15,7 +15,7 @@ fuzz = ["arbitrary", "roots"] [dependencies] arrayref = "0.3.9" enum_dispatch = "0.3.13" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-program = "2.1.0" spl-math = { version = "0.3", path = "../../libraries/math" } diff --git a/token-upgrade/program/Cargo.toml b/token-upgrade/program/Cargo.toml index 939175faa..70a2f37b4 100644 --- a/token-upgrade/program/Cargo.toml +++ b/token-upgrade/program/Cargo.toml @@ -12,7 +12,7 @@ no-entrypoint = [] test-sbf = [] [dependencies] -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" num_enum = "0.7.3" solana-program = "2.1.0" diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml index a6b72df1a..af4b1c5aa 100644 --- a/token/program-2022/Cargo.toml +++ b/token/program-2022/Cargo.toml @@ -19,7 +19,7 @@ zk-ops = [] [dependencies] arrayref = "0.3.9" bytemuck = { version = "1.21.0", features = ["derive"] } -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" num_enum = "0.7.3" solana-program = "2.1.0" diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml index 72153f7eb..78cd47453 100644 --- a/token/program/Cargo.toml +++ b/token/program/Cargo.toml @@ -15,7 +15,7 @@ test-sbf = [] [dependencies] arrayref = "0.3.9" bytemuck = "1.21.0" -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" num_enum = "0.7.3" solana-program = "2.1.0" diff --git a/token/transfer-hook/interface/Cargo.toml b/token/transfer-hook/interface/Cargo.toml index c8b70cad6..c4cc0eb7a 100644 --- a/token/transfer-hook/interface/Cargo.toml +++ b/token/transfer-hook/interface/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] arrayref = "0.3.9" bytemuck = { version = "1.21.0", features = ["derive"] } -num-derive = "0.4" +num-derive = "0.5" num-traits = "0.2" solana-account-info = "2.1.0" solana-cpi = "2.1.0"