diff --git a/Cargo.lock b/Cargo.lock index 924a8f38..a88679cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,18 +53,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "arrayref" version = "0.3.9" @@ -122,39 +110,16 @@ dependencies = [ "generic-array", ] -[[package]] -name = "borsh" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115e54d64eb62cdebad391c19efc9dce4981c690c85a33a12199d99bb9546fee" -dependencies = [ - "borsh-derive 0.10.4", - "hashbrown 0.13.2", -] - [[package]] name = "borsh" version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" dependencies = [ - "borsh-derive 1.5.7", + "borsh-derive", "cfg_aliases", ] -[[package]] -name = "borsh-derive" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831213f80d9423998dd696e2c5345aba6be7a0bd8cd19e31c5243e13df1cef89" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "borsh-derive" version = "1.5.7" @@ -162,32 +127,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" dependencies = [ "once_cell", - "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", - "syn 2.0.106", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d6ba50644c98714aa2a70d13d7df3cd75cd2b523a2b452bf010443800976b3" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276691d96f063427be83e6692b86148e488ebba9f48f77788724ca027ba3b6d4" -dependencies = [ + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -231,7 +174,7 @@ checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -317,7 +260,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -447,7 +390,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -521,15 +464,6 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.15.2" @@ -552,7 +486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown", ] [[package]] @@ -683,7 +617,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -711,10 +645,10 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -809,15 +743,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", -] - [[package]] name = "proc-macro-crate" version = "3.2.0" @@ -993,7 +918,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1030,7 +955,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -1069,26 +994,15 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "solana-account-info" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" -dependencies = [ - "solana-program-error 2.2.2", - "solana-program-memory 2.2.1", - "solana-pubkey 2.4.0", -] - [[package]] name = "solana-account-info" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82f4691b69b172c687d218dd2f1f23fc7ea5e9aa79df9ac26dab3d8dd829ce48" dependencies = [ - "solana-program-error 3.0.0", - "solana-program-memory 3.0.0", - "solana-pubkey 3.0.0", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", ] [[package]] @@ -1097,26 +1011,18 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a7a457086457ea9db9a5199d719dc8734dc2d0342fad0d8f77633c31eb62f19" dependencies = [ - "borsh 1.5.7", + "borsh", "bytemuck", "bytemuck_derive", "curve25519-dalek", "five8", "five8_const", - "solana-atomic-u64 3.0.0", + "rand 0.8.5", + "solana-atomic-u64", "solana-define-syscall 3.0.0", - "solana-program-error 3.0.0", - "solana-sanitize 3.0.0", - "solana-sha256-hasher 3.0.0", -] - -[[package]] -name = "solana-atomic-u64" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" -dependencies = [ - "parking_lot", + "solana-program-error", + "solana-sanitize", + "solana-sha256-hasher", ] [[package]] @@ -1128,23 +1034,13 @@ dependencies = [ "parking_lot", ] -[[package]] -name = "solana-borsh" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" -dependencies = [ - "borsh 0.10.4", - "borsh 1.5.7", -] - [[package]] name = "solana-borsh" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc402b16657abbfa9991cd5cbfac5a11d809f7e7d28d3bb291baeb088b39060e" dependencies = [ - "borsh 1.5.7", + "borsh", ] [[package]] @@ -1153,39 +1049,30 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb62e9381182459a4520b5fe7fb22d423cae736239a6427fc398a88743d0ed59" dependencies = [ - "solana-sdk-ids 3.0.0", + "solana-sdk-ids", "solana-sdk-macro", - "solana-sysvar-id 3.0.0", + "solana-sysvar-id", ] [[package]] name = "solana-curve25519" -version = "2.2.0" +version = "2.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e46b297431ab5a67b99d9aba1e7cff16105e4d44e1c0b92c916935d86b2424" +checksum = "b162f50499b391b785d57b2f2c73e3b9754d88fd4894bef444960b00bda8dcca" dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek", - "solana-define-syscall 2.2.1", + "solana-define-syscall 2.3.0", "subtle", "thiserror 2.0.16", ] -[[package]] -name = "solana-decode-error" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a6a6383af236708048f8bd8d03db8ca4ff7baf4a48e5d580f4cce545925470" -dependencies = [ - "num-traits", -] - [[package]] name = "solana-define-syscall" -version = "2.2.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf784bb2cb3e02cac9801813c30187344228d2ae952534902108f6150573a33d" +checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" [[package]] name = "solana-define-syscall" @@ -1193,17 +1080,6 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9697086a4e102d28a156b8d6b521730335d6951bd39a5e766512bbe09007cee" -[[package]] -name = "solana-derivation-path" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" -dependencies = [ - "derivation-path", - "qstring", - "uriparse", -] - [[package]] name = "solana-derivation-path" version = "3.0.0" @@ -1221,10 +1097,10 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b319a4ed70390af911090c020571f0ff1f4ec432522d05ab89f5c08080381995" dependencies = [ - "solana-hash 3.0.0", - "solana-sdk-ids 3.0.0", + "solana-hash", + "solana-sdk-ids", "solana-sdk-macro", - "solana-sysvar-id 3.0.0", + "solana-sysvar-id", ] [[package]] @@ -1233,9 +1109,9 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e5481e72cc4d52c169db73e4c0cd16de8bc943078aac587ec4817a75cc6388f" dependencies = [ - "solana-sdk-ids 3.0.0", + "solana-sdk-ids", "solana-sdk-macro", - "solana-sysvar-id 3.0.0", + "solana-sysvar-id", ] [[package]] @@ -1247,19 +1123,6 @@ dependencies = [ "log", ] -[[package]] -name = "solana-hash" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf7bcb14392900fe02e4e34e90234fbf0c673d4e327888410ba99fa2ba0f4e99" -dependencies = [ - "bs58", - "js-sys", - "solana-atomic-u64 2.2.1", - "solana-sanitize 2.2.1", - "wasm-bindgen", -] - [[package]] name = "solana-hash" version = "3.0.0" @@ -1269,22 +1132,8 @@ dependencies = [ "bytemuck", "bytemuck_derive", "five8", - "solana-atomic-u64 3.0.0", - "solana-sanitize 3.0.0", -] - -[[package]] -name = "solana-instruction" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47298e2ce82876b64f71e9d13a46bc4b9056194e7f9937ad3084385befa50885" -dependencies = [ - "getrandom 0.2.15", - "js-sys", - "num-traits", - "solana-define-syscall 2.2.1", - "solana-pubkey 2.4.0", - "wasm-bindgen", + "solana-atomic-u64", + "solana-sanitize", ] [[package]] @@ -1295,7 +1144,7 @@ checksum = "8df4e8fcba01d7efa647ed20a081c234475df5e11a93acb4393cc2c9a7b99bab" dependencies = [ "solana-define-syscall 3.0.0", "solana-instruction-error", - "solana-pubkey 3.0.0", + "solana-pubkey", ] [[package]] @@ -1305,24 +1154,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1f0d483b8ae387178d9210e0575b666b05cdd4bd0f2f188128249f6e454d39d" dependencies = [ "num-traits", - "solana-program-error 3.0.0", + "solana-program-error", ] [[package]] name = "solana-instructions-sysvar" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427f2d0d6dc0bb49f16cef5e7f975180d2e80aab9bdd3b2af68e2d029ec63f43" +checksum = "7ddf67876c541aa1e21ee1acae35c95c6fbc61119814bfef70579317a5e26955" dependencies = [ "bitflags", - "solana-account-info 2.3.0", - "solana-instruction 2.3.0", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "solana-sanitize 2.2.1", - "solana-sdk-ids 2.2.1", + "solana-account-info", + "solana-instruction", + "solana-instruction-error", + "solana-program-error", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", "solana-serialize-utils", - "solana-sysvar-id 2.2.1", + "solana-sysvar-id", ] [[package]] @@ -1331,18 +1181,9 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcda154ec827f5fc1e4da0af3417951b7e9b8157540f81f936c4a8b1156134d0" dependencies = [ - "solana-sdk-ids 3.0.0", + "solana-sdk-ids", "solana-sdk-macro", - "solana-sysvar-id 3.0.0", -] - -[[package]] -name = "solana-msg" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" -dependencies = [ - "solana-define-syscall 2.2.1", + "solana-sysvar-id", ] [[package]] @@ -1360,25 +1201,11 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb61aaf3bf54b69721fbaadb0942cfd41f608cf279e514c1362264a24e469a9e" dependencies = [ - "solana-account-info 3.0.0", + "solana-account-info", "solana-define-syscall 3.0.0", - "solana-msg 3.0.0", - "solana-program-error 3.0.0", - "solana-pubkey 3.0.0", -] - -[[package]] -name = "solana-program-error" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee2e0217d642e2ea4bee237f37bd61bb02aec60da3647c48ff88f6556ade775" -dependencies = [ - "borsh 1.5.7", - "num-traits", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-pubkey 2.4.0", + "solana-msg", + "solana-program-error", + "solana-pubkey", ] [[package]] @@ -1387,17 +1214,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1af32c995a7b692a915bb7414d5f8e838450cf7c70414e763d8abcae7b51f28" dependencies = [ - "borsh 1.5.7", -] - -[[package]] -name = "solana-program-memory" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0268f6c89825fb634a34bd0c3b8fdaeaecfc3728be1d622a8ee6dd577b60d4" -dependencies = [ - "num-traits", - "solana-define-syscall 2.2.1", + "borsh", ] [[package]] @@ -1409,12 +1226,6 @@ dependencies = [ "solana-define-syscall 3.0.0", ] -[[package]] -name = "solana-program-option" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" - [[package]] name = "solana-program-option" version = "3.0.0" @@ -1423,35 +1234,11 @@ checksum = "8e7b4ddb464f274deb4a497712664c3b612e3f5f82471d4e47710fc4ab1c3095" [[package]] name = "solana-program-pack" -version = "2.2.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" +checksum = "c169359de21f6034a63ebf96d6b380980307df17a8d371344ff04a883ec4e9d0" dependencies = [ - "solana-program-error 2.2.2", -] - -[[package]] -name = "solana-pubkey" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b62adb9c3261a052ca1f999398c388f1daf558a1b492f60a6d9e64857db4ff1" -dependencies = [ - "borsh 0.10.4", - "borsh 1.5.7", - "bytemuck", - "bytemuck_derive", - "five8", - "five8_const", - "getrandom 0.2.15", - "js-sys", - "num-traits", - "rand 0.8.5", - "solana-atomic-u64 2.2.1", - "solana-decode-error", - "solana-define-syscall 2.2.1", - "solana-sanitize 2.2.1", - "solana-sha256-hasher 2.3.0", - "wasm-bindgen", + "solana-program-error", ] [[package]] @@ -1460,6 +1247,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8909d399deb0851aa524420beeb5646b115fd253ef446e35fe4504c904da3941" dependencies = [ + "rand 0.8.5", "solana-address", ] @@ -1469,39 +1257,24 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b702d8c43711e3c8a9284a4f1bbc6a3de2553deb25b0c8142f9a44ef0ce5ddc1" dependencies = [ - "solana-sdk-ids 3.0.0", + "solana-sdk-ids", "solana-sdk-macro", - "solana-sysvar-id 3.0.0", + "solana-sysvar-id", ] -[[package]] -name = "solana-sanitize" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" - [[package]] name = "solana-sanitize" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927e833259588ac8f860861db0f6e2668c3cc46d917798ade116858960acfe8a" -[[package]] -name = "solana-sdk-ids" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" -dependencies = [ - "solana-pubkey 2.4.0", -] - [[package]] name = "solana-sdk-ids" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1b6d6aaf60669c592838d382266b173881c65fb1cdec83b37cb8ce7cb89f9ad" dependencies = [ - "solana-pubkey 3.0.0", + "solana-pubkey", ] [[package]] @@ -1513,16 +1286,7 @@ dependencies = [ "bs58", "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "solana-seed-derivable" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beb82b5adb266c6ea90e5cf3967235644848eac476c5a1f2f9283a143b7c97f" -dependencies = [ - "solana-derivation-path 2.2.1", + "syn", ] [[package]] @@ -1531,18 +1295,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff7bdb72758e3bec33ed0e2658a920f1f35dfb9ed576b951d20d63cb61ecd95c" dependencies = [ - "solana-derivation-path 3.0.0", -] - -[[package]] -name = "solana-seed-phrase" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36187af2324f079f65a675ec22b31c24919cb4ac22c79472e85d819db9bbbc15" -dependencies = [ - "hmac", - "pbkdf2", - "sha2", + "solana-derivation-path", ] [[package]] @@ -1558,24 +1311,13 @@ dependencies = [ [[package]] name = "solana-serialize-utils" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" -dependencies = [ - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sanitize 2.2.1", -] - -[[package]] -name = "solana-sha256-hasher" -version = "2.3.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa3feb32c28765f6aa1ce8f3feac30936f16c5c3f7eb73d63a5b8f6f8ecdc44" +checksum = "e7665da4f6e07b58c93ef6aaf9fb6a923fd11b0922ffc53ba74c3cadfa490f26" dependencies = [ - "sha2", - "solana-define-syscall 2.2.1", - "solana-hash 2.2.1", + "solana-instruction-error", + "solana-pubkey", + "solana-sanitize", ] [[package]] @@ -1586,17 +1328,7 @@ checksum = "a9b912ba6f71cb202c0c3773ec77bf898fa9fe0c78691a2d6859b3b5b8954719" dependencies = [ "sha2", "solana-define-syscall 3.0.0", - "solana-hash 3.0.0", -] - -[[package]] -name = "solana-signature" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" -dependencies = [ - "five8", - "solana-sanitize 2.2.1", + "solana-hash", ] [[package]] @@ -1606,18 +1338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19bb713a132fe904caa1f86c331d32846048ae517a3ebf52b068ed07a33070db" dependencies = [ "five8", - "solana-sanitize 3.0.0", -] - -[[package]] -name = "solana-signer" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" -dependencies = [ - "solana-pubkey 2.4.0", - "solana-signature 2.3.0", - "solana-transaction-error 2.2.1", + "solana-sanitize", ] [[package]] @@ -1626,9 +1347,9 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bfea97951fee8bae0d6038f39a5efcb6230ecdfe33425ac75196d1a1e3e3235" dependencies = [ - "solana-pubkey 3.0.0", - "solana-signature 3.0.0", - "solana-transaction-error 3.0.0", + "solana-pubkey", + "solana-signature", + "solana-transaction-error", ] [[package]] @@ -1637,9 +1358,9 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80a293f952293281443c04f4d96afd9d547721923d596e92b4377ed2360f1746" dependencies = [ - "solana-hash 3.0.0", - "solana-sdk-ids 3.0.0", - "solana-sysvar-id 3.0.0", + "solana-hash", + "solana-sdk-ids", + "solana-sysvar-id", ] [[package]] @@ -1649,8 +1370,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f914f6b108f5bba14a280b458d023e3621c9973f27f015a4d755b50e88d89e97" dependencies = [ "bv", - "solana-sdk-ids 3.0.0", - "solana-sysvar-id 3.0.0", + "solana-sdk-ids", + "solana-sysvar-id", ] [[package]] @@ -1661,35 +1382,25 @@ checksum = "63205e68d680bcc315337dec311b616ab32fea0a612db3b883ce4de02e0953f9" dependencies = [ "base64", "lazy_static", - "solana-account-info 3.0.0", + "solana-account-info", "solana-clock", "solana-define-syscall 3.0.0", "solana-epoch-rewards", "solana-epoch-schedule", "solana-fee-calculator", - "solana-hash 3.0.0", - "solana-instruction 3.0.0", + "solana-hash", + "solana-instruction", "solana-last-restart-slot", "solana-program-entrypoint", - "solana-program-error 3.0.0", - "solana-program-memory 3.0.0", - "solana-pubkey 3.0.0", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", "solana-rent", - "solana-sdk-ids 3.0.0", + "solana-sdk-ids", "solana-sdk-macro", "solana-slot-hashes", "solana-slot-history", - "solana-sysvar-id 3.0.0", -] - -[[package]] -name = "solana-sysvar-id" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" -dependencies = [ - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", + "solana-sysvar-id", ] [[package]] @@ -1698,18 +1409,8 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5051bc1a16d5d96a96bc33b5b2ec707495c48fe978097bdaba68d3c47987eb32" dependencies = [ - "solana-pubkey 3.0.0", - "solana-sdk-ids 3.0.0", -] - -[[package]] -name = "solana-transaction-error" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" -dependencies = [ - "solana-instruction 2.3.0", - "solana-sanitize 2.2.1", + "solana-pubkey", + "solana-sdk-ids", ] [[package]] @@ -1719,43 +1420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4222065402340d7e6aec9dc3e54d22992ddcf923d91edcd815443c2bfca3144a" dependencies = [ "solana-instruction-error", - "solana-sanitize 3.0.0", -] - -[[package]] -name = "solana-zk-sdk" -version = "2.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05857892ac50fe03c125d8445fd790c6768015b76f4ad1e4b4b1499938b357f0" -dependencies = [ - "aes-gcm-siv", - "base64", - "bincode", - "bytemuck", - "bytemuck_derive", - "curve25519-dalek", - "itertools", - "js-sys", - "merlin", - "num-derive", - "num-traits", - "rand 0.8.5", - "serde", - "serde_derive", - "serde_json", - "sha3", - "solana-derivation-path 2.2.1", - "solana-instruction 2.3.0", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-seed-derivable 2.2.1", - "solana-seed-phrase 2.2.1", - "solana-signature 2.3.0", - "solana-signer 2.2.1", - "subtle", - "thiserror 2.0.16", - "wasm-bindgen", - "zeroize", + "solana-sanitize", ] [[package]] @@ -1781,14 +1446,14 @@ dependencies = [ "serde_derive", "serde_json", "sha3", - "solana-derivation-path 3.0.0", - "solana-instruction 3.0.0", - "solana-pubkey 3.0.0", - "solana-sdk-ids 3.0.0", - "solana-seed-derivable 3.0.0", - "solana-seed-phrase 3.0.0", - "solana-signature 3.0.0", - "solana-signer 3.0.0", + "solana-derivation-path", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", "subtle", "thiserror 2.0.16", "wasm-bindgen", @@ -1797,26 +1462,26 @@ dependencies = [ [[package]] name = "spl-discriminator" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7398da23554a31660f17718164e31d31900956054f54f52d5ec1be51cb4f4b3" +version = "0.5.1" dependencies = [ + "borsh", "bytemuck", - "solana-program-error 2.2.2", - "solana-sha256-hasher 2.3.0", - "spl-discriminator-derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "solana-program-error", + "solana-sha256-hasher", + "spl-discriminator 0.5.1", + "spl-discriminator-derive 0.2.0", ] [[package]] name = "spl-discriminator" version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cc11459e265d5b501534144266620289720b4c44522a47bc6b63cd295d2f3" dependencies = [ - "borsh 1.5.7", "bytemuck", - "solana-program-error 3.0.0", - "solana-sha256-hasher 3.0.0", - "spl-discriminator 0.5.1", - "spl-discriminator-derive 0.2.0", + "solana-program-error", + "solana-sha256-hasher", + "spl-discriminator-derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1825,7 +1490,7 @@ version = "0.2.0" dependencies = [ "quote", "spl-discriminator-syn 0.2.1", - "syn 2.0.106", + "syn", ] [[package]] @@ -1836,7 +1501,7 @@ checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" dependencies = [ "quote", "spl-discriminator-syn 0.2.0", - "syn 2.0.106", + "syn", ] [[package]] @@ -1848,7 +1513,7 @@ dependencies = [ "proc-macro2", "quote", "sha2", - "syn 2.0.106", + "syn", "thiserror 1.0.69", ] @@ -1859,7 +1524,7 @@ dependencies = [ "proc-macro2", "quote", "sha2", - "syn 2.0.106", + "syn", "thiserror 2.0.16", ] @@ -1868,7 +1533,7 @@ name = "spl-generic-token" version = "2.0.1" dependencies = [ "bytemuck", - "solana-pubkey 3.0.0", + "solana-pubkey", ] [[package]] @@ -1877,7 +1542,7 @@ version = "0.0.0" dependencies = [ "rand 0.9.2", "solana-program-pack", - "solana-pubkey 2.4.0", + "solana-pubkey", "spl-generic-token", "spl-token-2022-interface", "spl-token-interface", @@ -1886,41 +1551,40 @@ dependencies = [ [[package]] name = "spl-pod" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d994afaf86b779104b4a95ba9ca75b8ced3fdb17ee934e38cb69e72afbe17799" +version = "0.7.1" dependencies = [ - "borsh 1.5.7", + "base64", + "borsh", "bytemuck", "bytemuck_derive", "num-derive", "num-traits", - "solana-decode-error", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-program-option 2.2.1", - "solana-pubkey 2.4.0", - "solana-zk-sdk 2.3.6", + "num_enum", + "serde", + "serde_json", + "solana-program-error", + "solana-program-option", + "solana-pubkey", + "solana-zk-sdk", "thiserror 2.0.16", ] [[package]] name = "spl-pod" version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1233fdecd7461611d69bb87bc2e95af742df47291975d21232a0be8217da9de" dependencies = [ - "base64", - "borsh 1.5.7", + "borsh", "bytemuck", "bytemuck_derive", "num-derive", "num-traits", "num_enum", - "serde", - "serde_json", - "solana-program-error 3.0.0", - "solana-program-option 3.0.0", - "solana-pubkey 3.0.0", - "solana-zk-sdk 4.0.0", + "solana-program-error", + "solana-program-option", + "solana-pubkey", + "solana-zk-sdk", "thiserror 2.0.16", ] @@ -1933,9 +1597,9 @@ dependencies = [ "num-traits", "num_enum", "serial_test", - "solana-msg 3.0.0", - "solana-program-error 3.0.0", - "solana-sha256-hasher 3.0.0", + "solana-msg", + "solana-program-error", + "solana-sha256-hasher", "solana-sysvar", "spl-program-error-derive", "thiserror 2.0.16", @@ -1948,7 +1612,7 @@ dependencies = [ "proc-macro2", "quote", "sha2", - "syn 2.0.106", + "syn", ] [[package]] @@ -1962,10 +1626,10 @@ dependencies = [ "num-traits", "num_enum", "serde", - "solana-account-info 3.0.0", - "solana-instruction 3.0.0", - "solana-program-error 3.0.0", - "solana-pubkey 3.0.0", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", "spl-discriminator 0.5.1", "spl-pod 0.7.1", "spl-program-error", @@ -1976,157 +1640,152 @@ dependencies = [ [[package]] name = "spl-token-2022-interface" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62d7ae2ee6b856f8ddcbdc3b3a9f4d2141582bbe150f93e5298ee97e0251fa04" +checksum = "0888304af6b3d839e435712e6c84025e09513017425ff62045b6b8c41feb77d9" dependencies = [ "arrayref", "bytemuck", "num-derive", "num-traits", "num_enum", - "solana-account-info 2.3.0", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-program-option 2.2.1", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-program-option", "solana-program-pack", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-zk-sdk 2.3.6", - "spl-pod 0.5.1", + "solana-pubkey", + "solana-sdk-ids", + "solana-zk-sdk", + "spl-pod 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "spl-token-confidential-transfer-proof-extraction", "spl-token-confidential-transfer-proof-generation", "spl-token-group-interface", "spl-token-metadata-interface", - "spl-type-length-value 0.8.0", + "spl-type-length-value 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 2.0.16", ] [[package]] name = "spl-token-confidential-transfer-proof-extraction" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bedc4675c80409a004da46978674e4073c65c4b1c611bf33d120381edeffe036" +checksum = "7a22217af69b7a61ca813f47c018afb0b00b02a74a4c70ff099cd4287740bc3d" dependencies = [ "bytemuck", - "solana-account-info 2.3.0", + "solana-account-info", "solana-curve25519", - "solana-instruction 2.3.0", + "solana-instruction", "solana-instructions-sysvar", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", - "solana-zk-sdk 2.3.6", - "spl-pod 0.5.1", + "solana-msg", + "solana-program-error", + "solana-pubkey", + "solana-sdk-ids", + "solana-zk-sdk", + "spl-pod 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 2.0.16", ] [[package]] name = "spl-token-confidential-transfer-proof-generation" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae5b124840d4aed474cef101d946a798b806b46a509ee4df91021e1ab1cef3ef" +checksum = "f63a2b41095945dc15274b924b21ccae9b3ec9dc2fdd43dbc08de8c33bbcd915" dependencies = [ "curve25519-dalek", - "solana-zk-sdk 2.3.6", + "solana-zk-sdk", "thiserror 2.0.16", ] [[package]] name = "spl-token-group-interface" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5597b4cd76f85ce7cd206045b7dc22da8c25516573d42d267c8d1fd128db5129" +checksum = "452d0f758af20caaa10d9a6f7608232e000d4c74462f248540b3d2ddfa419776" dependencies = [ "bytemuck", "num-derive", "num-traits", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "spl-discriminator 0.4.1", - "spl-pod 0.5.1", + "num_enum", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "spl-discriminator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-pod 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 2.0.16", ] [[package]] name = "spl-token-interface" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e0c2d4e38ef5834cf7fb1b592b8a8c6eab8485f5ac7a04a151b502c63a0aaa" +checksum = "8c564ac05a7c8d8b12e988a37d82695b5ba4db376d07ea98bc4882c81f96c7f3" dependencies = [ "arrayref", "bytemuck", "num-derive", "num-traits", "num_enum", - "solana-instruction 2.3.0", - "solana-program-error 2.2.2", - "solana-program-option 2.2.1", + "solana-instruction", + "solana-program-error", + "solana-program-option", "solana-program-pack", - "solana-pubkey 2.4.0", - "solana-sdk-ids 2.2.1", + "solana-pubkey", + "solana-sdk-ids", "thiserror 2.0.16", ] [[package]] name = "spl-token-metadata-interface" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304d6e06f0de0c13a621464b1fd5d4b1bebf60d15ca71a44d3839958e0da16ee" +checksum = "9c467c7c3bd056f8fe60119e7ec34ddd6f23052c2fa8f1f51999098063b72676" dependencies = [ - "borsh 1.5.7", + "borsh", "num-derive", "num-traits", - "solana-borsh 2.2.1", - "solana-decode-error", - "solana-instruction 2.3.0", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "solana-pubkey 2.4.0", - "spl-discriminator 0.4.1", - "spl-pod 0.5.1", - "spl-type-length-value 0.8.0", + "solana-borsh", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "spl-discriminator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-pod 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-type-length-value 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 2.0.16", ] [[package]] name = "spl-type-length-value" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d417eb548214fa822d93f84444024b4e57c13ed6719d4dcc68eec24fb481e9f5" +version = "0.9.0" dependencies = [ "bytemuck", "num-derive", "num-traits", - "solana-account-info 2.3.0", - "solana-decode-error", - "solana-msg 2.2.1", - "solana-program-error 2.2.2", - "spl-discriminator 0.4.1", - "spl-pod 0.5.1", + "num_enum", + "solana-account-info", + "solana-msg", + "solana-program-error", + "spl-discriminator 0.5.1", + "spl-pod 0.7.1", + "spl-type-length-value-derive", "thiserror 2.0.16", ] [[package]] name = "spl-type-length-value" version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca20a1a19f4507a98ca4b28ff5ed54cac9b9d34ed27863e2bde50a3238f9a6ac" dependencies = [ "bytemuck", "num-derive", "num-traits", "num_enum", - "solana-account-info 3.0.0", - "solana-msg 3.0.0", - "solana-program-error 3.0.0", - "spl-discriminator 0.5.1", - "spl-pod 0.7.1", - "spl-type-length-value-derive", + "solana-account-info", + "solana-msg", + "solana-program-error", + "spl-discriminator 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "spl-pod 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror 2.0.16", ] @@ -2136,15 +1795,15 @@ version = "0.2.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] name = "spl-type-length-value-derive-test" version = "0.1.0" dependencies = [ - "borsh 1.5.7", - "solana-borsh 3.0.0", + "borsh", + "solana-borsh", "spl-discriminator 0.5.1", "spl-type-length-value 0.9.0", ] @@ -2155,17 +1814,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.106" @@ -2195,7 +1843,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2206,7 +1854,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", "test-case-core", ] @@ -2236,7 +1884,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2247,7 +1895,7 @@ checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2288,16 +1936,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", + "syn", ] [[package]] @@ -2392,7 +2031,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.106", + "syn", "wasm-bindgen-shared", ] @@ -2414,7 +2053,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2537,7 +2176,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] [[package]] @@ -2557,5 +2196,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.106", + "syn", ] diff --git a/generic-token-tests/Cargo.toml b/generic-token-tests/Cargo.toml index 43718960..39a738a6 100644 --- a/generic-token-tests/Cargo.toml +++ b/generic-token-tests/Cargo.toml @@ -14,10 +14,10 @@ edition = "2021" [dev-dependencies] rand = "0.9.2" spl-generic-token = { path = "../generic-token" } -spl-token-interface = "1.0.0" -spl-token-2022-interface = "1.0.0" -solana-program-pack = "2.2.1" -solana-pubkey = { version = "2.2.1", features = [ +spl-token-interface = "2.0.0" +spl-token-2022-interface = "2.0.0" +solana-program-pack = "3.0.0" +solana-pubkey = { version = "3.0.0", features = [ "rand", ] } test-case = "3.3.1"