diff --git a/Cargo.lock b/Cargo.lock index 94bc5de..7d28335 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 4 +version = 3 [[package]] name = "Inflector" @@ -29,30 +29,30 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aead" -version = "0.5.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ - "crypto-common", "generic-array", ] [[package]] name = "aes" -version = "0.8.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", "cipher", "cpufeatures", + "opaque-debug", ] [[package]] name = "aes-gcm-siv" -version = "0.11.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" +checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" dependencies = [ "aead", "aes", @@ -65,9 +65,20 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.11" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom 0.2.15", + "once_cell", + "version_check", +] + +[[package]] +name = "ahash" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "72832d73be48bac96a5d7944568f305d829ed55b0ce3b483647089dfaf6cf704" dependencies = [ "cfg-if", "getrandom 0.2.15", @@ -100,6 +111,324 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "anchor-attribute-access-control" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf7d535e1381be3de2c0716c0a1c1e32ad9df1042cddcf7bc18d743569e53319" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "proc-macro2 1.0.92", + "quote 1.0.38", + "regex", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-access-control" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa5be5b72abea167f87c868379ba3c2be356bfca9e6f474fd055fa0f7eeb4f2" +dependencies = [ + "anchor-syn 0.28.0", + "anyhow", + "proc-macro2 1.0.92", + "quote 1.0.38", + "regex", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-account" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3bcd731f21048a032be27c7791701120e44f3f6371358fc4261a7f716283d29" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "bs58 0.4.0", + "proc-macro2 1.0.92", + "quote 1.0.38", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-account" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f468970344c7c9f9d03b4da854fd7c54f21305059f53789d0045c1dd803f0018" +dependencies = [ + "anchor-syn 0.28.0", + "anyhow", + "bs58 0.5.1", + "proc-macro2 1.0.92", + "quote 1.0.38", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-constant" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1be64a48e395fe00b8217287f226078be2cf32dae42fdf8a885b997945c3d28" +dependencies = [ + "anchor-syn 0.26.0", + "proc-macro2 1.0.92", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-constant" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59948e7f9ef8144c2aefb3f32a40c5fce2798baeec765ba038389e82301017ef" +dependencies = [ + "anchor-syn 0.28.0", + "proc-macro2 1.0.92", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-error" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38ea6713d1938c0da03656ff8a693b17dc0396da66d1ba320557f07e86eca0d4" +dependencies = [ + "anchor-syn 0.26.0", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-error" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc753c9d1c7981cb8948cf7e162fb0f64558999c0413058e2d43df1df5448086" +dependencies = [ + "anchor-syn 0.28.0", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-event" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d401f11efb3644285685f8339829a9786d43ed7490bb1699f33c478d04d5a582" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-event" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38b4e172ba1b52078f53fdc9f11e3dc0668ad27997838a0aad2d148afac8c97" +dependencies = [ + "anchor-syn 0.28.0", + "anyhow", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-interface" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6700a6f5c888a9c33fe8afc0c64fd8575fa28d05446037306d0f96102ae4480" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "heck 0.3.3", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-program" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ad769993b5266714e8939e47fbdede90e5c030333c7522d99a4d4748cf26712" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-program" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eebd21543606ab61e2d83d9da37d24d3886a49f390f9c43a1964735e8c0f0d5" +dependencies = [ + "anchor-syn 0.28.0", + "anyhow", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-attribute-state" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e677fae4a016a554acdd0e3b7f178d3acafaa7e7ffac6b8690cf4e171f1c116" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-derive-accounts" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340beef6809d1c3fcc7ae219153d981e95a8a277ff31985bd7050e32645dc9a8" +dependencies = [ + "anchor-syn 0.26.0", + "anyhow", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-derive-accounts" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4720d899b3686396cced9508f23dab420f1308344456ec78ef76f98fda42af" +dependencies = [ + "anchor-syn 0.28.0", + "anyhow", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-derive-space" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f495e85480bd96ddeb77b71d499247c7d4e8b501e75ecb234e9ef7ae7bd6552a" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "anchor-lang" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "662ceafe667448ee4199a4be2ee83b6bb76da28566eee5cea05f96ab38255af8" +dependencies = [ + "anchor-attribute-access-control 0.26.0", + "anchor-attribute-account 0.26.0", + "anchor-attribute-constant 0.26.0", + "anchor-attribute-error 0.26.0", + "anchor-attribute-event 0.26.0", + "anchor-attribute-interface", + "anchor-attribute-program 0.26.0", + "anchor-attribute-state", + "anchor-derive-accounts 0.26.0", + "arrayref", + "base64 0.13.1", + "bincode", + "borsh 0.9.3", + "bytemuck", + "solana-program 1.16.27", + "thiserror", +] + +[[package]] +name = "anchor-lang" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d2d4b20100f1310a774aba3471ef268e5c4ba4d5c28c0bbe663c2658acbc414" +dependencies = [ + "anchor-attribute-access-control 0.28.0", + "anchor-attribute-account 0.28.0", + "anchor-attribute-constant 0.28.0", + "anchor-attribute-error 0.28.0", + "anchor-attribute-event 0.28.0", + "anchor-attribute-program 0.28.0", + "anchor-derive-accounts 0.28.0", + "anchor-derive-space", + "arrayref", + "base64 0.13.1", + "bincode", + "borsh 0.10.4", + "bytemuck", + "getrandom 0.2.15", + "solana-program 1.16.27", + "thiserror", +] + +[[package]] +name = "anchor-spl" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78f860599da1c2354e7234c768783049eb42e2f54509ecfc942d2e0076a2da7b" +dependencies = [ + "anchor-lang 0.28.0", + "solana-program 1.16.27", + "spl-associated-token-account 1.1.3", + "spl-token 3.5.0", + "spl-token-2022 0.6.1", +] + +[[package]] +name = "anchor-syn" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0418bcb5daac3b8cb1b60d8fdb1d468ca36f5509f31fb51179326fae1028fdcc" +dependencies = [ + "anyhow", + "bs58 0.3.1", + "heck 0.3.3", + "proc-macro2 1.0.92", + "proc-macro2-diagnostics", + "quote 1.0.38", + "serde", + "serde_json", + "sha2 0.9.9", + "syn 1.0.109", + "thiserror", +] + +[[package]] +name = "anchor-syn" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a125e4b0cc046cfec58f5aa25038e34cf440151d58f0db3afc55308251fe936d" +dependencies = [ + "anyhow", + "bs58 0.5.1", + "heck 0.3.3", + "proc-macro2 1.0.92", + "quote 1.0.38", + "serde", + "serde_json", + "sha2 0.10.8", + "syn 1.0.109", + "thiserror", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -115,6 +444,15 @@ dependencies = [ "libc", ] +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + [[package]] name = "anstream" version = "0.6.18" @@ -224,7 +562,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" dependencies = [ - "quote", + "quote 1.0.38", "syn 1.0.109", ] @@ -236,8 +574,8 @@ checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ "num-bigint 0.4.6", "num-traits", - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 1.0.109", ] @@ -272,8 +610,8 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 1.0.109", ] @@ -287,6 +625,12 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "array-bytes" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad284aeb45c13f2fb4f084de4a420ebf447423bdf9386c0540ce33cb3ef4b8c" + [[package]] name = "arrayref" version = "0.3.9" @@ -317,7 +661,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror 1.0.69", + "thiserror", "time", ] @@ -327,8 +671,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 1.0.109", "synstructure 0.12.6", ] @@ -339,11 +683,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 1.0.109", ] +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + [[package]] name = "async-channel" version = "1.9.0" @@ -351,7 +701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener", "futures-core", ] @@ -370,14 +720,12 @@ dependencies = [ ] [[package]] -name = "async-lock" -version = "3.4.0" +name = "async-mutex" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", - "pin-project-lite", + "event-listener", ] [[package]] @@ -386,8 +734,8 @@ version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -397,6 +745,17 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.4.0" @@ -442,6 +801,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "bincode" version = "1.3.3" @@ -466,6 +831,15 @@ dependencies = [ "serde", ] +[[package]] +name = "bitmaps" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +dependencies = [ + "typenum", +] + [[package]] name = "blake3" version = "1.5.5" @@ -486,6 +860,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ + "block-padding", "generic-array", ] @@ -498,6 +873,22 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-padding" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" + +[[package]] +name = "borsh" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" +dependencies = [ + "borsh-derive 0.9.3", + "hashbrown 0.11.2", +] + [[package]] name = "borsh" version = "0.10.4" @@ -518,16 +909,29 @@ dependencies = [ "cfg_aliases", ] +[[package]] +name = "borsh-derive" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" +dependencies = [ + "borsh-derive-internal 0.9.3", + "borsh-schema-derive-internal 0.9.3", + "proc-macro-crate 0.1.5", + "proc-macro2 1.0.92", + "syn 1.0.109", +] + [[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", + "borsh-derive-internal 0.10.4", + "borsh-schema-derive-internal 0.10.4", "proc-macro-crate 0.1.5", - "proc-macro2", + "proc-macro2 1.0.92", "syn 1.0.109", ] @@ -539,19 +943,41 @@ checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] +[[package]] +name = "borsh-derive-internal" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + [[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", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "borsh-schema-derive-internal" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 1.0.109", ] @@ -561,8 +987,8 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276691d96f063427be83e6692b86148e488ebba9f48f77788724ca027ba3b6d4" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 1.0.109", ] @@ -589,17 +1015,29 @@ dependencies = [ [[package]] name = "bs58" -version = "0.5.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" -dependencies = [ - "tinyvec", -] +checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb" [[package]] -name = "bumpalo" -version = "3.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +name = "bs58" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" + +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] @@ -627,8 +1065,8 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -651,7 +1089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" dependencies = [ "libc", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -665,12 +1103,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - [[package]] name = "cfg-if" version = "1.0.0" @@ -689,11 +1121,25 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] +[[package]] +name = "cheese" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap 4.5.23", + "libcheese", + "reqwest 0.12.4", + "serde", + "serde_json", + "solana-sdk 2.1.7", + "tokio", +] + [[package]] name = "chrono" version = "0.4.39" @@ -711,12 +1157,42 @@ dependencies = [ [[package]] name = "cipher" -version = "0.4.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "crypto-common", - "inout", + "generic-array", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap 0.11.0", + "unicode-width 0.1.14", + "vec_map", +] + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_lex 0.2.4", + "indexmap 1.9.3", + "once_cell", + "strsim 0.10.0", + "termcolor", + "textwrap 0.16.1", ] [[package]] @@ -737,8 +1213,8 @@ checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", - "clap_lex", - "strsim", + "clap_lex 0.7.4", + "strsim 0.11.1", ] [[package]] @@ -747,32 +1223,27 @@ version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck", - "proc-macro2", - "quote", + "heck 0.5.0", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" - -[[package]] -name = "cli" -version = "0.1.0" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ - "anyhow", - "clap", - "libcheese", - "reqwest 0.12.11", - "serde", - "serde_json", - "solana-sdk", - "tokio", + "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + [[package]] name = "colorchoice" version = "1.0.3" @@ -792,16 +1263,6 @@ dependencies = [ "unreachable", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - [[package]] name = "concurrent-queue" version = "2.5.0" @@ -820,7 +1281,7 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "unicode-width", + "unicode-width 0.2.0", "windows-sys 0.59.0", ] @@ -844,6 +1305,12 @@ dependencies = [ "web-sys", ] +[[package]] +name = "const-oid" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" + [[package]] name = "constant_time_eq" version = "0.3.1" @@ -931,7 +1398,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] @@ -947,22 +1413,23 @@ dependencies = [ [[package]] name = "ctr" -version = "0.9.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ "cipher", ] [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", + "serde", "subtle", "zeroize", ] @@ -980,7 +1447,6 @@ dependencies = [ "fiat-crypto", "rand_core 0.6.4", "rustc_version", - "serde", "subtle", "zeroize", ] @@ -991,8 +1457,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -1014,9 +1480,9 @@ checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", - "proc-macro2", - "quote", - "strsim", + "proc-macro2 1.0.92", + "quote 1.0.38", + "strsim 0.11.1", "syn 2.0.93", ] @@ -1027,29 +1493,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", - "quote", + "quote 1.0.38", "syn 2.0.93", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "data-encoding" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +[[package]] +name = "der" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +dependencies = [ + "const-oid", +] + [[package]] name = "der-parser" version = "8.2.0" @@ -1085,11 +1547,23 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 1.0.109", ] +[[package]] +name = "dialoguer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +dependencies = [ + "console", + "shell-words", + "tempfile", + "zeroize", +] + [[package]] name = "digest" version = "0.9.0" @@ -1116,32 +1590,51 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] [[package]] -name = "dlopen2" -version = "0.5.0" +name = "dlopen" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" +checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" dependencies = [ - "dlopen2_derive", + "dlopen_derive", + "lazy_static", "libc", - "once_cell", "winapi", ] [[package]] -name = "dlopen2_derive" -version = "0.3.0" +name = "dlopen_derive" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" +checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.93", + "libc", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "dynamic-amm" +version = "0.6.1" +source = "git+https://github.com/mercurial-finance/mercurial-dynamic-amm-sdk?branch=master#ae46f2a44edbd8231467effd530c1eeecc231a1b" +dependencies = [ + "anchor-lang 0.28.0", + "anchor-spl", + "solana-program 1.16.27", +] + +[[package]] +name = "dynamic-vault" +version = "0.1.0" +source = "git+https://github.com/mercurial-finance/mercurial-dynamic-amm-sdk?branch=master#ae46f2a44edbd8231467effd530c1eeecc231a1b" +dependencies = [ + "anchor-lang 0.28.0", + "anchor-spl", ] [[package]] @@ -1165,7 +1658,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 3.2.1", "ed25519", "rand 0.7.3", "serde", @@ -1221,11 +1714,24 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1248,27 +1754,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" -dependencies = [ - "event-listener 5.3.1", - "pin-project-lite", -] - [[package]] name = "fastrand" version = "2.3.0" @@ -1396,8 +1881,8 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -1413,12 +1898,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" -[[package]] -name = "futures-timer" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" - [[package]] name = "futures-util" version = "0.3.31" @@ -1491,23 +1970,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] -name = "governor" -version = "0.6.3" +name = "goblin" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot", - "portable-atomic", - "quanta", - "rand 0.8.5", - "smallvec", - "spinning_top", + "log", + "plain", + "scroll", ] [[package]] @@ -1522,7 +1992,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -1541,7 +2011,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.2.0", - "indexmap", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -1559,18 +2029,27 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" dependencies = [ - "ahash", + "ahash 0.7.8", ] [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.4", +] [[package]] name = "hashbrown" @@ -1578,12 +2057,30 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hermit-abi" version = "0.3.9" @@ -1694,6 +2191,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" version = "0.14.32" @@ -1711,7 +2214,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.5.8", "tokio", "tower-service", "tracing", @@ -1752,23 +2255,6 @@ dependencies = [ "tokio-rustls 0.24.1", ] -[[package]] -name = "hyper-rustls" -version = "0.27.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" -dependencies = [ - "futures-util", - "http 1.2.0", - "hyper 1.5.2", - "hyper-util", - "rustls 0.23.20", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.26.1", - "tower-service", -] - [[package]] name = "hyper-tls" version = "0.6.0" @@ -1798,7 +2284,7 @@ dependencies = [ "http-body 1.0.1", "hyper 1.5.2", "pin-project-lite", - "socket2", + "socket2 0.5.8", "tokio", "tower-service", "tracing", @@ -1940,8 +2426,8 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -1972,6 +2458,32 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "im" +version = "15.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +dependencies = [ + "bitmaps", + "rand_core 0.6.4", + "rand_xoshiro", + "rayon", + "serde", + "sized-chunks", + "typenum", + "version_check", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + [[package]] name = "indexmap" version = "2.7.0" @@ -1991,19 +2503,10 @@ dependencies = [ "console", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.2.0", "web-time", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - [[package]] name = "ipnet" version = "2.10.1" @@ -2040,26 +2543,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine 4.6.7", - "jni-sys", - "log", - "thiserror 1.0.69", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - [[package]] name = "jobserver" version = "0.1.32" @@ -2119,15 +2602,20 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" name = "libcheese" version = "0.1.0" dependencies = [ + "anchor-lang 0.26.0", "anyhow", "base64 0.22.1", "bincode", - "reqwest 0.12.11", + "dynamic-amm", + "dynamic-vault", + "reqwest 0.12.4", "serde", "serde_json", "solana-client", - "solana-sdk", - "spl-associated-token-account", + "solana-program 1.16.27", + "solana-sdk 1.16.27", + "spl-associated-token-account 1.1.3", + "spl-token 3.5.0", "tokio", ] @@ -2222,6 +2710,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + [[package]] name = "memoffset" version = "0.9.1" @@ -2249,16 +2746,6 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2304,26 +2791,20 @@ dependencies = [ [[package]] name = "nix" -version = "0.29.0" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags 2.6.0", + "bitflags 1.3.2", "cfg-if", - "cfg_aliases", "libc", - "memoffset", + "memoffset 0.7.1", + "pin-utils", ] [[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "nom" -version = "7.1.3" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ @@ -2331,12 +2812,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - [[package]] name = "num" version = "0.2.1" @@ -2388,14 +2863,25 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + [[package]] name = "num-derive" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -2446,17 +2932,59 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", +] + [[package]] name = "num_enum" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.7.3", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", +] + +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 2.0.93", ] [[package]] @@ -2466,8 +2994,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate 3.2.0", - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -2528,8 +3056,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -2539,15 +3067,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.4.1+3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.104" @@ -2556,16 +3075,15 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] [[package]] -name = "parking" -version = "2.2.1" +name = "os_str_bytes" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "parking_lot" @@ -2596,6 +3114,15 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "pbkdf2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +dependencies = [ + "crypto-mac", +] + [[package]] name = "pbkdf2" version = "0.11.0" @@ -2641,17 +3168,34 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +dependencies = [ + "der", + "spki", + "zeroize", +] + [[package]] name = "pkg-config" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + [[package]] name = "polyval" -version = "0.6.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" dependencies = [ "cfg-if", "cpufeatures", @@ -2689,13 +3233,32 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + [[package]] name = "proc-macro-crate" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit", + "toml_edit 0.22.22", +] + +[[package]] +name = "proc-macro2" +version = "0.4.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", ] [[package]] @@ -2708,80 +3271,84 @@ dependencies = [ ] [[package]] -name = "qstring" -version = "0.7.2" +name = "proc-macro2-diagnostics" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" +checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "percent-encoding", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 1.0.109", + "version_check", + "yansi", ] [[package]] -name = "quanta" -version = "0.12.4" +name = "qstring" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773ce68d0bb9bc7ef20be3536ffe94e223e1f365bd374108b2659fac0c65cfe6" +checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", - "web-sys", - "winapi", + "percent-encoding", ] [[package]] name = "quinn" -version = "0.11.6" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.20", - "socket2", - "thiserror 2.0.9", + "rustls 0.20.9", + "thiserror", "tokio", "tracing", + "webpki", ] [[package]] name = "quinn-proto" -version = "0.11.9" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", - "getrandom 0.2.15", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", - "rustls 0.23.20", - "rustls-pki-types", - "rustls-platform-verifier", + "rustls 0.20.9", + "rustls-native-certs", "slab", - "thiserror 2.0.9", + "thiserror", "tinyvec", "tracing", - "web-time", + "webpki", ] [[package]] name = "quinn-udp" -version = "0.5.9" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ - "cfg_aliases", "libc", - "once_cell", - "socket2", + "quinn-proto", + "socket2 0.4.10", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.42.0", +] + +[[package]] +name = "quote" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +dependencies = [ + "proc-macro2 0.4.30", ] [[package]] @@ -2790,7 +3357,7 @@ version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ - "proc-macro2", + "proc-macro2 1.0.92", ] [[package]] @@ -2865,12 +3432,12 @@ dependencies = [ ] [[package]] -name = "raw-cpuid" -version = "11.2.0" +name = "rand_xoshiro" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "bitflags 2.6.0", + "rand_core 0.6.4", ] [[package]] @@ -2893,6 +3460,18 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring 0.16.20", + "time", + "yasna", +] + [[package]] name = "redox_syscall" version = "0.5.8" @@ -2947,12 +3526,11 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", - "hyper-rustls 0.24.2", + "hyper-rustls", "ipnet", "js-sys", "log", "mime", - "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", @@ -2961,8 +3539,8 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration 0.5.1", + "sync_wrapper", + "system-configuration", "tokio", "tokio-rustls 0.24.1", "tokio-util", @@ -2972,14 +3550,14 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots 0.25.4", - "winreg", + "winreg 0.50.0", ] [[package]] name = "reqwest" -version = "0.12.11" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe060fe50f524be480214aba758c71f99f90ee8c83c5a36b5e9e1d568eb4eb3" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.1", "bytes", @@ -2991,7 +3569,6 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.5.2", - "hyper-rustls 0.27.5", "hyper-tls", "hyper-util", "ipnet", @@ -3006,32 +3583,31 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.2", - "system-configuration 0.6.1", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", - "tower", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows-registry", + "winreg 0.52.0", ] [[package]] -name = "reqwest-middleware" -version = "0.2.5" +name = "ring" +version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ - "anyhow", - "async-trait", - "http 0.2.12", - "reqwest 0.11.27", - "serde", - "task-local-extensions", - "thiserror 1.0.69", + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", ] [[package]] @@ -3044,11 +3620,32 @@ dependencies = [ "cfg-if", "getrandom 0.2.15", "libc", - "spin", - "untrusted", + "spin 0.9.8", + "untrusted 0.9.0", "windows-sys 0.52.0", ] +[[package]] +name = "rpassword" +version = "7.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" +dependencies = [ + "libc", + "rtoolbox", + "windows-sys 0.48.0", +] + +[[package]] +name = "rtoolbox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "rustc-demangle" version = "0.1.24" @@ -3057,9 +3654,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "2.1.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" @@ -3094,39 +3691,36 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.7", + "ring 0.16.20", "sct", + "webpki", ] [[package]] name = "rustls" -version = "0.23.20" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", + "log", + "ring 0.17.8", + "rustls-webpki", + "sct", ] [[package]] name = "rustls-native-certs" -version = "0.7.3" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 2.2.0", - "rustls-pki-types", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -3154,36 +3748,6 @@ name = "rustls-pki-types" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" -dependencies = [ - "web-time", -] - -[[package]] -name = "rustls-platform-verifier" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c7dc240fec5517e6c4eab3310438636cfe6391dfc345ba013109909a90d136" -dependencies = [ - "core-foundation", - "core-foundation-sys", - "jni", - "log", - "once_cell", - "rustls 0.23.20", - "rustls-native-certs", - "rustls-platform-verifier-android", - "rustls-webpki 0.102.8", - "security-framework", - "security-framework-sys", - "webpki-root-certs", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" @@ -3191,20 +3755,15 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] -name = "rustls-webpki" -version = "0.102.8" +name = "rustversion" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" @@ -3212,15 +3771,6 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - [[package]] name = "schannel" version = "0.1.27" @@ -3241,6 +3791,20 @@ name = "scroll" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 2.0.93", +] [[package]] name = "sct" @@ -3248,8 +3812,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -3262,7 +3826,6 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", - "num-bigint 0.4.6", "security-framework-sys", ] @@ -3306,8 +3869,8 @@ version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -3335,6 +3898,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +dependencies = [ + "serde", + "serde_with_macros 2.3.3", +] + [[package]] name = "serde_with" version = "3.12.0" @@ -3343,7 +3916,19 @@ checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ "serde", "serde_derive", - "serde_with_macros", + "serde_with_macros 3.12.0", +] + +[[package]] +name = "serde_with_macros" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +dependencies = [ + "darling", + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 2.0.93", ] [[package]] @@ -3353,16 +3938,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" dependencies = [ "darling", - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] [[package]] -name = "sha1" -version = "0.10.6" +name = "sha-1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", @@ -3393,6 +3978,18 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha3" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" +dependencies = [ + "block-buffer 0.9.0", + "digest 0.9.0", + "keccak", + "opaque-debug", +] + [[package]] name = "sha3" version = "0.10.8" @@ -3403,6 +4000,12 @@ dependencies = [ "keccak", ] +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + [[package]] name = "shlex" version = "1.3.0" @@ -3430,6 +4033,16 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "sized-chunks" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" +dependencies = [ + "bitmaps", + "typenum", +] + [[package]] name = "slab" version = "0.4.9" @@ -3447,16 +4060,26 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", - "windows-sys 0.52.0", + "winapi", ] [[package]] -name = "solana-account" +name = "socket2" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "solana-account" version = "2.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d6ef82dab153c60b1da169126d8eca1b62bbf4026f95a45a71897f3e9a0224" @@ -3466,62 +4089,66 @@ dependencies = [ "serde_bytes", "serde_derive", "solana-instruction", - "solana-program", + "solana-program 2.1.7", ] [[package]] name = "solana-account-decoder" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "377daf04565dddcc1bd97de7a346918931d467233aeadce992d8f0ed38c51a3c" +checksum = "57a23e502edf181ac548d05d0e0c29aa4285e05cf082fcc66c9315fe3d1a89bc" dependencies = [ "Inflector", - "base64 0.22.1", + "base64 0.21.7", "bincode", - "bs58", + "bs58 0.4.0", "bv", "lazy_static", "serde", "serde_derive", "serde_json", - "solana-account-decoder-client-types", + "solana-address-lookup-table-program", "solana-config-program", - "solana-sdk", - "spl-token 6.0.0", - "spl-token-2022 4.0.0", - "spl-token-group-interface 0.3.0", - "spl-token-metadata-interface 0.4.0", - "thiserror 1.0.69", + "solana-sdk 1.16.27", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", + "spl-token-metadata-interface", + "thiserror", "zstd", ] [[package]] -name = "solana-account-decoder-client-types" +name = "solana-account-info" version = "2.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c3a45e569bca5640b620e5f82e11103fb8a338c1f53c02dc305ea15c67de98" +checksum = "8378a48833ee7f828e20a63e93a6cdaef1313a8fd8f71a90b243df83295987b1" dependencies = [ - "base64 0.22.1", - "bs58", + "bincode", "serde", - "serde_derive", - "serde_json", - "solana-account", + "solana-program-error", + "solana-program-memory", "solana-pubkey", - "zstd", ] [[package]] -name = "solana-account-info" -version = "2.1.7" +name = "solana-address-lookup-table-program" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8378a48833ee7f828e20a63e93a6cdaef1313a8fd8f71a90b243df83295987b1" +checksum = "5cf919521094c0489485589d01674e993ebb1d518abc8da439e31d7f5a72406f" dependencies = [ "bincode", + "bytemuck", + "log", + "num-derive 0.3.3", + "num-traits", + "rustc_version", "serde", - "solana-program-error", - "solana-program-memory", - "solana-pubkey", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-program 1.16.27", + "solana-program-runtime", + "solana-sdk 1.16.27", + "thiserror", ] [[package]] @@ -3555,8 +4182,8 @@ dependencies = [ "ark-ff", "ark-serialize", "bytemuck", - "solana-program", - "thiserror 1.0.69", + "solana-program 2.1.7", + "thiserror", ] [[package]] @@ -3569,35 +4196,54 @@ dependencies = [ "borsh 1.5.3", ] +[[package]] +name = "solana-clap-utils" +version = "1.16.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4af272571b1bcdbcd0096ba11b8f37f0d79d7118aedca753b8c4c52e1a69e8bf" +dependencies = [ + "chrono", + "clap 2.34.0", + "rpassword", + "solana-perf", + "solana-remote-wallet", + "solana-sdk 1.16.27", + "thiserror", + "tiny-bip39", + "uriparse", + "url", +] + [[package]] name = "solana-client" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0f0271e0cf122e282cb39c531e9caaa7732a39c1b4c3a7fb8972d9a3da99a5" +checksum = "0e626e74c0084e7d42d232aa1c20afcd78663abab19f19f349aba714f82aa13a" dependencies = [ "async-trait", "bincode", - "dashmap", "futures", "futures-util", - "indexmap", + "indexmap 1.9.3", "indicatif", "log", "quinn", + "rand 0.7.3", "rayon", "solana-connection-cache", "solana-measure", + "solana-metrics", "solana-pubsub-client", "solana-quic-client", "solana-rpc-client", "solana-rpc-client-api", "solana-rpc-client-nonce-utils", - "solana-sdk", + "solana-sdk 1.16.27", "solana-streamer", "solana-thin-client", "solana-tpu-client", "solana-udp-client", - "thiserror 1.0.69", + "thiserror", "tokio", ] @@ -3609,53 +4255,42 @@ checksum = "e5d6af32497acc6bb09d8150ea6f53df25dbad713991741999d46688beaf944e" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro", + "solana-sdk-macro 2.1.7", "solana-sysvar-id", ] -[[package]] -name = "solana-compute-budget" -version = "2.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fbc816c5b85021103c2a09cee40fb1c07d265144284c604f480b5b8a1fc1e50" -dependencies = [ - "solana-sdk", -] - [[package]] name = "solana-config-program" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def13861ad090a81b72f216e5b6fbdb47eaa09e2a24b134d87f44aad356c5d33" +checksum = "96f0a4b21581e08419c27458f275bb24bf9b70990756d1ca13c3ef21c56f2750" dependencies = [ "bincode", "chrono", "serde", "serde_derive", - "solana-log-collector", "solana-program-runtime", - "solana-sdk", - "solana-short-vec", + "solana-sdk 1.16.27", ] [[package]] name = "solana-connection-cache" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941eb2a3d4209547ebe68e050c8cdce235138add508ccec73a10db0b1efa0048" +checksum = "ad1e97478ee9a977079863c2530fd4543d9a6e5f1c7fb306fa1557d9c72506b5" dependencies = [ "async-trait", "bincode", - "crossbeam-channel", "futures-util", - "indexmap", + "indexmap 1.9.3", "log", - "rand 0.8.5", + "rand 0.7.3", "rayon", + "rcgen", "solana-measure", "solana-metrics", - "solana-sdk", - "thiserror 1.0.69", + "solana-sdk 1.16.27", + "thiserror", "tokio", ] @@ -3673,19 +4308,6 @@ dependencies = [ "solana-stable-layout", ] -[[package]] -name = "solana-curve25519" -version = "2.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5344c8fb488fdf37845765c802f01198db010b16f4b4113dcb122549e303153f" -dependencies = [ - "bytemuck", - "bytemuck_derive", - "curve25519-dalek 4.1.3", - "solana-program", - "thiserror 1.0.69", -] - [[package]] name = "solana-decode-error" version = "2.1.7" @@ -3720,7 +4342,7 @@ checksum = "276fda33b7de27df41e3043f344e517d5e85ab345d2f2aa2425d1011bac570c4" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro", + "solana-sdk-macro 2.1.7", "solana-sysvar-id", ] @@ -3749,6 +4371,51 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "solana-frozen-abi" +version = "1.16.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a96a0a64cbc75e06c8eb49d6cd0a87054c48dbf59100d9959389aba51fb501" +dependencies = [ + "ahash 0.8.4", + "blake3", + "block-buffer 0.10.4", + "bs58 0.4.0", + "bv", + "byteorder", + "cc", + "either", + "generic-array", + "getrandom 0.1.16", + "im", + "lazy_static", + "log", + "memmap2", + "once_cell", + "rand_core 0.6.4", + "rustc_version", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "sha2 0.10.8", + "solana-frozen-abi-macro", + "subtle", + "thiserror", +] + +[[package]] +name = "solana-frozen-abi-macro" +version = "1.16.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ae9765c963bebbf609dcdc82cfb969746cbdf6d65cfc9d94112e984475ae4ac" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.38", + "rustc_version", + "syn 2.0.93", +] + [[package]] name = "solana-hash" version = "2.1.7" @@ -3756,7 +4423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7067f2bd1e9c3f28153484f03e44bf8dc73cededa6bc132e40de9bfc667b8534" dependencies = [ "borsh 1.5.3", - "bs58", + "bs58 0.5.1", "bytemuck", "bytemuck_derive", "js-sys", @@ -3777,16 +4444,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "solana-inline-spl" -version = "2.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b58f0f8965285c9a045945a4089030914d7198484e4754b087d4217afeff7c" -dependencies = [ - "bytemuck", - "solana-pubkey", -] - [[package]] name = "solana-instruction" version = "2.1.7" @@ -3813,38 +4470,43 @@ checksum = "38f2ee9af7a2815137c60d77cb930c26480bc802b55e00d9e230e81fd308062e" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro", + "solana-sdk-macro 2.1.7", "solana-sysvar-id", ] [[package]] -name = "solana-log-collector" -version = "2.1.7" +name = "solana-logger" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adf7c3c024afb504796bace240776f9fc5a2287fa32269ee7071058cdd36378" +checksum = "9c039e4336890c7a0667207caeb452187efa0602d80eca61a854f2e39915e972" dependencies = [ + "env_logger", + "lazy_static", "log", ] [[package]] name = "solana-measure" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcad4cf5c745ecc15fab2840a5bd35489bf467790359316b66950a8cf62c2a04" +checksum = "4f188a8cf40c33a33cdf5396af88df194648ef52914fcfb5ce81e4cf03ab99ff" +dependencies = [ + "log", + "solana-sdk 1.16.27", +] [[package]] name = "solana-metrics" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85f54610e313cad7a251ee8fbac5a43cbba66cdf5a92353a4945743b0e50678d" +checksum = "7b0e6253c106dbe0a6736c9b6929b8284aa959f79486006330884252e486b515" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest 0.11.27", - "solana-sdk", - "thiserror 1.0.69", + "solana-sdk 1.16.27", ] [[package]] @@ -3864,19 +4526,22 @@ checksum = "08ef55ad8dcc8c5f21e2bbbc7298fa59550269e8bdf2c6976c4de626ea8a0069" [[package]] name = "solana-net-utils" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f918a07e0df8b68aaaff449c5feaa3cebe2882b772a35c1353fbee8467b00c" +checksum = "7d33faefadf14f19710e5229a2f812a4ea3c1b173ca0043225761de663feab35" dependencies = [ "bincode", + "clap 3.2.25", "crossbeam-channel", "log", "nix", - "rand 0.8.5", + "rand 0.7.3", "serde", "serde_derive", - "socket2", - "solana-sdk", + "socket2 0.4.10", + "solana-logger", + "solana-sdk 1.16.27", + "solana-version", "tokio", "url", ] @@ -3892,33 +4557,33 @@ dependencies = [ "cfg_eval", "serde", "serde_derive", - "serde_with", + "serde_with 3.12.0", ] [[package]] name = "solana-perf" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e5861b21d523472322d44c71e1fb2d9703e659016abf003fb9eb2917653eaa4" +checksum = "9a3a8b766c9ee568681462592f89161628e0a4493ed1b6a5a5c8cf3b94c80b98" dependencies = [ - "ahash", + "ahash 0.8.4", "bincode", "bv", "caps", - "curve25519-dalek 4.1.3", - "dlopen2", + "curve25519-dalek 3.2.1", + "dlopen", + "dlopen_derive", "fnv", "lazy_static", "libc", "log", "nix", - "rand 0.8.5", + "rand 0.7.3", "rayon", "serde", "solana-metrics", "solana-rayon-threadlimit", - "solana-sdk", - "solana-short-vec", + "solana-sdk 1.16.27", "solana-vote-program", ] @@ -3932,6 +4597,61 @@ dependencies = [ "solana-decode-error", ] +[[package]] +name = "solana-program" +version = "1.16.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20c16757f43d4384907f6e81924e155b8bd8228efcdcf9ea38bd4e18ea100804" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "array-bytes", + "base64 0.21.7", + "bincode", + "bitflags 1.3.2", + "blake3", + "borsh 0.10.4", + "borsh 0.9.3", + "bs58 0.4.0", + "bv", + "bytemuck", + "cc", + "console_error_panic_hook", + "console_log", + "curve25519-dalek 3.2.1", + "getrandom 0.2.15", + "itertools 0.10.5", + "js-sys", + "lazy_static", + "libc", + "libsecp256k1", + "log", + "memoffset 0.9.1", + "num-bigint 0.4.6", + "num-derive 0.3.3", + "num-traits", + "parking_lot", + "rand 0.7.3", + "rand_chacha 0.2.2", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "sha2 0.10.8", + "sha3 0.10.8", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk-macro 1.16.27", + "thiserror", + "tiny-bip39", + "wasm-bindgen", + "zeroize", +] + [[package]] name = "solana-program" version = "2.1.7" @@ -3944,7 +4664,7 @@ dependencies = [ "blake3", "borsh 0.10.4", "borsh 1.5.3", - "bs58", + "bs58 0.5.1", "bv", "bytemuck", "bytemuck_derive", @@ -3956,9 +4676,9 @@ dependencies = [ "js-sys", "lazy_static", "log", - "memoffset", + "memoffset 0.9.1", "num-bigint 0.4.6", - "num-derive", + "num-derive 0.4.2", "num-traits", "parking_lot", "rand 0.8.5", @@ -3966,7 +4686,7 @@ dependencies = [ "serde_bytes", "serde_derive", "sha2 0.10.8", - "sha3", + "sha3 0.10.8", "solana-account-info", "solana-atomic-u64", "solana-bincode", @@ -3990,7 +4710,7 @@ dependencies = [ "solana-pubkey", "solana-rent", "solana-sanitize", - "solana-sdk-macro", + "solana-sdk-macro 2.1.7", "solana-secp256k1-recover", "solana-serde-varint", "solana-serialize-utils", @@ -4001,7 +4721,7 @@ dependencies = [ "solana-stable-layout", "solana-sysvar-id", "solana-transaction-error", - "thiserror 1.0.69", + "thiserror", "wasm-bindgen", ] @@ -4060,32 +4780,30 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77e2768067a37a8d20cd98f10e8ac653077171adc15d4acbee01aa253b95051" +checksum = "7bd12d233724478c7ccf84d953a4abe891552d78bd41e2c594c098f76dde5a06" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "bincode", + "eager", "enum-iterator", - "itertools 0.12.1", + "itertools 0.10.5", "libc", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "percentage", - "rand 0.8.5", + "rand 0.7.3", + "rustc_version", "serde", - "solana-compute-budget", - "solana-feature-set", - "solana-log-collector", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-measure", "solana-metrics", - "solana-sdk", - "solana-timings", - "solana-type-overrides", - "solana-vote", + "solana-sdk 1.16.27", "solana_rbpf", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4096,7 +4814,7 @@ checksum = "c46701a845b731f2ffcf002c4bb08968434b9cf5e576cdd705259421074d1764" dependencies = [ "borsh 0.10.4", "borsh 1.5.3", - "bs58", + "bs58 0.5.1", "bytemuck", "bytemuck_derive", "curve25519-dalek 4.1.3", @@ -4117,9 +4835,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98841872ba1715c3fd783554140031967f98fccd198b387578921af7f220ca85" +checksum = "319fcfa162e2d01baf890986d1c9fc549acfdac19e0de07da80a7ef591aa1241" dependencies = [ "crossbeam-channel", "futures-util", @@ -4131,8 +4849,8 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", - "thiserror 1.0.69", + "solana-sdk 1.16.27", + "thiserror", "tokio", "tokio-stream", "tokio-tungstenite", @@ -4142,40 +4860,61 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6b0b66474dff5fb3a266b00aadb0e1107350b6e80750cf16c910b10b579819" +checksum = "f88f6f70a2b0541855467cd3ead7631e7c4132e7f327965dae0d9649522acb3a" dependencies = [ - "async-lock", + "async-mutex", "async-trait", "futures", - "itertools 0.12.1", + "itertools 0.10.5", "lazy_static", "log", "quinn", "quinn-proto", - "rustls 0.23.20", + "quinn-udp", + "rcgen", + "rustls 0.20.9", "solana-connection-cache", "solana-measure", "solana-metrics", "solana-net-utils", "solana-rpc-client-api", - "solana-sdk", + "solana-sdk 1.16.27", "solana-streamer", - "thiserror 1.0.69", + "thiserror", "tokio", ] [[package]] name = "solana-rayon-threadlimit" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed4fecc4b7cc0517ba3966a2845f12037e330821f4e8398d26e95366d363d92b" +checksum = "e2ba72e563531528d6e36090477d6b638ba1dfdbe04e6a97bf9e5a9f46e90837" dependencies = [ "lazy_static", "num_cpus", ] +[[package]] +name = "solana-remote-wallet" +version = "1.16.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1924c23c5a1ca48e1d285b43d2bfe351ac9de3a93b46a2f34972cba8a3688934" +dependencies = [ + "console", + "dialoguer", + "log", + "num-derive 0.3.3", + "num-traits", + "parking_lot", + "qstring", + "semver", + "solana-sdk 1.16.27", + "thiserror", + "uriparse", +] + [[package]] name = "solana-rent" version = "2.1.7" @@ -4184,32 +4923,31 @@ checksum = "05a4d15fe63d0e9a9551adfecfec495e3d50ba0bc4705001010c724fe84f65d8" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro", + "solana-sdk-macro 2.1.7", "solana-sysvar-id", ] [[package]] name = "solana-rpc-client" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a8da03038ea6390bf23c4584a8ff026038179b23618ab791ce27114ca64fff" +checksum = "981e4cd5d5184e566568e16ed59dde6ee9f88b62fe2f0b25d72873af0302b354" dependencies = [ "async-trait", - "base64 0.22.1", + "base64 0.21.7", "bincode", - "bs58", + "bs58 0.4.0", "indicatif", "log", "reqwest 0.11.27", - "reqwest-middleware", "semver", "serde", "serde_derive", "serde_json", - "solana-account-decoder-client-types", + "solana-account-decoder", "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status-client-types", + "solana-sdk 1.16.27", + "solana-transaction-status", "solana-version", "solana-vote-program", "tokio", @@ -4217,37 +4955,37 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00156cc75b95b5a0f0cf1ec48fa9fce878364fe7900c40a87c8cad91647b3af0" +checksum = "e894b7a7025c782f97967b071d84f9219bb6ce53ef0794c756af9cc8bde5833e" dependencies = [ - "anyhow", - "base64 0.22.1", - "bs58", + "base64 0.21.7", + "bs58 0.4.0", "jsonrpc-core", "reqwest 0.11.27", - "reqwest-middleware", "semver", "serde", "serde_derive", "serde_json", - "solana-account-decoder-client-types", - "solana-inline-spl", - "solana-sdk", - "solana-transaction-status-client-types", + "solana-account-decoder", + "solana-sdk 1.16.27", + "solana-transaction-status", "solana-version", - "thiserror 1.0.69", + "spl-token-2022 0.9.0", + "thiserror", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7350a74a70e53a2c63813354770b890c364508fbff786a4c9530cdbfc83978c4" +checksum = "0d69307d1f7fb297ea82e25d9cd1d83297140ce872009557fd57763511497cb5" dependencies = [ + "clap 2.34.0", + "solana-clap-utils", "solana-rpc-client", - "solana-sdk", - "thiserror 1.0.69", + "solana-sdk 1.16.27", + "thiserror", ] [[package]] @@ -4256,6 +4994,59 @@ version = "2.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b8c536460c84ec7cbcce45d8a68ab1c12c99933cfeb0cb332567e67a27eea2f" +[[package]] +name = "solana-sdk" +version = "1.16.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf179cda65775982e5f31da8d58dfa4349c3b5ae1573ceb507c7fc91df66690" +dependencies = [ + "assert_matches", + "base64 0.21.7", + "bincode", + "bitflags 1.3.2", + "borsh 0.10.4", + "bs58 0.4.0", + "bytemuck", + "byteorder", + "chrono", + "derivation-path", + "digest 0.10.7", + "ed25519-dalek", + "ed25519-dalek-bip32", + "generic-array", + "hmac 0.12.1", + "itertools 0.10.5", + "js-sys", + "lazy_static", + "libsecp256k1", + "log", + "memmap2", + "num-derive 0.3.3", + "num-traits", + "num_enum 0.6.1", + "pbkdf2 0.11.0", + "qstring", + "rand 0.7.3", + "rand_chacha 0.2.2", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "serde_json", + "serde_with 2.3.3", + "sha2 0.10.8", + "sha3 0.10.8", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-logger", + "solana-program 1.16.27", + "solana-sdk-macro 1.16.27", + "thiserror", + "uriparse", + "wasm-bindgen", +] + [[package]] name = "solana-sdk" version = "2.1.7" @@ -4265,7 +5056,7 @@ dependencies = [ "bincode", "bitflags 2.6.0", "borsh 1.5.3", - "bs58", + "bs58 0.5.1", "bytemuck", "bytemuck_derive", "byteorder", @@ -4281,19 +5072,19 @@ dependencies = [ "libsecp256k1", "log", "memmap2", - "num-derive", + "num-derive 0.4.2", "num-traits", - "num_enum", - "pbkdf2", + "num_enum 0.7.3", + "pbkdf2 0.11.0", "rand 0.7.3", "rand 0.8.5", "serde", "serde_bytes", "serde_derive", "serde_json", - "serde_with", + "serde_with 3.12.0", "sha2 0.10.8", - "sha3", + "sha3 0.10.8", "siphasher", "solana-account", "solana-bn254", @@ -4305,30 +5096,43 @@ dependencies = [ "solana-native-token", "solana-packet", "solana-precompile-error", - "solana-program", + "solana-program 2.1.7", "solana-program-memory", "solana-pubkey", "solana-sanitize", - "solana-sdk-macro", + "solana-sdk-macro 2.1.7", "solana-secp256k1-recover", "solana-secp256r1-program", "solana-serde-varint", "solana-short-vec", "solana-signature", "solana-transaction-error", - "thiserror 1.0.69", + "thiserror", "wasm-bindgen", ] +[[package]] +name = "solana-sdk-macro" +version = "1.16.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f188d6fe76183137a4922274acbe76fc4fcc474b3fad860bb2612cb225e6e2a" +dependencies = [ + "bs58 0.4.0", + "proc-macro2 1.0.92", + "quote 1.0.38", + "rustversion", + "syn 2.0.93", +] + [[package]] name = "solana-sdk-macro" version = "2.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24c160cb22c3671fe2e0fd7c3630701cfccae308174d8d31d7fc93386c3cc381" dependencies = [ - "bs58", - "proc-macro2", - "quote", + "bs58 0.5.1", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -4341,7 +5145,7 @@ dependencies = [ "borsh 1.5.3", "libsecp256k1", "solana-define-syscall", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -4358,12 +5162,6 @@ dependencies = [ "solana-pubkey", ] -[[package]] -name = "solana-security-txt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" - [[package]] name = "solana-serde-varint" version = "2.1.7" @@ -4410,7 +5208,7 @@ version = "2.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29cb6cae156bc2c80ae34b2b365cf460be974cf5c68799e7024615f88f54aed4" dependencies = [ - "bs58", + "bs58 0.5.1", "ed25519-dalek", "generic-array", "rand 0.8.5", @@ -4455,39 +5253,34 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0dae30bab2e8d079dd12e148f97090497f842ead0f0902080c2e3b2e5aa8db" +checksum = "69308e9f79ff1e7ca55d32e5521ab1b11e5812830c8e3733dfa0a7021c6ddb24" dependencies = [ "async-channel", "bytes", "crossbeam-channel", - "dashmap", - "futures", "futures-util", - "governor", "histogram", - "indexmap", - "itertools 0.12.1", + "indexmap 1.9.3", + "itertools 0.10.5", "libc", "log", "nix", "pem", "percentage", + "pkcs8", "quinn", "quinn-proto", - "rand 0.8.5", - "rustls 0.23.20", - "smallvec", - "socket2", - "solana-measure", + "quinn-udp", + "rand 0.7.3", + "rcgen", + "rustls 0.20.9", "solana-metrics", "solana-perf", - "solana-sdk", - "solana-transaction-metrics-tracker", - "thiserror 1.0.69", + "solana-sdk 1.16.27", + "thiserror", "tokio", - "tokio-util", "x509-parser", ] @@ -4502,9 +5295,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2f14d4cee158f1cf721f48ffdbd4e1eb2cd05088dcc15defdf4357bb79de56" +checksum = "27fe04e9479ba32c2b07a75975458b71abefde1a0a2ba23bbcdb4a0134234ef2" dependencies = [ "bincode", "log", @@ -4512,40 +5305,31 @@ dependencies = [ "solana-connection-cache", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", -] - -[[package]] -name = "solana-timings" -version = "2.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e757afc3d9bc9b5b9cf1bea1bacd30dbbf32aa6d61e02b45afe0a861ae80f7" -dependencies = [ - "eager", - "enum-iterator", - "solana-sdk", + "solana-sdk 1.16.27", ] [[package]] name = "solana-tpu-client" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09073492368eab5c3190f4c51a114cb2ed4c5e8fe2c9bf4af6b6dfcc27accbc" +checksum = "cf5abc9d7b1071f978d231bcb184c801008415d9917bad48c08b09c538a9ee30" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap", + "indexmap 1.9.3", "indicatif", "log", + "rand 0.7.3", "rayon", "solana-connection-cache", "solana-measure", + "solana-metrics", "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", - "solana-sdk", - "thiserror 1.0.69", + "solana-sdk 1.16.27", + "thiserror", "tokio", ] @@ -4562,194 +5346,138 @@ dependencies = [ ] [[package]] -name = "solana-transaction-metrics-tracker" -version = "2.1.7" +name = "solana-transaction-status" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03bb6d614d538663b1485becb375077ec1f86ebd73e436f589851c3b5fcbbaa8" +checksum = "dff2f528270e438cd30b47ae81fc14b40162bc67794a65e30abec769322daeaf" dependencies = [ - "base64 0.22.1", + "Inflector", + "base64 0.21.7", "bincode", + "borsh 0.10.4", + "bs58 0.4.0", "lazy_static", "log", - "rand 0.8.5", - "solana-perf", - "solana-sdk", - "solana-short-vec", -] - -[[package]] -name = "solana-transaction-status-client-types" -version = "2.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbc1cbda2dd0e7de457af792c708e940dcf82991fc57f10390b62667fc5dd29" -dependencies = [ - "base64 0.22.1", - "bincode", - "bs58", "serde", "serde_derive", "serde_json", - "solana-account-decoder-client-types", - "solana-sdk", - "solana-signature", - "thiserror 1.0.69", -] - -[[package]] -name = "solana-type-overrides" -version = "2.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ae015d075feeeca8ecf4fe2a7f1b8a1bd8c3002354af260c56f580bee5b737" -dependencies = [ - "lazy_static", - "rand 0.8.5", + "solana-account-decoder", + "solana-address-lookup-table-program", + "solana-sdk 1.16.27", + "spl-associated-token-account 2.2.0", + "spl-memo 4.0.0", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", + "thiserror", ] [[package]] name = "solana-udp-client" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c272288da5327948b65edbafceeab66d152ab9c9141af261afc6d845e39c6dc5" +checksum = "a8723428368dd66b462a1e8ccd98c8d8bb020ad9dfbd051ed31a39857f89c17d" dependencies = [ "async-trait", "solana-connection-cache", "solana-net-utils", - "solana-sdk", + "solana-sdk 1.16.27", "solana-streamer", - "thiserror 1.0.69", + "thiserror", "tokio", ] [[package]] name = "solana-version" -version = "2.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c6e31a55156877e3f8da59dc6428976952fefee9f27d09d77a40dad3bd8aa86" -dependencies = [ - "semver", - "serde", - "serde_derive", - "solana-feature-set", - "solana-sanitize", - "solana-serde-varint", -] - -[[package]] -name = "solana-vote" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f83d18727d801e3ef5d8c29a66f9632ecd8e9f069a2891a6f730df0f2b1db82" +checksum = "a20bbadb84e29d645ae2d252a28eb0c7a98d656608ffcbab5a3b18cf5d509733" dependencies = [ - "itertools 0.12.1", "log", + "rustc_version", + "semver", "serde", "serde_derive", - "solana-sdk", - "thiserror 1.0.69", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk 1.16.27", ] [[package]] name = "solana-vote-program" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16362e21cdee5b7a55a353f1d6adae59149dab696998ad85fda151ee621aad00" +checksum = "ee544e1d43fde9135dfbc43707f1874dd2c44f5d786d9fd6077b5e57ae602109" dependencies = [ "bincode", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", + "rustc_version", "serde", "serde_derive", - "solana-feature-set", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-metrics", - "solana-program", + "solana-program 1.16.27", "solana-program-runtime", - "solana-sdk", - "thiserror 1.0.69", -] - -[[package]] -name = "solana-zk-sdk" -version = "2.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab1ed794c1cc420e984204c495535293a124aa9befc342441a861648c04df9d3" -dependencies = [ - "aes-gcm-siv", - "base64 0.22.1", - "bincode", - "bytemuck", - "bytemuck_derive", - "curve25519-dalek 4.1.3", - "itertools 0.12.1", - "js-sys", - "lazy_static", - "merlin", - "num-derive", - "num-traits", - "rand 0.8.5", - "serde", - "serde_derive", - "serde_json", - "sha3", - "solana-derivation-path", - "solana-program", - "solana-sdk", - "subtle", - "thiserror 1.0.69", - "wasm-bindgen", - "zeroize", + "solana-sdk 1.16.27", + "thiserror", ] [[package]] name = "solana-zk-token-sdk" -version = "2.1.7" +version = "1.16.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c738deb869af7fffa26a189022edc8b3dfb9789f53fc604ca4f5d25aa326170" +checksum = "9513c4f1595b61f8a39a14c27535da2b2145c20c6b35ab491a1830981972b2bd" dependencies = [ "aes-gcm-siv", - "base64 0.22.1", + "base64 0.21.7", "bincode", "bytemuck", - "bytemuck_derive", "byteorder", - "curve25519-dalek 4.1.3", - "itertools 0.12.1", + "curve25519-dalek 3.2.1", + "getrandom 0.1.16", + "itertools 0.10.5", "lazy_static", "merlin", - "num-derive", + "num-derive 0.3.3", "num-traits", - "rand 0.8.5", + "rand 0.7.3", "serde", - "serde_derive", "serde_json", - "sha3", - "solana-curve25519", - "solana-derivation-path", - "solana-program", - "solana-sdk", + "sha3 0.9.1", + "solana-program 1.16.27", + "solana-sdk 1.16.27", "subtle", - "thiserror 1.0.69", + "thiserror", "zeroize", ] [[package]] name = "solana_rbpf" -version = "0.8.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b" +checksum = "17d4ba1e58947346e360fabde0697029d36ba83c42f669199b16a8931313cf29" dependencies = [ "byteorder", - "combine 3.8.1", + "combine", + "goblin", "hash32", "libc", "log", "rand 0.8.5", "rustc-demangle", "scroll", - "thiserror 1.0.69", + "thiserror", "winapi", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + [[package]] name = "spin" version = "0.9.8" @@ -4757,487 +5485,263 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "spinning_top" -version = "0.3.0" +name = "spki" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" dependencies = [ - "lock_api", + "base64ct", + "der", ] [[package]] name = "spl-associated-token-account" -version = "6.0.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76fee7d65013667032d499adc3c895e286197a35a0d3a4643c80e7fd3e9969e3" +checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4" dependencies = [ - "borsh 1.5.3", - "num-derive", + "assert_matches", + "borsh 0.9.3", + "num-derive 0.3.3", "num-traits", - "solana-program", - "spl-associated-token-account-client", - "spl-token 7.0.0", - "spl-token-2022 6.0.0", - "thiserror 1.0.69", + "solana-program 1.16.27", + "spl-token 3.5.0", + "spl-token-2022 0.6.1", + "thiserror", ] [[package]] -name = "spl-associated-token-account-client" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f8349dbcbe575f354f9a533a21f272f3eb3808a49e2fdc1c34393b88ba76cb" -dependencies = [ - "solana-instruction", - "solana-pubkey", -] - -[[package]] -name = "spl-discriminator" -version = "0.3.0" +name = "spl-associated-token-account" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" +checksum = "385e31c29981488f2820b2022d8e731aae3b02e6e18e2fd854e4c9a94dc44fc3" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator-derive", + "assert_matches", + "borsh 0.10.4", + "num-derive 0.4.2", + "num-traits", + "solana-program 1.16.27", + "spl-token 4.0.0", + "spl-token-2022 0.9.0", + "thiserror", ] [[package]] name = "spl-discriminator" -version = "0.4.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7398da23554a31660f17718164e31d31900956054f54f52d5ec1be51cb4f4b3" +checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" dependencies = [ "bytemuck", - "solana-program-error", - "solana-sha256-hasher", + "solana-program 1.16.27", "spl-discriminator-derive", ] [[package]] name = "spl-discriminator-derive" -version = "0.2.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" +checksum = "07fd7858fc4ff8fb0e34090e41d7eb06a823e1057945c26d480bfc21d2338a93" dependencies = [ - "quote", + "quote 1.0.38", "spl-discriminator-syn", "syn 2.0.93", ] [[package]] name = "spl-discriminator-syn" -version = "0.2.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f05593b7ca9eac7caca309720f2eafb96355e037e6d373b909a80fe7b69b9" +checksum = "18fea7be851bd98d10721782ea958097c03a0c2a07d8d4997041d0ece6319a63" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "sha2 0.10.8", "syn 2.0.93", - "thiserror 1.0.69", -] - -[[package]] -name = "spl-elgamal-registry" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a157622a63a4d12fbd8b347fd75ee442cb913137fa98647824c992fb049a15b" -dependencies = [ - "bytemuck", - "solana-program", - "solana-zk-sdk", - "spl-pod 0.5.0", - "spl-token-confidential-transfer-proof-extraction", + "thiserror", ] [[package]] name = "spl-memo" -version = "5.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" +checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" dependencies = [ - "solana-program", + "solana-program 1.16.27", ] [[package]] name = "spl-memo" -version = "6.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb" +checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" dependencies = [ - "solana-account-info", - "solana-instruction", - "solana-msg", - "solana-program-entrypoint", - "solana-program-error", - "solana-pubkey", + "solana-program 1.16.27", ] [[package]] name = "spl-pod" -version = "0.3.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c704c88fc457fa649ba3aabe195c79d885c3f26709efaddc453c8de352c90b87" +checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" dependencies = [ - "borsh 1.5.3", + "borsh 0.10.4", "bytemuck", - "bytemuck_derive", - "solana-program", + "solana-program 1.16.27", "solana-zk-token-sdk", - "spl-program-error 0.5.0", -] - -[[package]] -name = "spl-pod" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a7d5950993e1ff2680bd989df298eeb169367fb2f9deeef1f132de6e4e8016" -dependencies = [ - "borsh 1.5.3", - "bytemuck", - "bytemuck_derive", - "num-derive", - "num-traits", - "solana-decode-error", - "solana-msg", - "solana-program-error", - "solana-program-option", - "solana-pubkey", - "solana-zk-sdk", - "thiserror 1.0.69", + "spl-program-error", ] [[package]] name = "spl-program-error" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" -dependencies = [ - "num-derive", - "num-traits", - "solana-program", - "spl-program-error-derive", - "thiserror 1.0.69", -] - -[[package]] -name = "spl-program-error" -version = "0.6.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d39b5186f42b2b50168029d81e58e800b690877ef0b30580d107659250da1d1" +checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" dependencies = [ - "num-derive", + "num-derive 0.4.2", "num-traits", - "solana-program", + "solana-program 1.16.27", "spl-program-error-derive", - "thiserror 1.0.69", + "thiserror", ] [[package]] name = "spl-program-error-derive" -version = "0.4.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d375dd76c517836353e093c2dbb490938ff72821ab568b545fd30ab3256b3e" +checksum = "1845dfe71fd68f70382232742e758557afe973ae19e6c06807b2c30f5d5cb474" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "sha2 0.10.8", "syn 2.0.93", ] [[package]] name = "spl-tlv-account-resolution" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator 0.3.0", - "spl-pod 0.3.1", - "spl-program-error 0.5.0", - "spl-type-length-value 0.5.0", -] - -[[package]] -name = "spl-tlv-account-resolution" -version = "0.9.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd99ff1e9ed2ab86e3fd582850d47a739fec1be9f4661cba1782d3a0f26805f3" +checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9" dependencies = [ "bytemuck", - "num-derive", - "num-traits", - "solana-account-info", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "spl-discriminator 0.4.1", - "spl-pod 0.5.0", - "spl-program-error 0.6.0", - "spl-type-length-value 0.7.0", - "thiserror 1.0.69", + "solana-program 1.16.27", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", ] [[package]] name = "spl-token" -version = "6.0.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a0f06ac7f23dc0984931b1fe309468f14ea58e32660439c1cef19456f5d0e3" +checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", - "num_enum", - "solana-program", - "thiserror 1.0.69", + "num_enum 0.5.11", + "solana-program 1.16.27", + "thiserror", ] [[package]] name = "spl-token" -version = "7.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed320a6c934128d4f7e54fe00e16b8aeaecf215799d060ae14f93378da6dc834" +checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", - "num_enum", - "solana-program", - "thiserror 1.0.69", + "num_enum 0.6.1", + "solana-program 1.16.27", + "thiserror", ] [[package]] name = "spl-token-2022" -version = "4.0.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" +checksum = "0043b590232c400bad5ee9eb983ced003d15163c4c5d56b090ac6d9a57457b47" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", - "num_enum", - "solana-program", - "solana-security-txt", + "num_enum 0.5.11", + "solana-program 1.16.27", "solana-zk-token-sdk", - "spl-memo 5.0.0", - "spl-pod 0.3.1", - "spl-token 6.0.0", - "spl-token-group-interface 0.3.0", - "spl-token-metadata-interface 0.4.0", - "spl-transfer-hook-interface 0.7.0", - "spl-type-length-value 0.5.0", - "thiserror 1.0.69", + "spl-memo 3.0.1", + "spl-token 3.5.0", + "thiserror", ] [[package]] name = "spl-token-2022" -version = "6.0.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b27f7405010ef816587c944536b0eafbcc35206ab6ba0f2ca79f1d28e488f4f" +checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86" dependencies = [ "arrayref", "bytemuck", - "num-derive", - "num-traits", - "num_enum", - "solana-program", - "solana-security-txt", - "solana-zk-sdk", - "spl-elgamal-registry", - "spl-memo 6.0.0", - "spl-pod 0.5.0", - "spl-token 7.0.0", - "spl-token-confidential-transfer-ciphertext-arithmetic", - "spl-token-confidential-transfer-proof-extraction", - "spl-token-confidential-transfer-proof-generation", - "spl-token-group-interface 0.5.0", - "spl-token-metadata-interface 0.6.0", - "spl-transfer-hook-interface 0.9.0", - "spl-type-length-value 0.7.0", - "thiserror 1.0.69", -] - -[[package]] -name = "spl-token-confidential-transfer-ciphertext-arithmetic" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f1bf731fc65546330a7929a9735679add70f828dd076a4e69b59d3afb5423c" -dependencies = [ - "base64 0.22.1", - "bytemuck", - "solana-curve25519", - "solana-zk-sdk", -] - -[[package]] -name = "spl-token-confidential-transfer-proof-extraction" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383937e637ccbe546f736d5115344351ebd4d2a076907582335261da58236816" -dependencies = [ - "bytemuck", - "solana-curve25519", - "solana-program", - "solana-zk-sdk", - "spl-pod 0.5.0", - "thiserror 1.0.69", -] - -[[package]] -name = "spl-token-confidential-transfer-proof-generation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8627184782eec1894de8ea26129c61303f1f0adeed65c20e0b10bc584f09356d" -dependencies = [ - "curve25519-dalek 4.1.3", - "solana-zk-sdk", - "thiserror 1.0.69", -] - -[[package]] -name = "spl-token-group-interface" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator 0.3.0", - "spl-pod 0.3.1", - "spl-program-error 0.5.0", -] - -[[package]] -name = "spl-token-group-interface" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d595667ed72dbfed8c251708f406d7c2814a3fa6879893b323d56a10bedfc799" -dependencies = [ - "bytemuck", - "num-derive", + "num-derive 0.4.2", "num-traits", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "spl-discriminator 0.4.1", - "spl-pod 0.5.0", - "thiserror 1.0.69", -] - -[[package]] -name = "spl-token-metadata-interface" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" -dependencies = [ - "borsh 1.5.3", - "solana-program", - "spl-discriminator 0.3.0", - "spl-pod 0.3.1", - "spl-program-error 0.5.0", - "spl-type-length-value 0.5.0", -] - -[[package]] -name = "spl-token-metadata-interface" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb9c89dbc877abd735f05547dcf9e6e12c00c11d6d74d8817506cab4c99fdbb" -dependencies = [ - "borsh 1.5.3", - "num-derive", - "num-traits", - "solana-borsh", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "spl-discriminator 0.4.1", - "spl-pod 0.5.0", - "spl-type-length-value 0.7.0", - "thiserror 1.0.69", -] - -[[package]] -name = "spl-transfer-hook-interface" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" -dependencies = [ - "arrayref", - "bytemuck", - "solana-program", - "spl-discriminator 0.3.0", - "spl-pod 0.3.1", - "spl-program-error 0.5.0", - "spl-tlv-account-resolution 0.7.0", - "spl-type-length-value 0.5.0", + "num_enum 0.7.3", + "solana-program 1.16.27", + "solana-zk-token-sdk", + "spl-memo 4.0.0", + "spl-pod", + "spl-token 4.0.0", + "spl-token-metadata-interface", + "spl-transfer-hook-interface", + "spl-type-length-value", + "thiserror", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.9.0" +name = "spl-token-metadata-interface" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa7503d52107c33c88e845e1351565050362c2314036ddf19a36cd25137c043" +checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" dependencies = [ - "arrayref", - "bytemuck", - "num-derive", - "num-traits", - "solana-account-info", - "solana-cpi", - "solana-decode-error", - "solana-instruction", - "solana-msg", - "solana-program-error", - "solana-pubkey", - "spl-discriminator 0.4.1", - "spl-pod 0.5.0", - "spl-program-error 0.6.0", - "spl-tlv-account-resolution 0.9.0", - "spl-type-length-value 0.7.0", - "thiserror 1.0.69", + "borsh 0.10.4", + "solana-program 1.16.27", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", ] [[package]] -name = "spl-type-length-value" -version = "0.5.0" +name = "spl-transfer-hook-interface" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" +checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b" dependencies = [ + "arrayref", "bytemuck", - "solana-program", - "spl-discriminator 0.3.0", - "spl-pod 0.3.1", - "spl-program-error 0.5.0", + "solana-program 1.16.27", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-tlv-account-resolution", + "spl-type-length-value", ] [[package]] name = "spl-type-length-value" -version = "0.7.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba70ef09b13af616a4c987797870122863cba03acc4284f226a4473b043923f9" +checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" dependencies = [ "bytemuck", - "num-derive", - "num-traits", - "solana-account-info", - "solana-decode-error", - "solana-msg", - "solana-program-error", - "spl-discriminator 0.4.1", - "spl-pod 0.5.0", - "thiserror 1.0.69", + "solana-program 1.16.27", + "spl-discriminator", + "spl-pod", + "spl-program-error", ] [[package]] @@ -5246,6 +5750,18 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "strsim" version = "0.11.1" @@ -5254,9 +5770,20 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.6.1" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "0.15.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] [[package]] name = "syn" @@ -5264,8 +5791,8 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "unicode-ident", ] @@ -5275,8 +5802,8 @@ version = "2.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "unicode-ident", ] @@ -5286,25 +5813,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] - [[package]] name = "synstructure" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 1.0.109", - "unicode-xid", + "unicode-xid 0.2.6", ] [[package]] @@ -5313,8 +5831,8 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -5326,18 +5844,7 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys 0.5.0", -] - -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "system-configuration-sys 0.6.0", + "system-configuration-sys", ] [[package]] @@ -5350,25 +5857,6 @@ dependencies = [ "libc", ] -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - [[package]] name = "tempfile" version = "3.14.0" @@ -5383,42 +5871,46 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.69" +name = "termcolor" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ - "thiserror-impl 1.0.69", + "winapi-util", ] [[package]] -name = "thiserror" -version = "2.0.9" +name = "textwrap" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "thiserror-impl 2.0.9", + "unicode-width 0.1.14", ] [[package]] -name = "thiserror-impl" +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" + +[[package]] +name = "thiserror" version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.93", + "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.9" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -5453,6 +5945,25 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-bip39" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +dependencies = [ + "anyhow", + "hmac 0.8.1", + "once_cell", + "pbkdf2 0.4.0", + "rand 0.7.3", + "rustc-hash", + "sha2 0.9.9", + "thiserror", + "unicode-normalization", + "wasm-bindgen", + "zeroize", +] + [[package]] name = "tinystr" version = "0.7.6" @@ -5491,7 +6002,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.8", "tokio-macros", "windows-sys 0.52.0", ] @@ -5502,8 +6013,8 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -5519,21 +6030,22 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.24.1" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.21.12", + "rustls 0.20.9", "tokio", + "webpki", ] [[package]] name = "tokio-rustls" -version = "0.26.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.23.20", + "rustls 0.21.12", "tokio", ] @@ -5550,17 +6062,18 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", "log", - "rustls 0.21.12", + "rustls 0.20.9", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.23.4", "tungstenite", - "webpki-roots 0.25.4", + "webpki", + "webpki-roots 0.22.6", ] [[package]] @@ -5593,36 +6106,26 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap", + "indexmap 2.7.0", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] -name = "tower" -version = "0.5.2" +name = "toml_edit" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper 1.0.2", - "tokio", - "tower-layer", - "tower-service", + "indexmap 2.7.0", + "toml_datetime", + "winnow 0.6.20", ] -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -5635,11 +6138,22 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "log", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +dependencies = [ + "proc-macro2 1.0.92", + "quote 1.0.38", + "syn 2.0.93", +] + [[package]] name = "tracing-core" version = "0.1.33" @@ -5657,23 +6171,24 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ + "base64 0.13.1", "byteorder", "bytes", - "data-encoding", "http 0.2.12", "httparse", "log", "rand 0.8.5", - "rustls 0.21.12", - "sha1", - "thiserror 1.0.69", + "rustls 0.20.9", + "sha-1", + "thiserror", "url", "utf-8", - "webpki-roots 0.24.0", + "webpki", + "webpki-roots 0.22.6", ] [[package]] @@ -5682,24 +6197,45 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicase" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" - [[package]] name = "unicode-ident" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + [[package]] name = "unicode-width" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -5708,11 +6244,11 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "universal-hash" -version = "0.5.1" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "crypto-common", + "generic-array", "subtle", ] @@ -5725,6 +6261,12 @@ dependencies = [ "void", ] +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "untrusted" version = "0.9.0" @@ -5782,6 +6324,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version_check" version = "0.9.5" @@ -5794,16 +6342,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -5844,8 +6382,8 @@ checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", "wasm-bindgen-shared", ] @@ -5869,7 +6407,7 @@ version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ - "quote", + "quote 1.0.38", "wasm-bindgen-macro-support", ] @@ -5879,8 +6417,8 @@ version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", "wasm-bindgen-backend", "wasm-bindgen-shared", @@ -5913,21 +6451,22 @@ dependencies = [ ] [[package]] -name = "webpki-root-certs" -version = "0.26.7" +name = "webpki" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd5da49bdf1f30054cfe0b8ce2958b8fbeb67c4d82c8967a598af481bef255c" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "rustls-pki-types", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "webpki-roots" -version = "0.24.0" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "rustls-webpki 0.101.7", + "webpki", ] [[package]] @@ -5977,33 +6516,18 @@ dependencies = [ ] [[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" +name = "windows-sys" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows-result", - "windows-targets 0.52.6", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -6064,6 +6588,12 @@ dependencies = [ "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -6076,6 +6606,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -6088,6 +6624,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -6106,6 +6648,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -6118,6 +6666,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -6130,6 +6684,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -6142,6 +6702,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -6154,6 +6720,15 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + [[package]] name = "winnow" version = "0.6.20" @@ -6173,6 +6748,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "write16" version = "1.0.0" @@ -6199,7 +6784,22 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror 1.0.69", + "thiserror", + "time", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ "time", ] @@ -6221,8 +6821,8 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", "synstructure 0.13.1", ] @@ -6243,8 +6843,8 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -6263,17 +6863,17 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", "synstructure 0.13.1", ] [[package]] name = "zeroize" -version = "1.8.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" dependencies = [ "zeroize_derive", ] @@ -6284,8 +6884,8 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] @@ -6306,26 +6906,27 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.92", + "quote 1.0.38", "syn 2.0.93", ] [[package]] name = "zstd" -version = "0.13.2" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.2.1" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" dependencies = [ + "libc", "zstd-sys", ] diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index 3f4c124..7f8bf2d 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cli" +name = "cheese" version = "0.1.0" edition = "2021" diff --git a/packages/cli/src/main.rs b/packages/cli/src/main.rs index 7161309..1d1918a 100644 --- a/packages/cli/src/main.rs +++ b/packages/cli/src/main.rs @@ -364,6 +364,16 @@ async fn run_iteration(executor: &Option) -> Result<()> { .iter() .find(|p| p.pool_address == opp.pool_address) .unwrap(); + + // Skip derived pools + if pool.derived { + println!( + "\nSkipping derived pool: {} ({})", + pool.pool_address, opp.symbol + ); + continue; + } + let fee_percent = pool .total_fee_pct .trim_end_matches('%') @@ -414,7 +424,15 @@ async fn run_iteration(executor: &Option) -> Result<()> { // Execute trade if in hot mode if let Some(executor) = executor { - println!("\nExecuting trade..."); + println!("\n=== Starting Trade Execution ==="); + println!("Trade details:"); + println!("- Is sell: {}", opp.is_sell); + println!("- Max trade size: {}", opp.max_trade_size); + println!("- USDC price: {}", opp.usdc_price); + println!("- Implied price: {}", opp.implied_price); + println!("- Net profit USD: {}", opp.net_profit_usd); + println!("- Pool address: {}", opp.pool_address); + println!("- Symbol: {}", opp.symbol); // Get the other token's index let (_, other_ix) = if pool.pool_token_mints[0] == CHEESE_MINT { @@ -422,12 +440,26 @@ async fn run_iteration(executor: &Option) -> Result<()> { } else { (1, 0) }; + println!("\nPool details:"); + println!("- Pool token mints: {:?}", pool.pool_token_mints); + println!("- Pool token amounts: {:?}", pool.pool_token_amounts); + println!("- Other token index: {}", other_ix); + + // Ensure all necessary token accounts exist before trading + println!("\nEnsuring token accounts exist..."); + executor.ensure_token_account(USDC_MINT).await?; + executor.ensure_token_account(CHEESE_MINT).await?; + executor + .ensure_token_account(&pool.pool_token_mints[other_ix]) + .await?; if opp.is_sell { - // Path: USDC -> CHEESE -> Target -> CHEESE -> USDC + println!("\nExecuting sell path: USDC -> CHEESE -> Target -> CHEESE -> USDC"); // 1. USDC -> CHEESE on Meteora let amount_in_usdc = (opp.max_trade_size * opp.usdc_price * 1_000_000.0) as u64; + println!("\nStep 1: USDC -> CHEESE"); + println!("Amount in USDC: {}", amount_in_usdc); let sig1 = executor .execute_trade( usdc_pool, @@ -441,6 +473,8 @@ async fn run_iteration(executor: &Option) -> Result<()> { // 2. CHEESE -> Target token let amount_in_cheese = (opp.max_trade_size * 1_000_000_000.0) as u64; + println!("\nStep 2: CHEESE -> {}", opp.symbol); + println!("Amount in CHEESE: {}", amount_in_cheese); let sig2 = executor .execute_trade( pool, @@ -454,6 +488,8 @@ async fn run_iteration(executor: &Option) -> Result<()> { // 3. Target -> CHEESE let amount_in_target = (opp.other_qty * 0.1 * 1_000_000_000.0) as u64; // 10% of target token liquidity + println!("\nStep 3: {} -> CHEESE", opp.symbol); + println!("Amount in {}: {}", opp.symbol, amount_in_target); let sig3 = executor .execute_trade( pool, @@ -466,15 +502,19 @@ async fn run_iteration(executor: &Option) -> Result<()> { println!("3. {} -> CHEESE: {}", opp.symbol, sig3); // 4. CHEESE -> USDC + println!("\nStep 4: CHEESE -> USDC"); + println!("Amount in CHEESE: {}", amount_in_cheese); let sig4 = executor .execute_trade(usdc_pool, CHEESE_MINT, USDC_MINT, amount_in_cheese, 50) .await?; println!("4. CHEESE -> USDC: {}", sig4); } else { - // Path: USDC -> CHEESE -> Target -> CHEESE -> USDC + println!("\nExecuting buy path: USDC -> CHEESE -> Target -> CHEESE -> USDC"); // 1. USDC -> CHEESE on Meteora let amount_in_usdc = (opp.max_trade_size * opp.usdc_price * 1_000_000.0) as u64; + println!("\nStep 1: USDC -> CHEESE"); + println!("Amount in USDC: {}", amount_in_usdc); let sig1 = executor .execute_trade(usdc_pool, USDC_MINT, CHEESE_MINT, amount_in_usdc, 50) .await?; @@ -482,6 +522,8 @@ async fn run_iteration(executor: &Option) -> Result<()> { // 2. CHEESE -> Target token let amount_in_cheese = (opp.max_trade_size * 1_000_000_000.0) as u64; + println!("\nStep 2: CHEESE -> {}", opp.symbol); + println!("Amount in CHEESE: {}", amount_in_cheese); let sig2 = executor .execute_trade( pool, @@ -495,6 +537,8 @@ async fn run_iteration(executor: &Option) -> Result<()> { // 3. Target -> CHEESE let amount_in_target = (opp.other_qty * 0.1 * 1_000_000_000.0) as u64; // 10% of target token liquidity + println!("\nStep 3: {} -> CHEESE", opp.symbol); + println!("Amount in {}: {}", opp.symbol, amount_in_target); let sig3 = executor .execute_trade( pool, @@ -507,6 +551,8 @@ async fn run_iteration(executor: &Option) -> Result<()> { println!("3. {} -> CHEESE: {}", opp.symbol, sig3); // 4. CHEESE -> USDC + println!("\nStep 4: CHEESE -> USDC"); + println!("Amount in CHEESE: {}", amount_in_cheese); let sig4 = executor .execute_trade(usdc_pool, CHEESE_MINT, USDC_MINT, amount_in_cheese, 50) .await?; diff --git a/packages/libcheese/Cargo.toml b/packages/libcheese/Cargo.toml index ec3080f..6931bbc 100644 --- a/packages/libcheese/Cargo.toml +++ b/packages/libcheese/Cargo.toml @@ -9,8 +9,13 @@ reqwest = { version = "0.12", features = ["json"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" anyhow = "1.0" -solana-sdk = "2.1.7" -solana-client = "2.1.7" -spl-associated-token-account = "6.0.0" +solana-sdk = "1.14" +solana-client = "1.14" +spl-associated-token-account = "1.1" +spl-token = "3.5" +solana-program = "1.14" bincode = "1.3" base64 = "0.22.1" +anchor-lang = { version = "0.26", features = ["init-if-needed"] } +prog-dynamic-amm = { git = "https://github.com/mercurial-finance/mercurial-dynamic-amm-sdk", branch = "master", package = "dynamic-amm" } +prog-dynamic-vault = { git = "https://github.com/mercurial-finance/mercurial-dynamic-amm-sdk", branch = "master", package = "dynamic-vault" } diff --git a/packages/libcheese/src/meteora.rs b/packages/libcheese/src/meteora.rs index 87c0efa..b8a08a1 100644 --- a/packages/libcheese/src/meteora.rs +++ b/packages/libcheese/src/meteora.rs @@ -1,7 +1,30 @@ use crate::common::{de_string_to_f64, CHEESE_MINT}; +use anchor_lang::{prelude::*, AnchorDeserialize}; use anyhow::{anyhow, Result}; +use bincode; +use borsh::BorshDeserialize; +use prog_dynamic_amm::state::Pool; +use prog_dynamic_vault::state::Vault; use reqwest::Client; use serde::{Deserialize, Serialize}; +use solana_client::rpc_client::RpcClient; +use solana_sdk::commitment_config::CommitmentConfig; +use solana_sdk::{ + instruction::{AccountMeta, Instruction}, + signature::{Keypair, Signature}, + signer::Signer, + transaction::Transaction, +}; +use spl_token; +use std::str::FromStr; + +pub const METEORA_PROGRAM_ID: &str = "Eo7WjKq67rjJQSZxS6z3YkapzY3eMj6Xy8X5EQVn5UaB"; +pub const METEORA_DEPOSIT_PROGRAM_ID: &str = "24Uqj9JCLxUeoC3hGfh5W3s9FM9uCHDS2SG3LYwBpyTi"; + +// Helper function to convert between Pubkey types +fn to_solana_pubkey(pubkey: &Pubkey) -> solana_sdk::pubkey::Pubkey { + solana_sdk::pubkey::Pubkey::new_from_array(pubkey.to_bytes()) +} // ----------------------------------- // Networking @@ -96,13 +119,16 @@ pub struct PaginatedPoolSearchResponse { // ----------------------------------- pub async fn get_meteora_quote( client: &Client, - pool_address: &str, + pool: &MeteoraPool, input_mint: &str, output_mint: &str, amount_in: u64, ) -> Result { - // Get current pool state - let pool = fetch_pool_state(client, pool_address).await?; + println!("\nCalculating quote for:"); + println!("Pool: {}", pool.pool_address); + println!("Input mint: {}", input_mint); + println!("Output mint: {}", output_mint); + println!("Amount in: {}", amount_in); // Find the indices for input and output tokens let (in_idx, out_idx) = if pool.pool_token_mints[0] == input_mint { @@ -110,81 +136,191 @@ pub async fn get_meteora_quote( } else { (1, 0) }; + println!("Input token index: {}", in_idx); + println!("Output token index: {}", out_idx); // Parse pool amounts - let in_amount_pool: f64 = pool.pool_token_amounts[in_idx].parse()?; - let out_amount_pool: f64 = pool.pool_token_amounts[out_idx].parse()?; + let in_amount_pool: f64 = pool.pool_token_amounts[in_idx].parse().map_err(|e| { + anyhow!( + "Failed to parse input amount: {} - Value: {}", + e, + pool.pool_token_amounts[in_idx] + ) + })?; + let out_amount_pool: f64 = pool.pool_token_amounts[out_idx].parse().map_err(|e| { + anyhow!( + "Failed to parse output amount: {} - Value: {}", + e, + pool.pool_token_amounts[out_idx] + ) + })?; + println!("Pool input amount: {}", in_amount_pool); + println!("Pool output amount: {}", out_amount_pool); // Calculate fee - let fee_pct: f64 = pool.total_fee_pct.trim_end_matches('%').parse::()? / 100.0; + let fee_pct: f64 = pool + .total_fee_pct + .trim_end_matches('%') + .parse() + .map_err(|e| { + anyhow!( + "Failed to parse fee percentage: {} - Value: {}", + e, + pool.total_fee_pct + ) + })?; + let fee_pct = fee_pct / 100.0; let amount_in_after_fee = amount_in as f64 * (1.0 - fee_pct); + println!("Fee percentage: {}%", fee_pct * 100.0); + println!("Amount after fee: {}", amount_in_after_fee); // Calculate out amount using constant product formula: (x + Δx)(y - Δy) = xy let amount_out = (out_amount_pool * amount_in_after_fee) / (in_amount_pool + amount_in_after_fee); let fee_amount = (amount_in as f64 * fee_pct) as u64; + println!("Calculated output amount: {}", amount_out); + println!("Fee amount: {}", fee_amount); // Calculate price impact let price_before = out_amount_pool / in_amount_pool; let price_after = (out_amount_pool - amount_out) / (in_amount_pool + amount_in as f64); let price_impact = ((price_before - price_after) / price_before * 100.0).to_string(); + println!("Price before: {}", price_before); + println!("Price after: {}", price_after); + println!("Price impact: {}%", price_impact); - Ok(MeteoraQuoteResponse { - pool_address: pool_address.to_string(), + let quote = MeteoraQuoteResponse { + pool_address: pool.pool_address.clone(), input_mint: input_mint.to_string(), output_mint: output_mint.to_string(), in_amount: amount_in.to_string(), out_amount: amount_out.to_string(), fee_amount: fee_amount.to_string(), price_impact, - }) -} - -async fn fetch_pool_state(client: &Client, pool_address: &str) -> Result { - let base_url = "https://amm-v2.meteora.ag"; - let pools_url = format!("{}/pools", base_url); - - let resp = client - .get(&pools_url) - .query(&[("address", &[pool_address.to_string()])]) - .send() - .await?; - - if !resp.status().is_success() { - return Err(anyhow!("Failed to fetch pool state: {}", resp.status())); - } + }; + println!("\nFinal quote: {:?}", quote); - let pools: Vec = resp.json().await?; - pools - .into_iter() - .next() - .ok_or_else(|| anyhow!("Pool not found: {}", pool_address)) + Ok(quote) } pub async fn get_meteora_swap_transaction( client: &Client, quote: &MeteoraQuoteResponse, user_pubkey: &str, -) -> Result { - let base_url = "https://amm-v2.meteora.ag"; - let swap_url = format!("{}/swap", base_url); - - let swap_request = MeteoraSwapRequest { - user_public_key: user_pubkey.to_string(), - quote_response: quote.clone(), - }; - - // Log the swap request - println!("Sending Meteora swap request: {:?}", swap_request); - - let resp = client.post(&swap_url).json(&swap_request).send().await?; + rpc_client: &RpcClient, + wallet: &Keypair, +) -> Result { + println!("\nBuilding swap transaction:"); + println!("Pool: {}", quote.pool_address); + println!("User: {}", user_pubkey); + println!("Input mint: {}", quote.input_mint); + println!("Output mint: {}", quote.output_mint); + println!("Amount in: {}", quote.in_amount); + + let program_id = Pubkey::from_str(METEORA_PROGRAM_ID) + .map_err(|e| anyhow!("Failed to parse program ID: {}", e))?; + let pool = Pubkey::from_str("e.pool_address) + .map_err(|e| anyhow!("Failed to parse pool address: {}", e))?; + let user = + Pubkey::from_str(user_pubkey).map_err(|e| anyhow!("Failed to parse user pubkey: {}", e))?; + let input_mint = Pubkey::from_str("e.input_mint) + .map_err(|e| anyhow!("Failed to parse input mint: {}", e))?; + let output_mint = Pubkey::from_str("e.output_mint) + .map_err(|e| anyhow!("Failed to parse output mint: {}", e))?; + let amount_in = quote + .in_amount + .parse::() + .map_err(|e| anyhow!("Failed to parse amount in: {}", e))?; + + // Get program states + let program_amm_client = + RpcClient::new_with_commitment(rpc_client.url(), CommitmentConfig::finalized()); + let account = program_amm_client.get_account(&to_solana_pubkey(&pool))?; + let mut data = &account.data[..]; + let pool_state = Pool::try_deserialize_unchecked(&mut data)?; + + let program_vault_client = + RpcClient::new_with_commitment(rpc_client.url(), CommitmentConfig::finalized()); + let account = program_vault_client.get_account(&to_solana_pubkey(&pool_state.a_vault))?; + let mut data = &account.data[..]; + let a_vault_state = Vault::try_deserialize_unchecked(&mut data)?; + let account = program_vault_client.get_account(&to_solana_pubkey(&pool_state.b_vault))?; + let mut data = &account.data[..]; + let b_vault_state = Vault::try_deserialize_unchecked(&mut data)?; + + // Calculate minimum out amount with 0.5% slippage + let min_amount_out = (quote + .out_amount + .parse::() + .map_err(|e| anyhow!("Failed to parse out amount: {}", e))? + * 0.995) as u64; + + // Build instructions vector + let mut instructions = Vec::new(); + + // Add compute budget instructions + instructions + .push(solana_sdk::compute_budget::ComputeBudgetInstruction::set_compute_unit_price(1)); + instructions.push( + solana_sdk::compute_budget::ComputeBudgetInstruction::set_compute_unit_limit(200_000), + ); - if !resp.status().is_success() { - return Err(anyhow!("Meteora swap request failed: {}", resp.status())); + // Get user token accounts + let user_source_token = + spl_associated_token_account::get_associated_token_address(&user, &input_mint); + let user_destination_token = + spl_associated_token_account::get_associated_token_address(&user, &output_mint); + + // Create token accounts if they don't exist + if rpc_client.get_account(&user_destination_token).is_err() { + println!("Creating destination token account..."); + instructions.push( + spl_associated_token_account::instruction::create_associated_token_account( + &wallet.pubkey(), + &user, + &output_mint, + &spl_token::id(), + ), + ); } - let swap: MeteoraSwapResponse = resp.json().await?; - Ok(swap.transaction) + // Add swap instruction + instructions.push(Instruction { + program_id, + accounts: vec![ + AccountMeta::new(pool, false), // Pool + AccountMeta::new(user_source_token, false), // User source token + AccountMeta::new(user_destination_token, false), // User destination token + AccountMeta::new(pool_state.a_vault_lp, false), // A vault LP + AccountMeta::new(pool_state.b_vault_lp, false), // B vault LP + AccountMeta::new(pool_state.a_vault, false), // A vault + AccountMeta::new(pool_state.b_vault, false), // B vault + AccountMeta::new_readonly(a_vault_state.lp_mint, false), // A vault LP mint + AccountMeta::new_readonly(b_vault_state.lp_mint, false), // B vault LP mint + AccountMeta::new(a_vault_state.token_vault, false), // A token vault + AccountMeta::new(b_vault_state.token_vault, false), // B token vault + AccountMeta::new(user, true), // User (signer) + AccountMeta::new_readonly(prog_dynamic_vault::ID, false), // Vault program + AccountMeta::new_readonly(spl_token::id(), false), // Token program + AccountMeta::new(pool_state.protocol_token_a_fee, false), // Protocol fee A + ], + data: { + let mut data = vec![ + 248, 198, 158, 145, 225, 117, 135, 200, // Anchor discriminator for "swap" + ]; + data.extend_from_slice(&amount_in.to_le_bytes()); + data.extend_from_slice(&min_amount_out.to_le_bytes()); + data + }, + }); + + // Create transaction + let recent_blockhash = rpc_client.get_latest_blockhash()?; + let transaction = + Transaction::new_signed_with_payer(&instructions, Some(&user), &[wallet], recent_blockhash); + + println!("\nTransaction created successfully"); + Ok(transaction) } #[derive(Debug, Deserialize, Clone, Serialize)] diff --git a/packages/libcheese/src/solana.rs b/packages/libcheese/src/solana.rs index bdad1e7..d7b6338 100644 --- a/packages/libcheese/src/solana.rs +++ b/packages/libcheese/src/solana.rs @@ -85,32 +85,26 @@ impl TradeExecutor { amount_in: u64, ) -> Result { // 1. Get quote from Meteora - let quote = meteora::get_meteora_quote( - &self.http_client, - &pool.pool_address, - input_mint, - output_mint, - amount_in, - ) - .await?; + let quote = + meteora::get_meteora_quote(&self.http_client, pool, input_mint, output_mint, amount_in) + .await?; println!( "Got quote: {} -> {} ({} -> {})", input_mint, output_mint, quote.in_amount, quote.out_amount ); - // 2. Get swap transaction - let swap_tx = meteora::get_meteora_swap_transaction( + // 2. Build swap transaction + let tx = meteora::get_meteora_swap_transaction( &self.http_client, "e, &self.wallet.pubkey().to_string(), + &self.rpc_client, + &self.wallet, ) .await?; - // 3. Deserialize and sign transaction - let tx: Transaction = bincode::deserialize(&base64::decode(swap_tx)?)?; - - // 4. Simulate transaction with detailed error reporting + // 3. Simulate transaction with detailed error reporting match self.simulate_transaction(&tx).await { Ok(_) => println!("Transaction simulation successful"), Err(e) => { @@ -119,7 +113,7 @@ impl TradeExecutor { } } - // 5. Send and confirm transaction + // 4. Send and confirm transaction self.send_and_confirm_transaction(&tx).await } @@ -167,6 +161,31 @@ impl TradeExecutor { .map_err(|e| anyhow!("Failed to send transaction: {}", e))?; Ok(signature) } + + /// Ensure a token account exists for the given mint, create if it doesn't + pub async fn ensure_token_account(&self, mint: &str) -> Result<()> { + let token_account = self.find_token_account(mint)?; + if self.rpc_client.get_account(&token_account).is_err() { + println!("Creating token account for mint: {}", mint); + // Create ATA instruction + let create_ata_ix = spl_associated_token_account::create_associated_token_account( + &self.wallet.pubkey(), + &self.wallet.pubkey(), + &Pubkey::from_str(mint)?, + ); + // Build and send transaction + let recent_blockhash = self.rpc_client.get_latest_blockhash()?; + let tx = Transaction::new_signed_with_payer( + &[create_ata_ix], + Some(&self.wallet.pubkey()), + &[&self.wallet], + recent_blockhash, + ); + self.rpc_client.send_and_confirm_transaction(&tx)?; + println!("Created token account for mint: {}", mint); + } + Ok(()) + } } #[cfg(test)]