diff --git a/Cargo.lock b/Cargo.lock index 3321f79..066c470 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,6 +12,15 @@ dependencies = [ "regex", ] +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -34,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "opaque-debug", ] @@ -47,7 +56,7 @@ checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" dependencies = [ "aead", "aes", - "cipher 0.3.0", + "cipher", "ctr", "polyval", "subtle", @@ -60,20 +69,22 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.14", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if", + "getrandom 0.2.14", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -106,6 +117,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -130,6 +147,123 @@ version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +[[package]] +name = "ark-bn254" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a22f4561524cd949590d78d7d4c5df8f592430d221f7f3c9497bbafd8972120f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools", + "num-bigint 0.4.4", + "num-traits", + "paste", + "rustc_version", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint 0.4.4", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint 0.4.4", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + [[package]] name = "arrayref" version = "0.3.7" @@ -138,9 +272,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii" @@ -161,7 +295,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.21", + "time", ] [[package]] @@ -170,8 +304,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", "synstructure", ] @@ -182,8 +316,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -193,11 +327,22 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "brotli", "flate2", @@ -216,15 +361,37 @@ dependencies = [ "event-listener", ] +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -244,6 +411,89 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "autotools" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef941527c41b0fc0dd48511a8154cd5fc7e29200a0ff8b7203c5d777dbc795cf" +dependencies = [ + "cc", +] + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backoff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +dependencies = [ + "futures-core", + "getrandom 0.2.14", + "instant", + "pin-project-lite", + "rand 0.8.5", + "tokio", +] + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.12.3" @@ -258,9 +508,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -283,6 +533,15 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde", +] + [[package]] name = "bitmaps" version = "2.1.0" @@ -292,18 +551,30 @@ dependencies = [ "typenum", ] +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + [[package]] name = "blake3" -version = "1.3.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -351,6 +622,16 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "borsh" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +dependencies = [ + "borsh-derive 1.5.1", + "cfg_aliases", +] + [[package]] name = "borsh-derive" version = "0.9.3" @@ -360,7 +641,7 @@ dependencies = [ "borsh-derive-internal 0.9.3", "borsh-schema-derive-internal 0.9.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.56", + "proc-macro2", "syn 1.0.109", ] @@ -373,18 +654,32 @@ dependencies = [ "borsh-derive-internal 0.10.3", "borsh-schema-derive-internal 0.10.3", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.56", + "proc-macro2", "syn 1.0.109", ] +[[package]] +name = "borsh-derive" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.58", + "syn_derive", +] + [[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.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -394,8 +689,8 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -405,8 +700,8 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -416,16 +711,16 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "brotli" -version = "3.3.4" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -434,9 +729,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -466,9 +761,9 @@ dependencies = [ [[package]] name = "bytecheck" -version = "0.6.10" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fe11640a23eb24562225322cd3e452b93a3d4091d62fab69c70542fcd17d1f" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -477,20 +772,20 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.10" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31225543cb46f81a7e224762764f4a6a0f097b1db0b175f69e8065efaa42de5" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "bytemuck" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] @@ -501,22 +796,22 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bzip2" @@ -551,11 +846,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -564,27 +860,32 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.52.5", ] [[package]] name = "chrono-humanize" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32dce1ea1988dbdf9f9815ff11425828523bd2a134ec0805d2ac8af26ee6096e" +checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" dependencies = [ "chrono", ] @@ -598,16 +899,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clap" version = "2.34.0" @@ -616,7 +907,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -630,14 +921,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "clap_derive", "clap_lex", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim 0.10.0", "termcolor", - "textwrap 0.16.0", + "textwrap 0.16.1", ] [[package]] @@ -648,8 +939,8 @@ checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -662,16 +953,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - [[package]] name = "coinbase-pro-rs" version = "0.8.1" @@ -681,7 +962,7 @@ dependencies = [ "async-trait", "base64 0.13.1", "chrono", - "futures 0.3.28", + "futures 0.3.30", "futures-util", "hmac 0.10.1", "hyper", @@ -694,7 +975,7 @@ dependencies = [ "tokio", "tokio-tungstenite 0.13.0", "url", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -710,17 +991,26 @@ dependencies = [ "unreachable", ] +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.42.0", + "windows-sys 0.52.0", ] [[package]] @@ -751,15 +1041,15 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -767,9 +1057,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -782,9 +1072,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -874,7 +1164,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", + "cipher", ] [[package]] @@ -892,47 +1182,38 @@ dependencies = [ ] [[package]] -name = "cxx" -version = "1.0.94" +name = "darling" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", + "darling_core", + "darling_macro", ] [[package]] -name = "cxx-build" -version = "1.0.94" +name = "darling_core" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.27", - "scratch", - "syn 2.0.15", + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.58", ] [[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" +name = "darling_macro" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "darling_core", + "quote", + "syn 2.0.58", ] [[package]] @@ -948,9 +1229,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.3" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "der" @@ -970,11 +1251,20 @@ dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derivation-path" version = "0.2.0" @@ -982,10 +1272,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" [[package]] -name = "dialoguer" -version = "0.10.4" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "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", @@ -1004,9 +1305,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer 0.10.4", "crypto-common", @@ -1015,66 +1316,45 @@ dependencies = [ [[package]] name = "dir-diff" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b" +checksum = "a7ad16bf5f84253b50d6557681c58c3ab67c47c77d39fed9aeb56e947290bd10" dependencies = [ "walkdir", ] -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "displaydoc" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] -name = "dlopen" -version = "0.1.8" +name = "dlopen2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" +checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" dependencies = [ - "dlopen_derive", - "lazy_static", + "dlopen2_derive", "libc", + "once_cell", "winapi", ] [[package]] -name = "dlopen_derive" -version = "0.1.4" +name = "dlopen2_derive" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" +checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ - "libc", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -1115,47 +1395,50 @@ dependencies = [ "derivation-path", "ed25519-dalek", "hmac 0.12.1", - "sha2 0.10.6", + "sha2 0.10.8", ] [[package]] name = "educe" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079044df30bb07de7d846d41a184c4b00e66ebdac93ee459253474f3a47e50ae" +checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "either" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "ellipsis-client" -version = "0.1.17" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388d2d33cf89f9f49e47ffc8420ffc2a12dd1f995f0c88c12d64797f88211d44" +checksum = "a01d400975c0635b22a4cadb1484186450af37b7dc1fd46731f59c3eba86cee2" dependencies = [ "anyhow", "assert_matches", "async-trait", + "backoff", "base64 0.13.1", "bincode", "borsh 0.9.3", "bs58", "chrono-humanize", "crossbeam-channel", - "futures 0.3.28", + "ellipsis-transaction-utils", + "futures 0.3.30", "itertools", "lazy_static", "log", "serde", + "solana-banks-client", "solana-bpf-loader-program", "solana-client", "solana-logger", @@ -1170,6 +1453,9 @@ dependencies = [ "thiserror", "tokio", "tokio-serde", + "tracing", + "yellowstone-grpc-client", + "yellowstone-grpc-proto", ] [[package]] @@ -1179,13 +1465,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "598d7f4a52f256bc6d065f0ee1c8dd07275952f9425bdfc1639595c924e1498e" dependencies = [ "bs58", - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "rustversion", "solana-program", "syn 1.0.109", ] +[[package]] +name = "ellipsis-transaction-utils" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47c75d06e82a2d9d393ee598485ebed54f1bcffe049fc68b7aac8d3f77c85ab7" +dependencies = [ + "bs58", + "itertools", + "serde", + "solana-sdk", + "solana-transaction-status", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -1194,57 +1493,44 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] [[package]] name = "enum-iterator" -version = "0.8.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.8.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] name = "enum-ordinalize" -version = "3.1.12" +version = "3.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bb1df8b45ecb7ffa78dca1c17a438fb193eb083db0b1b494d2a61bcb5096a" +checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" dependencies = [ - "num-bigint 0.4.3", + "num-bigint 0.4.4", "num-traits", - "proc-macro2 1.0.56", - "quote 1.0.27", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" -dependencies = [ - "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -1261,24 +1547,19 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.3.1" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1289,12 +1570,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "feature-probe" @@ -1304,21 +1582,27 @@ checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1347,13 +1631,28 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] +[[package]] +name = "fs-err" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "futures" version = "0.1.31" @@ -1362,9 +1661,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1377,9 +1676,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1387,15 +1686,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1404,38 +1703,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures 0.1.31", "futures-channel", @@ -1450,15 +1749,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1495,9 +1785,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -1506,6 +1796,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + [[package]] name = "goblin" version = "0.5.4" @@ -1519,9 +1815,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.18" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1529,10 +1825,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.8", + "tokio-util 0.7.11", "tracing", ] @@ -1569,9 +1865,15 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.5", ] +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + [[package]] name = "heck" version = "0.4.1" @@ -1589,18 +1891,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "histogram" @@ -1634,7 +1927,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -1650,9 +1943,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1661,9 +1954,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1678,9 +1971,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1690,9 +1983,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1714,10 +2007,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "rustls", @@ -1725,6 +2019,18 @@ dependencies = [ "tokio-rustls", ] +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -1740,33 +2046,38 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1790,9 +2101,9 @@ dependencies = [ [[package]] name = "index_list" -version = "0.2.7" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce" +checksum = "70891286cb8e844fdfcf1178b47569699f9e20b5ecc4b45a6240a64771444638" [[package]] name = "indexmap" @@ -1805,24 +2116,26 @@ dependencies = [ ] [[package]] -name = "indicatif" -version = "0.16.2" +name = "indexmap" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ - "console", - "lazy_static", - "number_prefix", - "regex", + "equivalent", + "hashbrown 0.14.3", ] [[package]] -name = "inout" -version = "0.1.3" +name = "indicatif" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ - "generic-array", + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", ] [[package]] @@ -1836,29 +2149,18 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.7.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itertools" @@ -1886,9 +2188,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1899,7 +2201,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "futures-executor", "futures-util", "log", @@ -1925,31 +2227,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lib-sokoban" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6295db13f26aaa8bb4fb38e0c9ff50253814aa490eef7b4d6aa106ba6fc843" +checksum = "0640eb476052d9f48e920969f8117b054d1be1a0b2e4055e61293cd2b1afcce1" dependencies = [ "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", "thiserror", ] [[package]] name = "libc" -version = "0.2.144" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libsecp256k1" @@ -2000,25 +2292,22 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" +name = "light-poseidon" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" dependencies = [ - "cc", + "ark-bn254", + "ark-ff", + "num-bigint 0.4.4", + "thiserror", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" -version = "0.3.7" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" @@ -2032,11 +2321,17 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lru" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" dependencies = [ - "cfg-if", + "hashbrown 0.12.3", ] [[package]] @@ -2059,11 +2354,17 @@ dependencies = [ "libc", ] +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -2076,9 +2377,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] @@ -2092,6 +2393,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + [[package]] name = "merlin" version = "3.0.0" @@ -2118,23 +2428,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2153,18 +2462,23 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] +[[package]] +name = "multimap" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2178,14 +2492,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", + "pin-utils", ] [[package]] @@ -2234,9 +2549,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -2253,17 +2568,34 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +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.56", - "quote 1.0.27", + "proc-macro2", + "quote", "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", + "syn 2.0.58", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -2276,9 +2608,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -2299,20 +2631,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.9", "libc", ] @@ -2322,7 +2654,25 @@ version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" dependencies = [ - "num_enum_derive", + "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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive 0.7.2", ] [[package]] @@ -2332,18 +2682,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.0", - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] -name = "number_prefix" -version = "0.4.0" +name = "num_enum_derive" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate 1.3.0", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] name = "oid-registry" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2354,9 +2737,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -2366,11 +2749,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -2385,9 +2768,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -2398,9 +2781,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -2429,9 +2812,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.5.0" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "ouroboros" @@ -2451,8 +2834,8 @@ checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -2479,6 +2862,12 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "pbkdf2" version = "0.4.0" @@ -2494,7 +2883,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -2508,9 +2897,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "percentage" @@ -2522,10 +2911,41 @@ dependencies = [ ] [[package]] -name = "phoenix-sdk" +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap 2.2.6", +] + +[[package]] +name = "phoenix-common" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee248e0ae77b50bda7540f54f68940481956b464a30f2bb0d0a708c8258a4ee" +checksum = "03dca57d9eb69b3382cd2a879d52517609561a1030479f69fe5f023f84b9b2cc" +dependencies = [ + "borsh 0.9.3", + "bytemuck", + "ellipsis-macros", + "itertools", + "lib-sokoban", + "num_enum 0.5.9", + "shank 0.0.12", + "solana-program", + "solana-security-txt", + "spl-associated-token-account", + "spl-token 3.5.0", + "static_assertions", + "thiserror", +] + +[[package]] +name = "phoenix-sdk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de88e9ab138c1ae84eb7e4896af1fc49026e964b894fb2c211eac19ce7be754c" dependencies = [ "anyhow", "async-trait", @@ -2534,113 +2954,120 @@ dependencies = [ "clap 3.2.25", "coinbase-pro-rs", "ellipsis-client", - "futures 0.3.28", + "futures 0.3.30", "itertools", "num-traits", + "phoenix-common", "phoenix-sdk-core", - "phoenix-v1", + "phoenix-seat-manager-common 0.1.1", "rand 0.7.3", "rust_decimal", "rust_decimal_macros", + "serde", "solana-client", - "solana-program", "solana-sdk", "solana-transaction-status", - "spl-token", + "spl-token 3.5.0", "tokio", ] [[package]] name = "phoenix-sdk-core" -version = "0.2.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ba3b4826d4b96f6538e86d5e38e70f0ae69fba78194f2fa4f75c5e198a608e" +checksum = "4219e57e49e9a2574939d60f92e206b9b78943206eddb9b3493a36c81c1bcc93" dependencies = [ "anyhow", "borsh 0.9.3", + "bytemuck", + "ellipsis-transaction-utils", "itertools", "num-traits", - "phoenix-v1", + "phoenix-common", "rand 0.7.3", "rust_decimal", "rust_decimal_macros", - "solana-program", "solana-sdk", + "spl-token 3.5.0", ] [[package]] -name = "phoenix-seat-manager" -version = "0.1.2" +name = "phoenix-seat-manager-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff4998911d6bea36189f5f2c854b65b9b25078650115a73c929747adec9a9e9" dependencies = [ "borsh 0.9.3", "bytemuck", - "ellipsis-client", "ellipsis-macros", "itertools", "lib-sokoban", - "num_enum", - "phoenix-sdk", - "phoenix-v1", + "num_enum 0.5.9", + "phoenix-common", "proc-macro-crate 1.3.0", - "rand 0.7.3", - "shank", + "shank 0.0.12", "solana-program", - "solana-sdk", "solana-security-txt", "spl-associated-token-account", - "spl-token", + "spl-token 3.5.0", "static_assertions", "thiserror", - "tokio", - "toml_edit", + "toml_edit 0.18.1", ] [[package]] -name = "phoenix-v1" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a35e8990b3ae5c2026bc274c08ad675da1fcd2630851ce5b7e1e78189d3a602" +name = "phoenix-seat-manager-common" +version = "0.1.2" dependencies = [ "borsh 0.9.3", "bytemuck", + "ellipsis-client", "ellipsis-macros", "itertools", "lib-sokoban", - "num_enum", - "shank", + "num_enum 0.5.9", + "phoenix-common", + "phoenix-sdk", + "proc-macro-crate 1.3.0", + "rand 0.7.3", + "shank 0.4.2", "solana-program", + "solana-program-test", + "solana-sdk", "solana-security-txt", "spl-associated-token-account", - "spl-token", + "spl-token 3.5.0", "static_assertions", "thiserror", + "tokio", + "toml_edit 0.18.1", ] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2661,9 +3088,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plain" @@ -2683,12 +3110,34 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "prettyplease" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +dependencies = [ + "proc-macro2", + "syn 2.0.58", +] + [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -2705,7 +3154,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.18.1", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", ] [[package]] @@ -2715,8 +3173,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", "version_check", ] @@ -2727,27 +3185,80 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "version_check", ] [[package]] name = "proc-macro2" -version = "0.4.30" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ - "unicode-xid 0.1.0", + "unicode-ident", ] [[package]] -name = "proc-macro2" -version = "1.0.56" +name = "prost" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ - "unicode-ident", + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck", + "itertools", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 2.0.58", + "tempfile", +] + +[[package]] +name = "prost-derive" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost", +] + +[[package]] +name = "protobuf-src" +version = "1.1.0+21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1" +dependencies = [ + "autotools", ] [[package]] @@ -2765,8 +3276,8 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] @@ -2779,76 +3290,79 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "qualifier_attr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "quinn" -version = "0.8.5" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", - "futures-channel", - "futures-util", - "fxhash", + "pin-project-lite", "quinn-proto", "quinn-udp", + "rustc-hash", "rustls", "thiserror", "tokio", "tracing", - "webpki", ] [[package]] name = "quinn-proto" -version = "0.8.4" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", - "fxhash", "rand 0.8.5", - "ring", + "ring 0.16.20", + "rustc-hash", "rustls", "rustls-native-certs", - "rustls-pemfile 0.2.1", "slab", "thiserror", "tinyvec", "tracing", - "webpki", ] [[package]] name = "quinn-udp" -version = "0.1.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ - "futures-util", + "bytes", "libc", - "quinn-proto", "socket2", - "tokio", "tracing", + "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "0.6.13" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 0.4.30", + "proc-macro2", ] [[package]] -name = "quote" -version = "1.0.27" +name = "radium" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -dependencies = [ - "proc-macro2 1.0.56", -] +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -2909,7 +3423,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.14", ] [[package]] @@ -2954,13 +3468,13 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.21", + "ring 0.16.20", + "time", "yasna", ] @@ -2970,34 +3484,35 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "regex" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ - "getrandom 0.2.9", - "redox_syscall 0.2.16", - "thiserror", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.8.1" +name = "regex-automata" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -3006,27 +3521,27 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rend" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", - "base64 0.21.0", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -3044,19 +3559,21 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "rustls-pemfile 1.0.2", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-rustls", - "tokio-util 0.7.8", + "tokio-util 0.7.11", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", + "webpki-roots 0.25.4", "winreg", ] @@ -3069,59 +3586,85 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.14", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + [[package]] name = "rkyv" -version = "0.7.41" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21499ed91807f07ae081880aabb2ccc0235e9d88011867d984525e9a4c3cfa3e" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ + "bitvec", "bytecheck", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", "rkyv_derive", "seahash", + "tinyvec", + "uuid 1.8.0", ] [[package]] name = "rkyv_derive" -version = "0.7.41" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1c672430eb41556291981f45ca900a0239ad007242d1cb4b4167af842db666" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", ] [[package]] name = "rpassword" -version = "6.0.1" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", - "serde", - "serde_json", - "winapi", + "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 = "rust_decimal" -version = "1.29.1" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", - "borsh 0.10.3", - "bytecheck", - "byteorder", + "borsh 1.5.1", "bytes", "num-traits", "rand 0.8.5", @@ -3132,19 +3675,19 @@ dependencies = [ [[package]] name = "rust_decimal_macros" -version = "1.29.1" +version = "1.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e773fd3da1ed42472fdf3cfdb4972948a555bc3d73f5e0bdb99d17e7b54c687" +checksum = "e418701588729bef95e7a655f2b483ad64bb97c46e8e79fde83efd92aaab6d82" dependencies = [ - "quote 1.0.27", + "quote", "rust_decimal", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3172,65 +3715,65 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags", + "bitflags 2.5.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring", + "ring 0.17.8", + "rustls-webpki", "sct", - "webpki", ] [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.2", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", ] [[package]] -name = "rustls-pemfile" -version = "1.0.2" +name = "rustls-webpki" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "base64 0.21.0", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "ryu" @@ -3249,24 +3792,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.52.0", ] [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll" @@ -3279,23 +3816,23 @@ dependencies = [ [[package]] name = "scroll_derive" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -3306,11 +3843,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.8.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -3319,9 +3856,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -3329,44 +3866,44 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.162" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.9" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.162" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -3386,15 +3923,25 @@ dependencies = [ ] [[package]] -name = "serde_yaml" -version = "0.8.26" +name = "serde_with" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ - "indexmap", - "ryu", "serde", - "yaml-rust", + "serde_with_macros", +] + +[[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", + "quote", + "syn 2.0.58", ] [[package]] @@ -3411,14 +3958,14 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.10.1" +name = "sha1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3436,13 +3983,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3463,7 +4010,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -3473,7 +4020,16 @@ version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439c00542aa8b4c777750b3130ce36fcff86ba215d54006d47d67359513b70be" dependencies = [ - "shank_macro", + "shank_macro 0.0.12", +] + +[[package]] +name = "shank" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d894855493d4ce613b25550fe1ed1c62d0af5486b984579ba55e3f8c9631d5" +dependencies = [ + "shank_macro 0.4.2", ] [[package]] @@ -3482,10 +4038,23 @@ version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3498d6ea2ba012f26ad3d79a19773ba8e1c7a69f14dec67e3ed51c723cc9f30a" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "shank_macro_impl", - "shank_render", + "proc-macro2", + "quote", + "shank_macro_impl 0.0.12", + "shank_render 0.0.1", + "syn 1.0.109", +] + +[[package]] +name = "shank_macro" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9bf2645f8eebde043da69200195058e7b59806705104f908a31d05ca82844ce" +dependencies = [ + "proc-macro2", + "quote", + "shank_macro_impl 0.4.2", + "shank_render 0.4.2", "syn 1.0.109", ] @@ -3496,8 +4065,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271c0b0b47ef930d7455d11a02164e3f0e71704d639bcaa6581f23e4b2073227" dependencies = [ "anyhow", - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", + "serde", + "syn 1.0.109", +] + +[[package]] +name = "shank_macro_impl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d0593f48acb0a722906416b1f6b8926f6571eb9af16d566a7c65427f269f50" +dependencies = [ + "anyhow", + "proc-macro2", + "quote", "serde", "syn 1.0.109", ] @@ -3508,16 +4090,27 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "142e11124c70d1702424011209621551adf775988033dedea428ce4a21d3acdf" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "shank_macro_impl", + "proc-macro2", + "quote", + "shank_macro_impl 0.0.12", ] [[package]] -name = "sharded-slab" -version = "0.1.4" +name = "shank_render" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "121175ba61809189f888dc5822ebfd30fa0d91e1e1f61d25a4d40b0847b3075e" +dependencies = [ + "proc-macro2", + "quote", + "shank_macro_impl 0.4.2", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -3530,9 +4123,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3549,6 +4142,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + [[package]] name = "sized-chunks" version = "0.6.5" @@ -3561,37 +4160,37 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "solana-account-decoder" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69127ab81f0521db64840015e51fb17455f19e2da6d36cd908ee3479c236213e" +checksum = "1a9721ff8b83683cb7dd856079cde8a8010bfd282d482699a867ad50ea9e727e" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.7", "bincode", "bs58", "bv", @@ -3599,26 +4198,85 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "solana-address-lookup-table-program", "solana-config-program", "solana-sdk", - "solana-vote-program", - "spl-token", - "spl-token-2022 0.5.0", + "spl-token 4.0.0", + "spl-token-2022", + "spl-token-group-interface", + "spl-token-metadata-interface", "thiserror", "zstd", ] +[[package]] +name = "solana-accounts-db" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cdae5f9d2562360bd07fde58976f6ff8f7d90c8311bc5a4959edd7ba61ccec4" +dependencies = [ + "arrayref", + "bincode", + "blake3", + "bv", + "bytemuck", + "byteorder", + "bzip2", + "crossbeam-channel", + "dashmap", + "flate2", + "fnv", + "fs-err", + "im", + "index_list", + "itertools", + "lazy_static", + "log", + "lz4", + "memmap2", + "modular-bitfield", + "num-derive 0.3.3", + "num-traits", + "num_cpus", + "num_enum 0.6.1", + "ouroboros", + "percentage", + "qualifier_attr", + "rand 0.8.5", + "rayon", + "regex", + "rustc_version", + "serde", + "serde_derive", + "solana-bucket-map", + "solana-config-program", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-measure", + "solana-metrics", + "solana-program-runtime", + "solana-rayon-threadlimit", + "solana-sdk", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", + "static_assertions", + "strum", + "strum_macros", + "tar", + "tempfile", + "thiserror", +] + [[package]] name = "solana-address-lookup-table-program" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6de99a3b17fea0d5793ca61156f0b4dd19fa6764ced87e506e7e022ffbe726" +checksum = "c471a3f150762652b5d77f83432b8574738e621fae4885c47132cfe33676d27c" dependencies = [ "bincode", "bytemuck", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc_version", "serde", @@ -3630,18 +4288,66 @@ dependencies = [ "thiserror", ] +[[package]] +name = "solana-banks-client" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4397a1bcefabb65c426c5baea8c5df1da2dff734ea9328789253e30e59bab25" +dependencies = [ + "borsh 0.10.3", + "futures 0.3.30", + "solana-banks-interface", + "solana-program", + "solana-sdk", + "tarpc", + "thiserror", + "tokio", + "tokio-serde", +] + +[[package]] +name = "solana-banks-interface" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a61b939343909a74cc826326dfdcad16f6015301e3d2134bc29fee59c27171a9" +dependencies = [ + "serde", + "solana-sdk", + "tarpc", +] + +[[package]] +name = "solana-banks-server" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b803ea31aa9b17a679454c921af320f9efb026355cb067dfbad57261ab771593" +dependencies = [ + "bincode", + "crossbeam-channel", + "futures 0.3.30", + "solana-accounts-db", + "solana-banks-interface", + "solana-client", + "solana-runtime", + "solana-sdk", + "solana-send-transaction-service", + "tarpc", + "tokio", + "tokio-serde", +] + [[package]] name = "solana-bpf-loader-program" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0c09ae2ad5b7746e5b205d6d68bd4ec599514d4fe33f875481fb719bcea7ca" +checksum = "0a99a75cdd7d4e40b51d8de8125f3d44db3f7735d96f4e3f31ee79d3110a8f4d" dependencies = [ "bincode", "byteorder", "libsecp256k1", "log", + "scopeguard", "solana-measure", - "solana-metrics", "solana-program-runtime", "solana-sdk", "solana-zk-token-sdk", @@ -3651,14 +4357,17 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9755da5ab2edfec4b770d8f63f8207e8729fd8bd66923add2de061d526038330" +checksum = "9830a7dbea75c0cbd62a4ca31bcd9b8832fbdb915c949740a44a496630fb5eb6" dependencies = [ + "bv", + "bytemuck", "log", "memmap2", "modular-bitfield", - "rand 0.7.3", + "num_enum 0.6.1", + "rand 0.8.5", "solana-measure", "solana-sdk", "tempfile", @@ -3666,14 +4375,13 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96853f84fe233fb82caee8bc59f21c5e38cbdad233fcba607997b85372e7c9e0" +checksum = "4af0fe4584d7692f24e573b17a5245cfc0d99a4e351b0185dfe02baf52f99864" dependencies = [ "chrono", "clap 2.34.0", "rpassword", - "solana-perf", "solana-remote-wallet", "solana-sdk", "thiserror", @@ -3682,81 +4390,44 @@ dependencies = [ "url", ] -[[package]] -name = "solana-cli-config" -version = "1.14.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4ccfa09f1d28c225ca4e8ca9c35eaed9106f6d1ebfd61722ee977e9371f461" -dependencies = [ - "dirs-next", - "lazy_static", - "serde", - "serde_derive", - "serde_yaml", - "solana-clap-utils", - "solana-sdk", - "url", -] - [[package]] name = "solana-client" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d2db9d1db62c77990c5a3f9d6014a9d8ef4ff928b2fda265ba6a5e68b4487bf" +checksum = "250ffcda91bc30c2adcc290c9b7c796f59884f1043ae3bcf3245f05158c7986c" dependencies = [ - "async-mutex", "async-trait", - "base64 0.13.1", "bincode", - "bs58", - "bytes", - "clap 2.34.0", - "crossbeam-channel", - "enum_dispatch", - "futures 0.3.28", + "dashmap", + "futures 0.3.30", "futures-util", - "indexmap", + "indexmap 2.2.6", "indicatif", - "itertools", - "jsonrpc-core", - "lazy_static", "log", "quinn", - "quinn-proto", - "rand 0.7.3", - "rand_chacha 0.2.2", "rayon", - "reqwest", - "rustls", - "semver", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-clap-utils", - "solana-faucet", + "solana-connection-cache", "solana-measure", "solana-metrics", - "solana-net-utils", + "solana-pubsub-client", + "solana-quic-client", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-rpc-client-nonce-utils", "solana-sdk", "solana-streamer", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "spl-token-2022 0.5.0", + "solana-thin-client", + "solana-tpu-client", + "solana-udp-client", "thiserror", "tokio", - "tokio-stream", - "tokio-tungstenite 0.17.2", - "tungstenite 0.17.3", - "url", ] [[package]] name = "solana-compute-budget-program" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd34870839dd3fe12a57a1973824bdffb1147d78310af8aa539dfabb30c90df" +checksum = "8703a92306dfdc4760e18db14b2f8b36c9769e5c47f0656bc77355875674e079" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -3764,9 +4435,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a65c1256130b3107653f742db48f7d785d9d5f8b83638c98822de720660b4a5" +checksum = "16fd2daba039bad58277ec88143b1fe624f2352d8ccb2a80bba3693de61df440" dependencies = [ "bincode", "chrono", @@ -3777,58 +4448,76 @@ dependencies = [ ] [[package]] -name = "solana-faucet" -version = "1.14.9" +name = "solana-connection-cache" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa926f807e8e56eca59ff8690d68d43110bba108f31d7ba3499220dd2f92ac73" +checksum = "868e7fb550af97ad6fc283a5628f8ffb6dafd590dc30254163e7c9003f13ceb0" dependencies = [ + "async-trait", "bincode", - "byteorder", - "clap 2.34.0", "crossbeam-channel", + "futures-util", + "indexmap 2.2.6", "log", - "serde", - "serde_derive", - "solana-clap-utils", - "solana-cli-config", - "solana-logger", + "rand 0.8.5", + "rayon", + "rcgen", + "solana-measure", "solana-metrics", "solana-sdk", - "solana-version", - "spl-memo", "thiserror", "tokio", ] +[[package]] +name = "solana-cost-model" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b79a349b86d02948720e4416463d50fd4f828b6a63512e47b497613df0d720" +dependencies = [ + "lazy_static", + "log", + "rustc_version", + "solana-address-lookup-table-program", + "solana-bpf-loader-program", + "solana-compute-budget-program", + "solana-config-program", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-loader-v4-program", + "solana-metrics", + "solana-program-runtime", + "solana-sdk", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", +] + [[package]] name = "solana-frozen-abi" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5fb9c1bd1cf7ccc2b96209f0a9061afb7f0e94ca1ada6caf268fd4bc5274ff" +checksum = "219c484f952f006e37a1a2598aebcc4dcfd48478c03fc2ce2d99787a5c78f248" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.5", "blake3", - "block-buffer 0.9.0", + "block-buffer 0.10.4", "bs58", "bv", "byteorder", "cc", "either", "generic-array", - "getrandom 0.1.16", - "hashbrown 0.12.3", "im", "lazy_static", "log", "memmap2", - "once_cell", - "rand_core 0.6.4", "rustc_version", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", + "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", "thiserror", @@ -3836,21 +4525,34 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091d54072f4c79ecf31bb472fcd53c15329666c33b8c2a94f13475b2a263712a" +checksum = "ffe4e1dc5fd61ac10c304b3eb8ddb49737b13e975281d623a6083cf5cf0a8616" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.58", +] + +[[package]] +name = "solana-loader-v4-program" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad035401037e6e7d1dc19c0ae4b613b36632b60443d28716355a4e0041892fa2" +dependencies = [ + "log", + "solana-measure", + "solana-program-runtime", + "solana-sdk", + "solana_rbpf", ] [[package]] name = "solana-logger" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1ce09bef8af337028d7a1ebf814b7ae060530a3947ceb2d5bed177b943e38c" +checksum = "64b4f281f2263de6d9cc65680b90b6bd2c93ba7de573db83fc86e2d05ca7ea8c" dependencies = [ "env_logger", "lazy_static", @@ -3859,9 +4561,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb3fa51337f48874b5d11a0b5c61df9d428f12ecdd4dff6645218fa1bbdc442" +checksum = "18a3ed981230b6a3a8aebf9f03424f5c1ff98be75cc7f0ecb153879e8e439aea" dependencies = [ "log", "solana-sdk", @@ -3869,9 +4571,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61237a702f9137e81f8ee352b7ba966fe3c29581ba8bf8cce2238887e093aae1" +checksum = "efb65329e6716dc0ce5b1d719d6e0052e7ff1179ab361916f256054d6b846ee1" dependencies = [ "crossbeam-channel", "gethostname", @@ -3879,20 +4581,21 @@ dependencies = [ "log", "reqwest", "solana-sdk", + "thiserror", ] [[package]] name = "solana-net-utils" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193f600a2661d91c2da053af452240bc78b6cea5596b067c98d74fb81901dda9" +checksum = "8345ffe2bd2a25a02e5dea046bbbf58f81f6b44ee97224474eae1c0ea03b520a" dependencies = [ "bincode", "clap 3.2.25", "crossbeam-channel", "log", "nix", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_derive", "socket2", @@ -3905,25 +4608,27 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8822c171656d95af8546493b3d94612dbf18c3055ab1e0d3d8c0cba9d185cbe8" +checksum = "0326bd89c2453bf2a408ff676cff4ed0080bff2a5c6543db5f62423bc23ad6e8" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.5", "bincode", "bv", "caps", "curve25519-dalek", - "dlopen", - "dlopen_derive", + "dlopen2", "fnv", "lazy_static", "libc", "log", "nix", - "rand 0.7.3", + "rand 0.8.5", "rayon", + "rustc_version", "serde", + "solana-frozen-abi", + "solana-frozen-abi-macro", "solana-metrics", "solana-rayon-threadlimit", "solana-sdk", @@ -3932,16 +4637,20 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bee7b596fdf962d5619b6331b9b6a05144d5f04a22f95cd8706d940036135a" +checksum = "93dc0f422549c23c4464eaa9383f4b09cd92b50dea750731dd3c31d3ee2d310f" dependencies = [ - "base64 0.13.1", + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "base64 0.21.7", "bincode", - "bitflags", + "bitflags 2.5.0", "blake3", + "borsh 0.10.3", "borsh 0.9.3", - "borsh-derive 0.9.3", "bs58", "bv", "bytemuck", @@ -3949,26 +4658,27 @@ dependencies = [ "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.2.9", + "getrandom 0.2.14", "itertools", "js-sys", "lazy_static", "libc", "libsecp256k1", + "light-poseidon", "log", - "memoffset 0.6.5", - "num-derive", + "memoffset 0.9.1", + "num-bigint 0.4.4", + "num-derive 0.3.3", "num-traits", "parking_lot", - "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", "rustc_version", "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", + "sha2 0.10.8", "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -3981,21 +4691,21 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743b8bea4badd757b337182616ec84f002f9123f550d053a9e8a2a8d3daf6003" +checksum = "8b407440b708ffda97e25b8cb977f72d1bb7466c28ea5f58751613df0af8d576" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "bincode", "eager", "enum-iterator", "itertools", "libc", - "libloading", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", - "rand 0.7.3", + "percentage", + "rand 0.8.5", "rustc_version", "serde", "solana-frozen-abi", @@ -4003,14 +4713,97 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-sdk", + "solana_rbpf", + "thiserror", +] + +[[package]] +name = "solana-program-test" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a49b6bef92bce799f1d023e0083ace2a20720330bfe8e36dcf793ee4eb95ffe" +dependencies = [ + "assert_matches", + "async-trait", + "base64 0.21.7", + "bincode", + "chrono-humanize", + "crossbeam-channel", + "log", + "serde", + "solana-accounts-db", + "solana-banks-client", + "solana-banks-interface", + "solana-banks-server", + "solana-bpf-loader-program", + "solana-logger", + "solana-program-runtime", + "solana-runtime", + "solana-sdk", + "solana-vote-program", + "solana_rbpf", + "test-case", "thiserror", + "tokio", +] + +[[package]] +name = "solana-pubsub-client" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f82da20e0c0bb39f9123cf61a6e3c76a8e30b0f09e5215decfb7f6b54734f04" +dependencies = [ + "crossbeam-channel", + "futures-util", + "log", + "reqwest", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-rpc-client-api", + "solana-sdk", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite 0.20.1", + "tungstenite 0.20.1", + "url", +] + +[[package]] +name = "solana-quic-client" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8478a6b4f2c2b8fa330d54ff22386a1792498cb6e84ce3893840337a992e47c6" +dependencies = [ + "async-mutex", + "async-trait", + "futures 0.3.30", + "itertools", + "lazy_static", + "log", + "quinn", + "quinn-proto", + "rcgen", + "rustls", + "solana-connection-cache", + "solana-measure", + "solana-metrics", + "solana-net-utils", + "solana-rpc-client-api", + "solana-sdk", + "solana-streamer", + "thiserror", + "tokio", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df59b6ccc256d8b0a2d4289f340539e8bb8e5de694f8e1baf6e853aea94d058" +checksum = "8df0aac27af8e94f907f6a65305e0a7909800336e7108bd3ce1dc1f3ef011a20" dependencies = [ "lazy_static", "num_cpus", @@ -4018,14 +4811,14 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69caa9e844a0bee7b6db9644f82394e8145585bc29510f3efb3ecb7d4ae8697" +checksum = "6a97d60701d3fe0fde4871c5856da9e52ba733fbcfb030482278c3af4ffa0bf3" dependencies = [ "console", "dialoguer", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "parking_lot", "qstring", @@ -4035,13 +4828,75 @@ dependencies = [ "uriparse", ] +[[package]] +name = "solana-rpc-client" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b750c49be9dd90981f3c12c8357d0b0c847bf5b8c638c3eff3c09f6ea199393" +dependencies = [ + "async-trait", + "base64 0.21.7", + "bincode", + "bs58", + "indicatif", + "log", + "reqwest", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-rpc-client-api", + "solana-sdk", + "solana-transaction-status", + "solana-version", + "solana-vote-program", + "tokio", +] + +[[package]] +name = "solana-rpc-client-api" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "314d0f87fc7bab16b1b4674c03d4e92c7008fa181b67210780542c0e6cbfce38" +dependencies = [ + "base64 0.21.7", + "bs58", + "jsonrpc-core", + "reqwest", + "semver", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder", + "solana-sdk", + "solana-transaction-status", + "solana-version", + "spl-token-2022", + "thiserror", +] + +[[package]] +name = "solana-rpc-client-nonce-utils" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acf79164ae52ee1ee85cd7aeb1bb715a9f3b90678ee00501896d173dbc31731" +dependencies = [ + "clap 2.34.0", + "solana-clap-utils", + "solana-rpc-client", + "solana-sdk", + "thiserror", +] + [[package]] name = "solana-runtime" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439e463425bd0319564a3e8c6185fd8d8179c1aff58fa3b91856f0ef75311b9f" +checksum = "0f3dfd09f3cd529ab56b33a1b389b449ddc31b338f062822c7cc30375a2f234b" dependencies = [ "arrayref", + "base64 0.21.7", "bincode", "blake3", "bv", @@ -4053,39 +4908,55 @@ dependencies = [ "dir-diff", "flate2", "fnv", + "fs-err", "im", "index_list", "itertools", "lazy_static", "log", + "lru", "lz4", "memmap2", - "num-derive", + "modular-bitfield", + "num-derive 0.3.3", "num-traits", "num_cpus", - "once_cell", + "num_enum 0.6.1", "ouroboros", - "rand 0.7.3", + "percentage", + "qualifier_attr", + "rand 0.8.5", "rayon", "regex", "rustc_version", "serde", "serde_derive", + "serde_json", + "siphasher", + "solana-accounts-db", "solana-address-lookup-table-program", + "solana-bpf-loader-program", "solana-bucket-map", "solana-compute-budget-program", "solana-config-program", + "solana-cost-model", "solana-frozen-abi", "solana-frozen-abi-macro", + "solana-loader-v4-program", "solana-measure", "solana-metrics", + "solana-perf", "solana-program-runtime", "solana-rayon-threadlimit", "solana-sdk", "solana-stake-program", + "solana-system-program", + "solana-version", + "solana-vote", "solana-vote-program", "solana-zk-token-proof-program", "solana-zk-token-sdk", + "static_assertions", "strum", "strum_macros", "symlink", @@ -4097,21 +4968,21 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dab8992a688a99747c31b346444518a9ca44ba23faa7079f54c89eda5a947f3" +checksum = "3892ee0e2acdfbeae7315db6c7c56356384631deb943377de5957074bd2dc4d1" dependencies = [ "assert_matches", - "base64 0.13.1", + "base64 0.21.7", "bincode", - "bitflags", - "borsh 0.9.3", + "bitflags 2.5.0", + "borsh 0.10.3", "bs58", "bytemuck", "byteorder", "chrono", "derivation-path", - "digest 0.10.6", + "digest 0.10.7", "ed25519-dalek", "ed25519-dalek-bip32", "generic-array", @@ -4122,19 +4993,22 @@ dependencies = [ "libsecp256k1", "log", "memmap2", - "num-derive", + "num-derive 0.3.3", "num-traits", + "num_enum 0.6.1", "pbkdf2 0.11.0", "qstring", + "qualifier_attr", "rand 0.7.3", - "rand_chacha 0.2.2", + "rand 0.8.5", "rustc_version", "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", - "sha2 0.10.6", + "serde_with", + "sha2 0.10.8", "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -4148,28 +5022,28 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb026ece5b73ec6cefcba5ef96496a28c53c99e767cc77d8abffa36127783d" +checksum = "8019cc997f6c07f09b23dfeb2c45530fa94df2e2fb9d654f3c772c9766a1511f" dependencies = [ "bs58", - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] name = "solana-security-txt" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e0461f3afb29d8591300b3dd09b5472b3772d65688a2826ad960b8c0d5fa605" +checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-send-transaction-service" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b904d5e8b7c59e629d32837b9b540f7614a0db47604d028393169b75cc8dd88c" +checksum = "d4de519acd09b182fe8a56014a5cc9d9f676e5217e0e8e61c1ae2af777e7e0fa" dependencies = [ "crossbeam-channel", "log", @@ -4178,41 +5052,36 @@ dependencies = [ "solana-metrics", "solana-runtime", "solana-sdk", + "solana-tpu-client", ] [[package]] name = "solana-stake-program" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3fe1d64b55cec4faf836545c1ec36c2927bb971a1cfc6a7b40dcf50c558d5f5" +checksum = "11c21a028ed8abed4a7a52b8410875d799b31b58489653e05ae885e2ba799463" dependencies = [ "bincode", "log", - "num-derive", - "num-traits", "rustc_version", - "serde", - "serde_derive", "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-metrics", "solana-program-runtime", "solana-sdk", "solana-vote-program", - "thiserror", ] [[package]] name = "solana-streamer" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac197a16374e7c3afd401f95901bee212bb4691d23952418abfcdc1bf2a165f" +checksum = "067d167db6be6f25c21e4c615607757ae7161b20e08197ec2d1a63360e522069" dependencies = [ + "async-channel", + "bytes", "crossbeam-channel", "futures-util", "histogram", - "indexmap", + "indexmap 2.2.6", "itertools", "libc", "log", @@ -4221,9 +5090,11 @@ dependencies = [ "percentage", "pkcs8", "quinn", - "rand 0.7.3", + "quinn-proto", + "rand 0.8.5", "rcgen", "rustls", + "smallvec", "solana-metrics", "solana-perf", "solana-sdk", @@ -4232,16 +5103,69 @@ dependencies = [ "x509-parser", ] +[[package]] +name = "solana-system-program" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4fa662731817f995cd114ce44d780be2814982a7674540be8d1c596a2d1ca43" +dependencies = [ + "bincode", + "log", + "serde", + "serde_derive", + "solana-program-runtime", + "solana-sdk", +] + +[[package]] +name = "solana-thin-client" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0815c6d64a4bd71fd92ce33e82c24f5e8a5b105b26619521c4a8a43ab7573a9a" +dependencies = [ + "bincode", + "log", + "rayon", + "solana-connection-cache", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-sdk", +] + +[[package]] +name = "solana-tpu-client" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "576431a39a612dac9387fecb5e80fe58989b740337a07bca41f0d02695e415f9" +dependencies = [ + "async-trait", + "bincode", + "futures-util", + "indexmap 2.2.6", + "indicatif", + "log", + "rayon", + "solana-connection-cache", + "solana-measure", + "solana-metrics", + "solana-pubsub-client", + "solana-rpc-client", + "solana-rpc-client-api", + "solana-sdk", + "thiserror", + "tokio", +] + [[package]] name = "solana-transaction-status" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa51ca4db7682a030d76e7f67d1cca07987bb50f5bb3040522c37c3b3b17bec" +checksum = "c0d8e2d97a8569afba70a105b402057b253fd9caee92c7ed2c3e1c3e0173fe91" dependencies = [ "Inflector", - "base64 0.13.1", + "base64 0.21.7", "bincode", - "borsh 0.9.3", + "borsh 0.10.3", "bs58", "lazy_static", "log", @@ -4249,23 +5173,34 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", - "solana-address-lookup-table-program", - "solana-measure", - "solana-metrics", "solana-sdk", - "solana-vote-program", "spl-associated-token-account", "spl-memo", - "spl-token", - "spl-token-2022 0.5.0", + "spl-token 4.0.0", + "spl-token-2022", + "thiserror", +] + +[[package]] +name = "solana-udp-client" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8297b04cb335ffac5b4a2c727dd82a2f72c8a96e3d5e1c159e01866b74a17e50" +dependencies = [ + "async-trait", + "solana-connection-cache", + "solana-net-utils", + "solana-sdk", + "solana-streamer", "thiserror", + "tokio", ] [[package]] name = "solana-version" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4a214beff615f323a23e917bfd9d96e2048f88ac491da2d82d4e7045e35058" +checksum = "f84a9f9ff3feebfaa960ac5387b133c6ef2c266779cb4932aed6acac5b83cb7b" dependencies = [ "log", "rustc_version", @@ -4277,15 +5212,34 @@ dependencies = [ "solana-sdk", ] +[[package]] +name = "solana-vote" +version = "1.17.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a2355a2b40d7b0b3a9ec5a5bd2196494c620a287ce6e4234cc4722fcb0cbb5" +dependencies = [ + "crossbeam-channel", + "itertools", + "log", + "rustc_version", + "serde", + "serde_derive", + "solana-frozen-abi", + "solana-frozen-abi-macro", + "solana-sdk", + "solana-vote-program", + "thiserror", +] + [[package]] name = "solana-vote-program" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a329352cfc4f06f5a586b4ff6954a085853be9213f4aef1a1f1f89a36288a0" +checksum = "5ab0fe8455b2f06016cddefe7e3a7b9c0a57661d44816a4105c81f1088cfc1ac" dependencies = [ "bincode", "log", - "num-derive", + "num-derive 0.3.3", "num-traits", "rustc_version", "serde", @@ -4293,6 +5247,7 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-metrics", + "solana-program", "solana-program-runtime", "solana-sdk", "thiserror", @@ -4300,13 +5255,12 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a06b6eaf5a08f9b293e335724235ae8a4f6cb550c71ece2bb0fcca82be983b" +checksum = "ad624adcac620e41d052b29705f30c003b2e396ebca0145c1d296a1ef13f5aa7" dependencies = [ "bytemuck", - "getrandom 0.1.16", - "num-derive", + "num-derive 0.3.3", "num-traits", "solana-program-runtime", "solana-sdk", @@ -4315,23 +5269,21 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.14.9" +version = "1.17.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cef8396585fd3172a926e170299eee11d8dd1a445a75fc97771e1ab387534d" +checksum = "70a06e103ed5adf1664f9cca3d1c64edad8b5b603255d8a5dd21a4ac5d86b89c" dependencies = [ "aes-gcm-siv", - "arrayref", - "base64 0.13.1", + "base64 0.21.7", "bincode", "bytemuck", "byteorder", - "cipher 0.4.4", "curve25519-dalek", "getrandom 0.1.16", "itertools", "lazy_static", "merlin", - "num-derive", + "num-derive 0.3.3", "num-traits", "rand 0.7.3", "serde", @@ -4346,9 +5298,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.2.31" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a28c5dfe7e8af38daa39d6561c8e8b9ed7a2f900951ebe7362ad6348d36c73" +checksum = "3d457cc2ba742c120492a64b7fa60e22c575e891f6b55039f4d736568fb112a3" dependencies = [ "byteorder", "combine", @@ -4360,6 +5312,7 @@ dependencies = [ "rustc-demangle", "scroll", "thiserror", + "winapi", ] [[package]] @@ -4368,6 +5321,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spki" version = "0.5.4" @@ -4380,27 +5339,114 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "1.1.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a33ecc83137583902c3e13c02f34151c8b2f2b74120f9c2b3ff841953e083d" +checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" dependencies = [ "assert_matches", - "borsh 0.9.3", - "num-derive", + "borsh 0.10.3", + "num-derive 0.4.2", "num-traits", "solana-program", - "spl-token", - "spl-token-2022 0.4.3", + "spl-token 4.0.0", + "spl-token-2022", + "thiserror", +] + +[[package]] +name = "spl-discriminator" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator-derive", +] + +[[package]] +name = "spl-discriminator-derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07fd7858fc4ff8fb0e34090e41d7eb06a823e1057945c26d480bfc21d2338a93" +dependencies = [ + "quote", + "spl-discriminator-syn", + "syn 2.0.58", +] + +[[package]] +name = "spl-discriminator-syn" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fea7be851bd98d10721782ea958097c03a0c2a07d8d4997041d0ece6319a63" +dependencies = [ + "proc-macro2", + "quote", + "sha2 0.10.8", + "syn 2.0.58", "thiserror", ] [[package]] name = "spl-memo" -version = "3.0.1" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" +dependencies = [ + "solana-program", +] + +[[package]] +name = "spl-pod" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" +dependencies = [ + "borsh 0.10.3", + "bytemuck", + "solana-program", + "solana-zk-token-sdk", + "spl-program-error", +] + +[[package]] +name = "spl-program-error" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" +checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" dependencies = [ + "num-derive 0.4.2", + "num-traits", + "solana-program", + "spl-program-error-derive", + "thiserror", +] + +[[package]] +name = "spl-program-error-derive" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1845dfe71fd68f70382232742e758557afe973ae19e6c06807b2c30f5d5cb474" +dependencies = [ + "proc-macro2", + "quote", + "sha2 0.10.8", + "syn 2.0.58", +] + +[[package]] +name = "spl-tlv-account-resolution" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f335787add7fa711819f9e7c573f8145a5358a709446fe2d24bf2a88117c90" +dependencies = [ + "bytemuck", "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", ] [[package]] @@ -4411,49 +5457,108 @@ checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", - "num_enum", + "num_enum 0.5.9", "solana-program", "thiserror", ] [[package]] -name = "spl-token-2022" -version = "0.4.3" +name = "spl-token" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c0ebca4740cc4c892aa31e07d0b4dc1a24cac4748376d4b34f8eb0fee9ff46" +checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.3.3", "num-traits", - "num_enum", + "num_enum 0.6.1", "solana-program", - "solana-zk-token-sdk", - "spl-memo", - "spl-token", "thiserror", ] [[package]] name = "spl-token-2022" -version = "0.5.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edb869dbe159b018f17fb9bfa67118c30f232d7f54a73742bc96794dff77ed8" +checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" dependencies = [ "arrayref", "bytemuck", - "num-derive", + "num-derive 0.4.2", "num-traits", - "num_enum", + "num_enum 0.7.2", "solana-program", + "solana-security-txt", "solana-zk-token-sdk", "spl-memo", - "spl-token", + "spl-pod", + "spl-token 4.0.0", + "spl-token-group-interface", + "spl-token-metadata-interface", + "spl-transfer-hook-interface", + "spl-type-length-value", "thiserror", ] +[[package]] +name = "spl-token-group-interface" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + +[[package]] +name = "spl-token-metadata-interface" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" +dependencies = [ + "borsh 0.10.3", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-type-length-value", +] + +[[package]] +name = "spl-transfer-hook-interface" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" +dependencies = [ + "arrayref", + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", + "spl-tlv-account-resolution", + "spl-type-length-value", +] + +[[package]] +name = "spl-type-length-value" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" +dependencies = [ + "bytemuck", + "solana-program", + "spl-discriminator", + "spl-pod", + "spl-program-error", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -4488,8 +5593,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck", - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "rustversion", "syn 1.0.109", ] @@ -4508,54 +5613,88 @@ checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" [[package]] name = "syn" -version = "0.15.44" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "syn" -version = "1.0.109" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "unicode-ident", ] [[package]] -name = "syn" -version = "2.0.15" +name = "syn_derive" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "unicode-ident", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.58", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synstructure" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", + "proc-macro2", + "quote", "syn 1.0.109", - "unicode-xid 0.2.4", + "unicode-xid", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -4570,7 +5709,7 @@ checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80" dependencies = [ "anyhow", "fnv", - "futures 0.3.28", + "futures 0.3.30", "humantime", "opentelemetry", "pin-project", @@ -4587,36 +5726,68 @@ dependencies = [ ] [[package]] -name = "tarpc-plugins" -version = "0.12.0" +name = "tarpc-plugins" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "test-case" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 1.0.109", + "test-case-macros", ] [[package]] -name = "tempfile" -version = "3.5.0" +name = "test-case-core" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" dependencies = [ "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] -name = "termcolor" -version = "1.2.0" +name = "test-case-macros" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ - "winapi-util", + "proc-macro2", + "quote", + "syn 2.0.58", + "test-case-core", ] [[package]] @@ -4630,35 +5801,35 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -4666,22 +5837,14 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.21" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -4689,16 +5852,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -4738,11 +5902,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -4755,15 +5919,25 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -4778,13 +5952,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -4805,9 +5978,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -4831,18 +6004,17 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.17.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", "rustls", "tokio", "tokio-rustls", - "tungstenite 0.17.3", - "webpki", - "webpki-roots", + "tungstenite 0.20.1", + "webpki-roots 0.25.4", ] [[package]] @@ -4862,16 +6034,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4889,17 +6060,117 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + [[package]] name = "toml_edit" version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "nom8", - "toml_datetime", + "toml_datetime 0.5.1", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", + "toml_datetime 0.6.5", + "winnow", +] + +[[package]] +name = "tonic" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "tokio", + "tokio-rustls", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "tonic-health" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f80db390246dfb46553481f6024f0082ba00178ea495dbb99e70ba9a4fafb5e1" +dependencies = [ + "async-stream", + "prost", + "tokio", + "tokio-stream", + "tonic", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "indexmap 1.9.3", + "pin-project", + "pin-project-lite", + "rand 0.8.5", + "slab", + "tokio", + "tokio-util 0.7.11", + "tower-layer", + "tower-service", + "tracing", ] +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -4908,11 +6179,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -4921,20 +6191,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -4955,9 +6225,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "sharded-slab", "thread_local", @@ -4966,9 +6236,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" @@ -4985,31 +6255,30 @@ dependencies = [ "log", "native-tls", "rand 0.8.5", - "sha-1 0.9.8", + "sha-1", "url", "utf-8", ] [[package]] name = "tungstenite" -version = "0.17.3" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", "rand 0.8.5", "rustls", - "sha-1 0.10.1", + "sha1", "thiserror", "url", "utf-8", - "webpki", - "webpki-roots", + "webpki-roots 0.24.0", ] [[package]] @@ -5020,9 +6289,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -5041,15 +6310,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.1.0" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" [[package]] name = "unicode-xid" @@ -5082,6 +6345,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "uriparse" version = "0.6.4" @@ -5094,9 +6363,9 @@ dependencies = [ [[package]] name = "url" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -5115,10 +6384,16 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.14", "serde", ] +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" + [[package]] name = "valuable" version = "0.1.0" @@ -5151,9 +6426,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -5161,11 +6436,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -5175,12 +6449,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -5189,9 +6457,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5199,24 +6467,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -5226,32 +6494,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.27", + "quote", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 1.0.109", + "proc-macro2", + "quote", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" @@ -5264,23 +6532,19 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" +name = "webpki-roots" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "ring", - "untrusted", + "rustls-webpki", ] [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "winapi" @@ -5314,45 +6578,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.52.5", ] [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "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", + "windows-targets 0.42.2", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.52.5", ] [[package]] @@ -5372,17 +6630,33 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -5393,9 +6667,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -5405,9 +6685,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -5417,9 +6703,21 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -5429,9 +6727,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -5441,9 +6745,15 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -5453,9 +6763,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -5465,17 +6781,42 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", ] [[package]] @@ -5493,34 +6834,78 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.21", + "time", ] [[package]] name = "xattr" -version = "0.2.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yasna" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "linked-hash-map", + "time", ] [[package]] -name = "yasna" -version = "0.5.2" +name = "yellowstone-grpc-client" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +checksum = "978d1379db10aa5e430e305f5a01598439d3414ef808443f9f92d1201dacda65" +dependencies = [ + "bytes", + "futures 0.3.30", + "thiserror", + "tonic", + "tonic-health", + "yellowstone-grpc-proto", +] + +[[package]] +name = "yellowstone-grpc-proto" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "742e431794099868a1ac668d440d724eb25b6f5a3739986cdd8bfc15fa5661c3" dependencies = [ - "time 0.3.21", + "anyhow", + "bincode", + "prost", + "protobuf-src", + "solana-account-decoder", + "solana-sdk", + "solana-transaction-status", + "tonic", + "tonic-build", +] + +[[package]] +name = "zerocopy" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -5538,9 +6923,9 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.56", - "quote 1.0.27", - "syn 2.0.15", + "proc-macro2", + "quote", + "syn 2.0.58", ] [[package]] @@ -5564,11 +6949,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 787b2fd..a1513c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "phoenix-seat-manager" +name = "phoenix-seat-manager-common" version = "0.1.2" edition = "2021" repository = "https://github.com/Ellipsis-Labs/phoenix-seat-manager-v1" @@ -25,26 +25,27 @@ codegen-units = 1 overflow-checks = true [dependencies] -phoenix-v1 = { version = "0.2.2", features = [ "no-entrypoint" ] } -shank = "=0.0.12" -solana-program = "=1.14.9" -bytemuck = "=1.13.0" -borsh = "=0.9.3" -lib-sokoban = "=0.3.0" -num_enum = "=0.5.9" -itertools = "=0.10.5" -thiserror = "=1.0.38" -ellipsis-macros = "=0.1.1" -solana-security-txt = "=1.1.0" -static_assertions = "=1.1.0" -spl-token = { version = "=3.5.0", features = ["no-entrypoint"] } -spl-associated-token-account = { version = "=1.1.1", features = [ "no-entrypoint" ] } -toml_edit = "=0.18.1" -proc-macro-crate = "=1.3.0" +borsh = "0.9.3" +bytemuck = "1.13.0" +ellipsis-macros = "0.1.1" +itertools = "0.10.5" +lib-sokoban = ">=0.3.2" +num_enum = "0.5.9" +phoenix-common = { version = "0.2.1", features = [ "no-entrypoint" ] } +proc-macro-crate = "1.3.0" +shank = "0.4.2" +solana-program = "1.16.3" +solana-security-txt = ">=1.1.0" +spl-associated-token-account = { version = "2.2.0", features = [ "no-entrypoint" ] } +spl-token = { version = "3.5.0", features = ["no-entrypoint"] } +static_assertions = "1.1.0" +thiserror = "1.0.38" +toml_edit = "0.18.1" [dev-dependencies] rand = "0.7.3" -ellipsis-client = "0.1.17" -tokio = { version = "1.8.4", features = ["full"] } -solana-sdk = "=1.14.9" -phoenix-sdk = "0.2.1" +tokio = { version="*", features=["full"]} +solana-sdk = "1.16.3" +solana-program-test = "1.16.3" +ellipsis-client = "1.0.0" +phoenix-sdk = "0.7.0" \ No newline at end of file diff --git a/sdk/idl/phoenix_seat_manager.json b/sdk/idl/phoenix_seat_manager.json index bff5c32..279d21b 100644 --- a/sdk/idl/phoenix_seat_manager.json +++ b/sdk/idl/phoenix_seat_manager.json @@ -1,5 +1,5 @@ { - "version": "0.1.0", + "version": "0.1.2", "name": "phoenix_seat_manager", "instructions": [ { @@ -9,43 +9,57 @@ "name": "phoenixProgram", "isMut": false, "isSigner": false, - "desc": "Phoenix program" + "docs": [ + "Phoenix program" + ] }, { "name": "logAuthority", "isMut": false, "isSigner": false, - "desc": "Phoenix log authority" + "docs": [ + "Phoenix log authority" + ] }, { "name": "market", "isMut": true, "isSigner": false, - "desc": "This account holds the market state" + "docs": [ + "This account holds the market state" + ] }, { "name": "seatManager", "isMut": true, "isSigner": false, - "desc": "The seat manager account must sign to claim authority" + "docs": [ + "The seat manager account must sign to claim authority" + ] }, { "name": "payer", "isMut": true, "isSigner": true, - "desc": "Payer account" + "docs": [ + "Payer account" + ] }, { "name": "seatDepositCollector", "isMut": false, "isSigner": false, - "desc": "Collects deposits for claiming new seats and refunds for evicting seats" + "docs": [ + "Collects deposits for claiming new seats and refunds for evicting seats" + ] }, { "name": "systemProgram", "isMut": false, "isSigner": false, - "desc": "System program" + "docs": [ + "System program" + ] } ], "args": [], @@ -61,31 +75,41 @@ "name": "phoenixProgram", "isMut": false, "isSigner": false, - "desc": "Phoenix program" + "docs": [ + "Phoenix program" + ] }, { "name": "logAuthority", "isMut": false, "isSigner": false, - "desc": "Phoenix log authority" + "docs": [ + "Phoenix log authority" + ] }, { "name": "market", "isMut": true, "isSigner": false, - "desc": "This account holds the market state" + "docs": [ + "This account holds the market state" + ] }, { "name": "seatManager", "isMut": true, "isSigner": false, - "desc": "The seat manager account is the market authority" + "docs": [ + "The seat manager account is the market authority" + ] }, { "name": "seatDepositCollector", "isMut": true, "isSigner": false, - "desc": "Collects deposits for claiming new seats and refunds for evicting seats" + "docs": [ + "Collects deposits for claiming new seats and refunds for evicting seats" + ] }, { "name": "trader", @@ -106,7 +130,9 @@ "name": "systemProgram", "isMut": false, "isSigner": false, - "desc": "System program" + "docs": [ + "System program" + ] } ], "args": [], @@ -122,31 +148,41 @@ "name": "phoenixProgram", "isMut": false, "isSigner": false, - "desc": "Phoenix program" + "docs": [ + "Phoenix program" + ] }, { "name": "logAuthority", "isMut": false, "isSigner": false, - "desc": "Phoenix log authority" + "docs": [ + "Phoenix log authority" + ] }, { "name": "market", "isMut": true, "isSigner": false, - "desc": "This account holds the market state" + "docs": [ + "This account holds the market state" + ] }, { "name": "seatManager", "isMut": true, "isSigner": false, - "desc": "The seat manager account is the market authority" + "docs": [ + "The seat manager account is the market authority" + ] }, { "name": "seatDepositCollector", "isMut": true, "isSigner": false, - "desc": "Collects deposits for claiming new seats and refunds for evicting seats" + "docs": [ + "Collects deposits for claiming new seats and refunds for evicting seats" + ] }, { "name": "trader", @@ -157,7 +193,9 @@ "name": "seatManagerAuthority", "isMut": true, "isSigner": true, - "desc": "The seat manager authority account must sign to claim seat" + "docs": [ + "The seat manager authority account must sign to claim seat" + ] }, { "name": "seat", @@ -168,7 +206,9 @@ "name": "systemProgram", "isMut": false, "isSigner": false, - "desc": "System program" + "docs": [ + "System program" + ] } ], "args": [], @@ -184,31 +224,41 @@ "name": "phoenixProgram", "isMut": false, "isSigner": false, - "desc": "Phoenix program" + "docs": [ + "Phoenix program" + ] }, { "name": "logAuthority", "isMut": false, "isSigner": false, - "desc": "Phoenix log authority" + "docs": [ + "Phoenix log authority" + ] }, { "name": "market", "isMut": true, "isSigner": false, - "desc": "This account holds the market state" + "docs": [ + "This account holds the market state" + ] }, { "name": "seatManager", "isMut": true, "isSigner": false, - "desc": "The seat manager account must sign to evict a seat" + "docs": [ + "The seat manager account must sign to evict a seat" + ] }, { "name": "seatDepositCollector", "isMut": true, "isSigner": false, - "desc": "Collects deposits for claiming new seats and refunds for evicting seats" + "docs": [ + "Collects deposits for claiming new seats and refunds for evicting seats" + ] }, { "name": "baseMint", @@ -234,19 +284,25 @@ "name": "associatedTokenAccountProgram", "isMut": false, "isSigner": false, - "desc": "Associated token account program" + "docs": [ + "Associated token account program" + ] }, { "name": "tokenProgram", "isMut": false, "isSigner": false, - "desc": "Token program" + "docs": [ + "Token program" + ] }, { "name": "systemProgram", "isMut": false, "isSigner": false, - "desc": "System program to handle refund transfers" + "docs": [ + "System program to handle refund transfers" + ] }, { "name": "signer", @@ -262,31 +318,41 @@ "name": "seat", "isMut": false, "isSigner": false, - "desc": "The trader's PDA seat account, seeds are [b'seat', market_address, trader_address]" + "docs": [ + "The trader's PDA seat account, seeds are [b'seat', market_address, trader_address]" + ] }, { "name": "baseAccount", "isMut": true, "isSigner": false, - "desc": "The trader's associated token account for the base mint" + "docs": [ + "The trader's associated token account for the base mint" + ] }, { "name": "quoteAccount", "isMut": true, "isSigner": false, - "desc": "The trader's associated token account for the quote mint" + "docs": [ + "The trader's associated token account for the quote mint" + ] }, { "name": "baseAccountBackup", "isMut": true, "isSigner": false, - "desc": "Non-ATA token account for the base mint, in case the ATA owner is no longer the trader" + "docs": [ + "Non-ATA token account for the base mint, in case the ATA owner is no longer the trader" + ] }, { "name": "quoteAccountBackup", "isMut": true, "isSigner": false, - "desc": "Non-ATA token account for the quote mint, in case the ATA owner is no longer the trader" + "docs": [ + "Non-ATA token account for the quote mint, in case the ATA owner is no longer the trader" + ] } ], "args": [], @@ -302,13 +368,17 @@ "name": "market", "isMut": false, "isSigner": false, - "desc": "This account holds the market state" + "docs": [ + "This account holds the market state" + ] }, { "name": "seatManager", "isMut": true, "isSigner": false, - "desc": "This account holds the seat manager state" + "docs": [ + "This account holds the seat manager state" + ] }, { "name": "trader", @@ -319,7 +389,9 @@ "name": "seatManagerAuthority", "isMut": false, "isSigner": true, - "desc": "The seat manager account must sign to create a DMM" + "docs": [ + "The seat manager account must sign to create a DMM" + ] } ], "args": [], @@ -335,13 +407,17 @@ "name": "market", "isMut": false, "isSigner": false, - "desc": "This account holds the market state" + "docs": [ + "This account holds the market state" + ] }, { "name": "seatManager", "isMut": true, "isSigner": false, - "desc": "This account holds the seat manager state" + "docs": [ + "This account holds the seat manager state" + ] }, { "name": "trader", @@ -352,7 +428,9 @@ "name": "seatManagerAuthority", "isMut": false, "isSigner": true, - "desc": "The seat manager authority account must sign to remove a DMM" + "docs": [ + "The seat manager authority account must sign to remove a DMM" + ] } ], "args": [], @@ -368,19 +446,25 @@ "name": "seatManager", "isMut": true, "isSigner": false, - "desc": "This account holds the seat manager state" + "docs": [ + "This account holds the seat manager state" + ] }, { "name": "seatManagerAuthority", "isMut": false, "isSigner": true, - "desc": "The seat manager account must sign name a successor" + "docs": [ + "The seat manager account must sign name a successor" + ] }, { "name": "successor", "isMut": false, "isSigner": false, - "desc": "The new authority account" + "docs": [ + "The new authority account" + ] } ], "args": [], @@ -396,13 +480,17 @@ "name": "seatManager", "isMut": true, "isSigner": false, - "desc": "This account holds the seat manager state" + "docs": [ + "This account holds the seat manager state" + ] }, { "name": "successor", "isMut": false, "isSigner": true, - "desc": "The successor account must sign to claim authority" + "docs": [ + "The successor account must sign to claim authority" + ] } ], "args": [], @@ -418,31 +506,41 @@ "name": "phoenixProgram", "isMut": false, "isSigner": false, - "desc": "Phoenix program" + "docs": [ + "Phoenix program" + ] }, { "name": "logAuthority", "isMut": false, "isSigner": false, - "desc": "Phoenix log authority" + "docs": [ + "Phoenix log authority" + ] }, { "name": "market", "isMut": true, "isSigner": false, - "desc": "This account holds the market state" + "docs": [ + "This account holds the market state" + ] }, { "name": "seatManager", "isMut": false, "isSigner": false, - "desc": "This account holds the seat manager state" + "docs": [ + "This account holds the seat manager state" + ] }, { "name": "seatManagerAuthority", "isMut": false, "isSigner": true, - "desc": "The seat manager account must sign change market status" + "docs": [ + "The seat manager account must sign change market status" + ] } ], "args": [ @@ -465,31 +563,41 @@ "name": "phoenixProgram", "isMut": false, "isSigner": false, - "desc": "Phoenix program" + "docs": [ + "Phoenix program" + ] }, { "name": "logAuthority", "isMut": false, "isSigner": false, - "desc": "Phoenix log authority" + "docs": [ + "Phoenix log authority" + ] }, { "name": "market", "isMut": true, "isSigner": false, - "desc": "This account holds the market state" + "docs": [ + "This account holds the market state" + ] }, { "name": "seatManager", "isMut": false, "isSigner": false, - "desc": "This account holds the seat manager state" + "docs": [ + "This account holds the seat manager state" + ] }, { "name": "seatManagerAuthority", "isMut": false, "isSigner": true, - "desc": "The seat manager authority must sign to name a new market authority successor" + "docs": [ + "The seat manager authority must sign to name a new market authority successor" + ] } ], "args": [ @@ -510,55 +618,73 @@ "name": "phoenixProgram", "isMut": false, "isSigner": false, - "desc": "Phoenix program" + "docs": [ + "Phoenix program" + ] }, { "name": "logAuthority", "isMut": false, "isSigner": false, - "desc": "Phoenix log authority" + "docs": [ + "Phoenix log authority" + ] }, { "name": "market", "isMut": true, "isSigner": false, - "desc": "This account holds the market state" + "docs": [ + "This account holds the market state" + ] }, { "name": "seatManager", "isMut": false, "isSigner": false, - "desc": "This account holds the seat manager state" + "docs": [ + "This account holds the seat manager state" + ] }, { "name": "seatManagerAuthority", "isMut": false, "isSigner": true, - "desc": "The seat manager authority must sign to change the fee recipient" + "docs": [ + "The seat manager authority must sign to change the fee recipient" + ] }, { "name": "currentFeeRecipientQuoteTokenAccount", "isMut": true, "isSigner": false, - "desc": "The current fee recipient's quote token account" + "docs": [ + "The current fee recipient's quote token account" + ] }, { "name": "quoteVault", "isMut": true, "isSigner": false, - "desc": "The quote vault account" + "docs": [ + "The quote vault account" + ] }, { "name": "newFeeRecipient", "isMut": false, "isSigner": false, - "desc": "Account to become the new recipient of fees" + "docs": [ + "Account to become the new recipient of fees" + ] }, { "name": "splToken", "isMut": false, "isSigner": false, - "desc": "The SPL token program" + "docs": [ + "The SPL token program" + ] } ], "args": [], @@ -574,13 +700,17 @@ "name": "seatManager", "isMut": true, "isSigner": false, - "desc": "This account holds the seat manager state" + "docs": [ + "This account holds the seat manager state" + ] }, { "name": "seatManagerAuthority", "isMut": false, "isSigner": true, - "desc": "The seat manager authority must sign to renounce the seat manager authority" + "docs": [ + "The seat manager authority must sign to renounce the seat manager authority" + ] } ], "args": [], @@ -588,6 +718,227 @@ "type": "u8", "value": 11 } + }, + { + "name": "AddApprovedEvictor", + "accounts": [ + { + "name": "seatManagerAuthority", + "isMut": false, + "isSigner": true, + "docs": [ + "The seat manager authority must sign to add an authorized delegate for eviction" + ] + }, + { + "name": "authorizedDelegate", + "isMut": false, + "isSigner": false + }, + { + "name": "authorizedDelegatePda", + "isMut": false, + "isSigner": false + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false, + "docs": [ + "System program" + ] + } + ], + "args": [], + "discriminant": { + "type": "u8", + "value": 12 + } + }, + { + "name": "RemoveApprovedEvictor", + "accounts": [ + { + "name": "seatManagerAuthority", + "isMut": false, + "isSigner": true, + "docs": [ + "The seat manager authority must sign to remove an authorized delegate for eviction" + ] + }, + { + "name": "authorizedDelegate", + "isMut": false, + "isSigner": false + }, + { + "name": "authorizedDelegatePda", + "isMut": false, + "isSigner": false + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false, + "docs": [ + "System program" + ] + } + ], + "args": [], + "discriminant": { + "type": "u8", + "value": 13 + } + }, + { + "name": "EvictSeatWithAuthorizedDelegate", + "accounts": [ + { + "name": "phoenixProgram", + "isMut": false, + "isSigner": false, + "docs": [ + "Phoenix program" + ] + }, + { + "name": "logAuthority", + "isMut": false, + "isSigner": false, + "docs": [ + "Phoenix log authority" + ] + }, + { + "name": "market", + "isMut": true, + "isSigner": false, + "docs": [ + "This account holds the market state" + ] + }, + { + "name": "seatManager", + "isMut": true, + "isSigner": false, + "docs": [ + "The seat manager account must sign to evict a seat" + ] + }, + { + "name": "seatDepositCollector", + "isMut": true, + "isSigner": false, + "docs": [ + "Collects deposits for claiming new seats and refunds for evicting seats" + ] + }, + { + "name": "baseMint", + "isMut": false, + "isSigner": false + }, + { + "name": "quoteMint", + "isMut": false, + "isSigner": false + }, + { + "name": "baseVault", + "isMut": true, + "isSigner": false + }, + { + "name": "quoteVault", + "isMut": true, + "isSigner": false + }, + { + "name": "associatedTokenAccountProgram", + "isMut": false, + "isSigner": false, + "docs": [ + "Associated token account program" + ] + }, + { + "name": "tokenProgram", + "isMut": false, + "isSigner": false, + "docs": [ + "Token program" + ] + }, + { + "name": "systemProgram", + "isMut": false, + "isSigner": false, + "docs": [ + "System program to handle refund transfers" + ] + }, + { + "name": "signer", + "isMut": false, + "isSigner": true + }, + { + "name": "authorizedDelegatePda", + "isMut": false, + "isSigner": false + }, + { + "name": "trader", + "isMut": true, + "isSigner": false + }, + { + "name": "seat", + "isMut": false, + "isSigner": false, + "docs": [ + "The trader's PDA seat account, seeds are [b'seat', market_address, trader_address]" + ] + }, + { + "name": "baseAccount", + "isMut": true, + "isSigner": false, + "docs": [ + "The trader's associated token account for the base mint" + ] + }, + { + "name": "quoteAccount", + "isMut": true, + "isSigner": false, + "docs": [ + "The trader's associated token account for the quote mint" + ] + }, + { + "name": "baseAccountBackup", + "isMut": true, + "isSigner": false, + "docs": [ + "Non-ATA token account for the base mint, in case the ATA owner is no longer the trader" + ] + }, + { + "name": "quoteAccountBackup", + "isMut": true, + "isSigner": false, + "docs": [ + "Non-ATA token account for the quote mint, in case the ATA owner is no longer the trader" + ] + } + ], + "args": [], + "discriminant": { + "type": "u8", + "value": 14 + } } ], "types": [ diff --git a/src/instruction.rs b/src/instruction.rs index 2fd62df..52175e7 100644 --- a/src/instruction.rs +++ b/src/instruction.rs @@ -116,6 +116,44 @@ pub enum SeatManagerInstruction { #[account(0, writable, name = "seat_manager", desc = "This account holds the seat manager state")] #[account(1, signer, name = "seat_manager_authority", desc = "The seat manager authority must sign to renounce the seat manager authority")] ConfirmRenounceSeatManagerAuthority = 11, + + /// AddApprovedEvictor + #[account(0, signer, name = "seat_manager_authority", desc = "The seat manager authority must sign to add an authorized delegate for eviction")] + #[account(1, name = "authorized_delegate")] + #[account(2, name = "authorized_delegate_pda")] + #[account(3, name = "system_program", desc = "System program")] + AddApprovedEvictor = 12, + + /// RemoveApprovedEvictor + #[account(0, signer, name = "seat_manager_authority", desc = "The seat manager authority must sign to remove an authorized delegate for eviction")] + #[account(1, name = "authorized_delegate")] + #[account(2, name = "authorized_delegate_pda")] + #[account(3, name = "system_program", desc = "System program")] + RemoveApprovedEvictor = 13, + + /// Evict Seat + #[account(0, name = "phoenix_program", desc = "Phoenix program")] + #[account(1, name = "log_authority", desc = "Phoenix log authority")] + #[account(2, writable, name = "market", desc = "This account holds the market state")] + #[account(3, writable, name = "seat_manager", desc = "The seat manager account must sign to evict a seat")] + #[account(4, writable, name = "seat_deposit_collector", desc = "Collects deposits for claiming new seats and refunds for evicting seats")] + #[account(5, name = "base_mint")] + #[account(6, name = "quote_mint")] + #[account(7, writable, name = "base_vault")] + #[account(8, writable, name = "quote_vault")] + #[account(9, name = "associated_token_account_program", desc = "Associated token account program")] + #[account(10, name = "token_program", desc = "Token program")] + #[account(11, name = "system program", desc = "System program to handle refund transfers")] + #[account(12, signer, name = "signer")] + #[account(13, name = "authorized_delegate_pda")] + // There can be multiple traders, so the following pattern can be repeated indefinitely + #[account(14, writable, name = "trader")] + #[account(15, name = "seat", desc = "The trader's PDA seat account, seeds are [b'seat', market_address, trader_address]")] + #[account(16, writable, name = "base_account", desc = "The trader's associated token account for the base mint")] + #[account(17, writable, name = "quote_account", desc = "The trader's associated token account for the quote mint")] + #[account(18, writable, name = "base_account_backup", desc = "Non-ATA token account for the base mint, in case the ATA owner is no longer the trader")] + #[account(19, writable, name = "quote_account_backup", desc = "Non-ATA token account for the quote mint, in case the ATA owner is no longer the trader")] + EvictSeatWithAuthorizedDelegate = 14, } impl SeatManagerInstruction { diff --git a/src/instruction_builders.rs b/src/instruction_builders.rs index 89a79a2..7b4e297 100644 --- a/src/instruction_builders.rs +++ b/src/instruction_builders.rs @@ -11,7 +11,7 @@ use solana_program::{ use spl_associated_token_account::get_associated_token_address; use crate::{ - get_seat_deposit_collector_address, get_seat_manager_address, + get_authorized_delegate_pda, get_seat_deposit_collector_address, get_seat_manager_address, instruction::SeatManagerInstruction, }; @@ -319,3 +319,101 @@ pub fn create_confirm_renounce_seat_manager_authority_instruction( data: SeatManagerInstruction::ConfirmRenounceSeatManagerAuthority.to_vec(), } } + +pub fn create_add_approved_evictor_instruction( + authority: &Pubkey, + authorized_delegate: &Pubkey, +) -> Instruction { + let (authorized_delegate_pda, _) = get_authorized_delegate_pda(authority, authorized_delegate); + Instruction { + program_id: crate::id(), + accounts: vec![ + AccountMeta::new(*authority, true), + AccountMeta::new_readonly(*authorized_delegate, false), + AccountMeta::new(authorized_delegate_pda, false), + AccountMeta::new_readonly(system_program::id(), false), + ], + data: SeatManagerInstruction::AddApprovedEvictor.to_vec(), + } +} + +pub fn create_remove_approved_evictor_instruction( + authority: &Pubkey, + authorized_delegate: &Pubkey, +) -> Instruction { + let (authorized_delegate_pda, _) = get_authorized_delegate_pda(authority, authorized_delegate); + Instruction { + program_id: crate::id(), + accounts: vec![ + AccountMeta::new(*authority, true), + AccountMeta::new_readonly(*authorized_delegate, false), + AccountMeta::new(authorized_delegate_pda, false), + AccountMeta::new_readonly(system_program::id(), false), + ], + data: SeatManagerInstruction::RemoveApprovedEvictor.to_vec(), + } +} + +pub fn create_evict_seat_with_authorized_delegate_instruction( + market: &Pubkey, + base_mint: &Pubkey, + quote_mint: &Pubkey, + authorized_delegate: &Pubkey, + traders: Vec, + seat_manager_authority: &Pubkey, +) -> Instruction { + let (base_vault, _) = get_vault_address(market, base_mint); + let (quote_vault, _) = get_vault_address(market, quote_mint); + let (seat_manager, _) = get_seat_manager_address(market); + let (seat_deposit_collector, _) = get_seat_deposit_collector_address(market); + + let (authorized_delegate_pda, _) = + get_authorized_delegate_pda(seat_manager_authority, authorized_delegate); + + let mut accounts = vec![ + AccountMeta::new_readonly(phoenix::id(), false), + AccountMeta::new_readonly(phoenix_log_authority::id(), false), + AccountMeta::new(*market, false), + AccountMeta::new_readonly(seat_manager, false), + AccountMeta::new(seat_deposit_collector, false), + AccountMeta::new_readonly(*base_mint, false), + AccountMeta::new_readonly(*quote_mint, false), + AccountMeta::new(base_vault, false), + AccountMeta::new(quote_vault, false), + AccountMeta::new_readonly(spl_associated_token_account::id(), false), + AccountMeta::new_readonly(spl_token::id(), false), + AccountMeta::new_readonly(system_program::id(), false), + AccountMeta::new_readonly(*authorized_delegate, true), + AccountMeta::new_readonly(authorized_delegate_pda, false), + ]; + + for trader_accounts in traders.iter() { + let base_account = get_associated_token_address(&trader_accounts.trader_pubkey, base_mint); + let quote_account = + get_associated_token_address(&trader_accounts.trader_pubkey, quote_mint); + let (seat, _) = get_seat_address(market, &trader_accounts.trader_pubkey); + accounts.push(AccountMeta::new(trader_accounts.trader_pubkey, false)); + accounts.push(AccountMeta::new(seat, false)); + accounts.push(AccountMeta::new(base_account, false)); + accounts.push(AccountMeta::new(quote_account, false)); + + for backup_account in [ + trader_accounts.base_token_account_backup, + trader_accounts.quote_token_account_backup, + ] + .iter() + { + if backup_account.is_some() { + accounts.push(AccountMeta::new(backup_account.unwrap(), false)); + } else { + accounts.push(AccountMeta::new_readonly(Pubkey::default(), false)); + } + } + } + + Instruction { + program_id: crate::id(), + accounts, + data: SeatManagerInstruction::EvictSeatWithAuthorizedDelegate.to_vec(), + } +} diff --git a/src/lib.rs b/src/lib.rs index 84b37bc..596f5a7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,10 @@ use ellipsis_macros::declare_id; use instruction::SeatManagerInstruction; use processor::{ - process_change_market_status, process_claim_market_authority, process_claim_seat, - process_claim_seat_manager_authority, process_confirm_renounce_seat_manager_authority, - process_designated_market_maker, process_evict_seat, process_name_successor, + process_authorized_evictor, process_change_market_status, process_claim_market_authority, + process_claim_seat, process_claim_seat_manager_authority, + process_confirm_renounce_seat_manager_authority, process_designated_market_maker, + process_evict_seat, process_name_successor, }; use solana_program::instruction::Instruction; use solana_program::msg; @@ -77,6 +78,20 @@ pub fn get_seat_manager_address(market: &Pubkey) -> (Pubkey, u8) { Pubkey::find_program_address(&[&market.to_bytes()], &crate::id()) } +pub fn get_authorized_delegate_pda( + seat_manager_authority: &Pubkey, + authorized_delegate: &Pubkey, +) -> (Pubkey, u8) { + Pubkey::find_program_address( + &[ + &seat_manager_authority.to_bytes(), + &authorized_delegate.to_bytes(), + b"delegate", + ], + &crate::id(), + ) +} + pub fn get_seat_deposit_collector_seeds( market: &Pubkey, seat_deposit_collector: &Pubkey, @@ -163,7 +178,7 @@ pub fn process_instruction( } SeatManagerInstruction::EvictSeat => { msg!("SeatManagerInstruction::EvictSeat"); - process_evict_seat(program_id, accounts) + process_evict_seat(program_id, accounts, false) } SeatManagerInstruction::AddDesignatedMarketMaker => { msg!("SeatManagerInstruction::AddDesignatedMarketMaker"); @@ -197,5 +212,17 @@ pub fn process_instruction( msg!("SeatManagerInstruction::ConfirmRenounceSeatManagerAuthority"); process_confirm_renounce_seat_manager_authority(program_id, accounts) } + SeatManagerInstruction::AddApprovedEvictor => { + msg!("SeatManagerInstruction::AddApprovedEvictor"); + process_authorized_evictor(program_id, accounts, false) + } + SeatManagerInstruction::RemoveApprovedEvictor => { + msg!("SeatManagerInstruction::RemoveApprovedEvictor"); + process_authorized_evictor(program_id, accounts, true) + } + SeatManagerInstruction::EvictSeatWithAuthorizedDelegate => { + msg!("SeatManagerInstruction::EvictSeat"); + process_evict_seat(program_id, accounts, true) + } } } diff --git a/src/processor/authorized_evictor.rs b/src/processor/authorized_evictor.rs new file mode 100644 index 0000000..52d352b --- /dev/null +++ b/src/processor/authorized_evictor.rs @@ -0,0 +1,98 @@ +use phoenix::program::{ + checkers::{Program, Signer}, + system_utils::create_account, +}; +use solana_program::{ + account_info::AccountInfo, entrypoint::ProgramResult, msg, program_error::ProgramError, + pubkey::Pubkey, rent::Rent, system_program, sysvar::Sysvar, +}; + +pub fn process_authorized_evictor( + program_id: &Pubkey, + accounts: &[AccountInfo], + remove: bool, +) -> ProgramResult { + let seat_manager_authority = Signer::new(&accounts[0])?; + let authorized_delegate = &accounts[1]; + let authorized_delegate_pda = &accounts[2]; + + // Get pubkey for PDA derived from: seat_manager_auth and authorized_delegate + let authorized_delegate_pda_seeds = get_authorized_delegate_seeds_and_validate( + &seat_manager_authority.key, + &authorized_delegate.key, + &authorized_delegate_pda.key, + &program_id, + )?; + + let system_program = Program::new(&accounts[3], &system_program::id())?; + + if !remove { + create_account( + &seat_manager_authority, + &authorized_delegate_pda, + &system_program, + program_id, + &Rent::get()?, + 0, + authorized_delegate_pda_seeds, + )?; + } else { + close_account(authorized_delegate_pda, seat_manager_authority.as_ref())?; + } + + Ok(()) +} + +pub fn get_authorized_delegate_seeds_and_validate( + seat_manager_authority: &Pubkey, + authorized_delegate: &Pubkey, + authorized_delegate_pda: &Pubkey, + program_id: &Pubkey, +) -> Result>, ProgramError> { + let mut seeds = vec![ + seat_manager_authority.to_bytes().to_vec(), + authorized_delegate.to_bytes().to_vec(), + b"delegate".to_vec(), + ]; + let (derived_pda, bump) = Pubkey::find_program_address( + seeds + .iter() + .map(|seed| seed.as_slice()) + .collect::>() + .as_slice(), + &program_id, + ); + seeds.push(vec![bump]); + + if derived_pda == *authorized_delegate_pda { + Ok(seeds) + } else { + let caller = std::panic::Location::caller(); + msg!( + "Invalid authorized delegate key, expected: {} found {}.\n{}", + authorized_delegate_pda, + derived_pda, + caller + ); + return Err(ProgramError::InvalidInstructionData.into()); + } +} + +pub fn close_account<'info>( + info: &AccountInfo<'info>, + sol_destination: &AccountInfo<'info>, +) -> Result<(), ProgramError> { + let dest_starting_lamports = sol_destination.lamports(); + + **sol_destination.lamports.borrow_mut() = + dest_starting_lamports.checked_add(info.lamports()).unwrap(); + + **info.lamports.borrow_mut() = 0; + + info.assign(&system_program::ID); + info.realloc(0, false).map_err(Into::into) +} + +pub fn does_pda_exist(program_id: &Pubkey, pda_ai: &AccountInfo) -> bool { + pda_ai.owner == program_id && pda_ai.lamports() != 0 +} diff --git a/src/processor/evict_seat.rs b/src/processor/evict_seat.rs index 18f99b9..5115683 100644 --- a/src/processor/evict_seat.rs +++ b/src/processor/evict_seat.rs @@ -23,6 +23,8 @@ use solana_program::{ }; use spl_associated_token_account::instruction::create_associated_token_account; +use super::{does_pda_exist, get_authorized_delegate_seeds_and_validate}; + struct TraderAccountsContext<'a, 'info> { trader: &'a AccountInfo<'info>, _seat: &'a AccountInfo<'info>, @@ -81,7 +83,11 @@ impl<'a, 'info> TraderAccountsContext<'a, 'info> { } } -pub fn process_evict_seat(program_id: &Pubkey, accounts: &[AccountInfo]) -> ProgramResult { +pub fn process_evict_seat( + program_id: &Pubkey, + accounts: &[AccountInfo], + evict_with_delegate: bool, +) -> ProgramResult { let market_ai = MarketAccount::new(&accounts[2])?; let seat_manager = SeatManagerAccount::new_with_market(&accounts[3], market_ai.key)?; let seat_deposit_collector = PDA::new( @@ -96,10 +102,29 @@ pub fn process_evict_seat(program_id: &Pubkey, accounts: &[AccountInfo]) -> Prog let quote_mint_ai = MintAccountInfo::new(&accounts[6])?; // Retrieve seat manager seeds and check if signer is authorized - let is_fully_authorized = *signer.key == seat_manager.load()?.authority; + let mut is_seat_manager_authority = *signer.key == seat_manager.load()?.authority; + + // If we are doing eviction with an authorized delegate, we need to validate the signer + if evict_with_delegate { + let authorized_delegate_pda = &accounts[13]; + + // First just check that the PDA passed in corresponds to the seat manager auth and the signer + let _seeds = get_authorized_delegate_seeds_and_validate( + &seat_manager.load()?.authority, + &signer.key, + &authorized_delegate_pda.key, + program_id, + )?; + + // If the PDA exists, then the signer is an authorized delegate + let is_authorized_delegate = does_pda_exist(program_id, authorized_delegate_pda); + + // If the seat manager auth passed the delegate flag by accident we'll still let them evict + is_seat_manager_authority = is_seat_manager_authority || is_authorized_delegate; + } // Get market parameters to perform checks - let (base_mint, quote_mint, market_size_params, has_eviction_privileges) = { + let (base_mint, quote_mint, market_size_params, seats_are_full) = { let market_bytes = market_ai.data.borrow(); let (header_bytes, market_bytes) = market_bytes.split_at(size_of::()); let market_header = @@ -118,8 +143,7 @@ pub fn process_evict_seat(program_id: &Pubkey, accounts: &[AccountInfo]) -> Prog let registered_traders = market.get_registered_traders(); // When this boolean is true, signer has the privilege to evict any seat with 0 locked base lots and 0 locked quote lots - let has_eviction_privileges = - registered_traders.capacity() == registered_traders.len(); + let seats_are_full = registered_traders.capacity() == registered_traders.len(); assert_with_msg( base_mint_ai.info.key == &base_mint, @@ -135,12 +159,17 @@ pub fn process_evict_seat(program_id: &Pubkey, accounts: &[AccountInfo]) -> Prog base_mint, quote_mint, market_header.market_size_params, - has_eviction_privileges, + seats_are_full, ) }; + let mut accounts_starting_index = 13; + if evict_with_delegate { + accounts_starting_index += 1; + } + // Perform eviction for trader(s) - for trader_accounts in &accounts[13..].iter().chunks(6) { + for trader_accounts in &accounts[accounts_starting_index..].iter().chunks(6) { let TraderAccountsContext { trader: trader_ai, _seat, @@ -165,11 +194,13 @@ pub fn process_evict_seat(program_id: &Pubkey, accounts: &[AccountInfo]) -> Prog && trader_state.base_lots_free == 0 && trader_state.quote_lots_free == 0; - let can_evict_trader = if has_eviction_privileges || is_fully_authorized { - trader_state.base_lots_locked == 0 && trader_state.quote_lots_locked == 0 - } else { - seat_is_empty - }; + // If a trader's seat has 0 locked base lots, 0 locked quote lots, then an approved deligate can remove it + let seat_is_unlocked = + trader_state.base_lots_locked == 0 && trader_state.quote_lots_locked == 0; + + let can_evict_trader = seat_is_empty // anyone can permissionlessly evict an empty seat + || (seats_are_full && seat_is_unlocked) // anyone can permissionlessly evict an unlocked seat when seats are full + || (is_seat_manager_authority && seat_is_unlocked); // the authorized user (authority or delegate) can evict an unlocked seat if can_evict_trader { // Change seat status @@ -258,8 +289,8 @@ pub fn process_evict_seat(program_id: &Pubkey, accounts: &[AccountInfo]) -> Prog &evict_seat_cpi_context, )?; - // If the signer is not fully authorized and if the currently evicted seat is not empty, only one eviction is allowed at a time - if !is_fully_authorized && !seat_is_empty { + // If the signer is not authorized and if the currently evicted seat is not empty, only one eviction is allowed at a time + if !is_seat_manager_authority && !seat_is_empty { msg!("Successfully evicted 1 seat"); break; } diff --git a/src/processor/mod.rs b/src/processor/mod.rs index 72cfc97..5390754 100644 --- a/src/processor/mod.rs +++ b/src/processor/mod.rs @@ -1,3 +1,4 @@ +pub mod authorized_evictor; pub mod change_market_fee_recipient; pub mod change_market_status; pub mod change_seat_manager_authority; @@ -8,6 +9,7 @@ pub mod designated_market_maker; pub mod evict_seat; pub mod name_market_authority_successor; +pub use authorized_evictor::*; pub use change_market_fee_recipient::*; pub use change_market_status::*; pub use change_seat_manager_authority::*; diff --git a/tests/setup/helpers.rs b/tests/setup/helpers.rs index 1acd44e..e57c28e 100644 --- a/tests/setup/helpers.rs +++ b/tests/setup/helpers.rs @@ -123,15 +123,20 @@ pub async fn mint_tokens( #[allow(dead_code)] pub async fn get_and_bootstrap_maker( sdk: &mut SDKClient, + market: &Pubkey, mint_authority: &Keypair, ) -> PhoenixTestAccount { - let maker = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint).await; + let meta = sdk.get_market_metadata(market).await.unwrap(); + let maker = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; sdk.client.add_keypair(&maker.user); let mut init_instructions = vec![]; - init_instructions.push(create_claim_seat_instruction( - &maker.user.pubkey(), - &sdk.active_market_key, - )); + init_instructions.push(create_claim_seat_instruction(&maker.user.pubkey(), market)); println!("maker: {:?}", maker.user.pubkey()); sdk.client .sign_send_instructions_with_payer(init_instructions, vec![&sdk.client.payer, &maker.user]) @@ -143,9 +148,17 @@ pub async fn get_and_bootstrap_maker( #[allow(dead_code)] pub async fn get_and_bootstrap_taker( sdk: &mut SDKClient, + market: &Pubkey, mint_authority: &Keypair, ) -> PhoenixTestAccount { - let taker = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint).await; + let meta = sdk.get_market_metadata(market).await.unwrap(); + let taker = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; sdk.client.add_keypair(&taker.user); taker } diff --git a/tests/setup/init.rs b/tests/setup/init.rs index d3d789f..0e1424b 100644 --- a/tests/setup/init.rs +++ b/tests/setup/init.rs @@ -1,8 +1,8 @@ -use ellipsis_client::program_test::*; use ellipsis_client::EllipsisClient; use phoenix::program::instruction_builders::*; use phoenix_seat_manager::get_seat_manager_address; use phoenix_seat_manager::instruction_builders::create_claim_market_authority_instruction; +use solana_program_test::*; use phoenix::program::status::MarketStatus; use phoenix::program::*; @@ -34,6 +34,7 @@ pub struct PhoenixTestClient { pub ctx: ProgramTestContext, pub sdk: SDKClient, pub mint_authority: Keypair, + pub market: Pubkey, } pub fn phoenix_test() -> ProgramTest { @@ -225,8 +226,11 @@ async fn bootstrap_with_parameters( PhoenixTestClient { ctx: context, - sdk: SDKClient::new_from_ellipsis_client(&market.pubkey(), ellipsis_client).await, + sdk: SDKClient::new_from_ellipsis_client(ellipsis_client) + .await + .unwrap(), mint_authority: authority, + market: market.pubkey(), } } diff --git a/tests/test_add_remove_mm.rs b/tests/test_add_remove_mm.rs index 8148c4a..fd5b3d2 100644 --- a/tests/test_add_remove_mm.rs +++ b/tests/test_add_remove_mm.rs @@ -18,16 +18,14 @@ async fn test_add_remove_happy_path() { ctx: _, sdk, mint_authority: _, + market, } = bootstrap_default(5).await; // Add seat for trader let trader = Pubkey::new_unique(); - let claim_seat = create_claim_seat_authorized_instruction( - &trader, - &sdk.active_market_key, - &sdk.client.payer.pubkey(), - ); + let claim_seat = + create_claim_seat_authorized_instruction(&trader, &market, &sdk.client.payer.pubkey()); sdk.client .sign_send_instructions(vec![claim_seat], vec![]) @@ -35,15 +33,14 @@ async fn test_add_remove_happy_path() { .unwrap(); // Add designated MM - let add_as_mm = - create_add_dmm_instruction(&sdk.active_market_key, &sdk.client.payer.pubkey(), &trader); + let add_as_mm = create_add_dmm_instruction(&market, &sdk.client.payer.pubkey(), &trader); sdk.client .sign_send_instructions(vec![add_as_mm], vec![]) .await .unwrap(); - let (seat_manager_address, _) = get_seat_manager_address(&sdk.active_market_key); + let (seat_manager_address, _) = get_seat_manager_address(&market); let seat_manager_data = sdk .client .get_account_data(&seat_manager_address) @@ -54,14 +51,13 @@ async fn test_add_remove_happy_path() { assert_eq!(seat_manager.num_makers, 1); // Remove designated MM - let remove_as_mm = - create_remove_dmm_instruction(&sdk.active_market_key, &sdk.client.payer.pubkey(), &trader); + let remove_as_mm = create_remove_dmm_instruction(&market, &sdk.client.payer.pubkey(), &trader); sdk.client .sign_send_instructions(vec![remove_as_mm], vec![]) .await .unwrap(); - let (seat_manager_address, _) = get_seat_manager_address(&sdk.active_market_key); + let (seat_manager_address, _) = get_seat_manager_address(&market); let seat_manager_data = sdk .client .get_account_data(&seat_manager_address) @@ -77,21 +73,20 @@ async fn test_add_remove_fails_if_trader_has_no_seat() { ctx: _, sdk, mint_authority: _, + market, } = bootstrap_default(5).await; let trader = Pubkey::new_unique(); // Add designated MM errors if no seat - let add_as_mm = - create_add_dmm_instruction(&sdk.active_market_key, &sdk.client.payer.pubkey(), &trader); + let add_as_mm = create_add_dmm_instruction(&market, &sdk.client.payer.pubkey(), &trader); assert!(sdk .client .sign_send_instructions(vec![add_as_mm], vec![]) .await .is_err()); - let remove_as_mm = - create_remove_dmm_instruction(&sdk.active_market_key, &sdk.client.payer.pubkey(), &trader); + let remove_as_mm = create_remove_dmm_instruction(&market, &sdk.client.payer.pubkey(), &trader); assert!(sdk .client @@ -106,15 +101,13 @@ async fn test_add_remove_fails_if_authority_not_signer_or_authority_mismatch() { ctx: _, mut sdk, mint_authority: _, + market, } = bootstrap_default(5).await; let trader = Pubkey::new_unique(); - let claim_seat = create_claim_seat_authorized_instruction( - &trader, - &sdk.active_market_key, - &sdk.client.payer.pubkey(), - ); + let claim_seat = + create_claim_seat_authorized_instruction(&trader, &market, &sdk.client.payer.pubkey()); sdk.client .sign_send_instructions(vec![claim_seat], vec![]) @@ -126,8 +119,7 @@ async fn test_add_remove_fails_if_authority_not_signer_or_authority_mismatch() { .await .unwrap(); - let add_as_mm = - create_add_dmm_instruction(&sdk.active_market_key, &unauthorized.pubkey(), &trader); + let add_as_mm = create_add_dmm_instruction(&market, &unauthorized.pubkey(), &trader); // Signer that does not match seat manager authority (client.payer) fails assert!(sdk @@ -137,8 +129,7 @@ async fn test_add_remove_fails_if_authority_not_signer_or_authority_mismatch() { .is_err()); // Missing authority signer fails - let mut add_as_mm = - create_add_dmm_instruction(&sdk.active_market_key, &sdk.client.payer.pubkey(), &trader); + let mut add_as_mm = create_add_dmm_instruction(&market, &sdk.client.payer.pubkey(), &trader); add_as_mm.accounts[3].is_signer = false; sdk.client.add_keypair(&unauthorized); diff --git a/tests/test_change_market_fee_recipient.rs b/tests/test_change_market_fee_recipient.rs index 140150a..c3c3158 100644 --- a/tests/test_change_market_fee_recipient.rs +++ b/tests/test_change_market_fee_recipient.rs @@ -20,24 +20,27 @@ use crate::setup::init::*; #[tokio::test] async fn test_change_market_fee_recipient_no_unclaimed() { - let PhoenixTestClient { ctx: _, sdk, .. } = bootstrap_default(0).await; + let PhoenixTestClient { + ctx: _, + sdk, + market, + .. + } = bootstrap_default(0).await; println!("Seat program authority: {}", sdk.client.payer.pubkey()); let new_fee_recipient = Pubkey::new_unique(); + let meta = sdk.get_market_metadata(&market).await.unwrap(); + let change_market_fee_recipient_ix = create_change_market_fee_recipient_instruction( - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), &new_fee_recipient, - &sdk.quote_mint, + &meta.quote_mint, &sdk.client.payer.pubkey(), ); - let market_account_data = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_account_data = sdk.client.get_account_data(&market).await.unwrap(); let (header_bytes, _market_bytes) = market_account_data.split_at(size_of::()); let header: &MarketHeader = bytemuck::try_from_bytes(header_bytes).unwrap(); @@ -51,11 +54,7 @@ async fn test_change_market_fee_recipient_no_unclaimed() { .await .unwrap(); // Verify that the market authority successor is set to the new keypair - let market_account_data = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_account_data = sdk.client.get_account_data(&market).await.unwrap(); let (header_bytes, _bytes) = market_account_data.split_at(size_of::()); let header = bytemuck::try_from_bytes::(header_bytes).unwrap(); @@ -69,20 +68,22 @@ async fn test_change_market_fee_recipient_unclaimed_fees() { let PhoenixTestClient { ctx: _, mut sdk, + market, mint_authority, } = bootstrap_default(5).await; //Place limit order with maker (keypair 1) - let maker = get_and_bootstrap_maker(&mut sdk, &mint_authority).await; + let maker = get_and_bootstrap_maker(&mut sdk, &market, &mint_authority).await; + let meta = sdk.get_market_metadata(&market).await.unwrap(); let maker_order_packet = OrderPacket::new_limit_order_default( Side::Ask, - sdk.float_price_to_ticks(10.0), + meta.float_price_to_ticks_rounded_up(10.0), 1_000_000_000, ); let limit_order_ix = create_new_order_instruction( - &sdk.active_market_key, + &market, &maker.user.pubkey(), - &sdk.base_mint, - &sdk.quote_mint, + &meta.base_mint, + &meta.quote_mint, &maker_order_packet, ); sdk.client @@ -91,9 +92,9 @@ async fn test_change_market_fee_recipient_unclaimed_fees() { .unwrap(); //Place cross order with taker (keypair 2) - let taker = get_and_bootstrap_taker(&mut sdk, &mint_authority).await; + let taker = get_and_bootstrap_taker(&mut sdk, &market, &mint_authority).await; let taker_order_packet = OrderPacket::new_ioc_buy_with_limit_price( - sdk.float_price_to_ticks(10.0), + meta.float_price_to_ticks_rounded_down(10.0), 10_000_000, SelfTradeBehavior::Abort, None, @@ -101,10 +102,10 @@ async fn test_change_market_fee_recipient_unclaimed_fees() { false, ); let taker_order_ix = create_new_order_instruction( - &sdk.active_market_key, + &market, &taker.user.pubkey(), - &sdk.base_mint, - &sdk.quote_mint, + &meta.base_mint, + &meta.quote_mint, &taker_order_packet, ); @@ -116,17 +117,13 @@ async fn test_change_market_fee_recipient_unclaimed_fees() { // Assert that market has unclaimed fees let (unclaimed_fees, current_fee_recipient) = { // Check if there are unclaimed fees in the market account. If so, generate change fee with unclaimed ix - let market_data = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_data = sdk.client.get_account_data(&market).await.unwrap(); let (header_bytes, market_bytes) = market_data.split_at(size_of::()); let market_header = bytemuck::try_from_bytes::(header_bytes).unwrap(); println!("Current authority: {}", market_header.authority); - let seat = get_seat_manager_address(&sdk.active_market_key); + let seat = get_seat_manager_address(&market); println!("Seat manager address: {:?}", seat); println!("Seat manager id: {}", phoenix_seat_manager::id()); println!("Current fee recipient: {}", market_header.fee_recipient); @@ -148,10 +145,10 @@ async fn test_change_market_fee_recipient_unclaimed_fees() { let new_fee_recipient = Pubkey::new_unique(); let claim_fees_ix = create_change_market_fee_recipient_instruction( - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), &new_fee_recipient, - &sdk.quote_mint, + &meta.quote_mint, ¤t_fee_recipient, ); @@ -167,11 +164,7 @@ async fn test_change_market_fee_recipient_unclaimed_fees() { .unwrap(); // Assert that the market authority successor is set to the new keypair - let market_account_data = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_account_data = sdk.client.get_account_data(&market).await.unwrap(); let (header_bytes, _bytes) = market_account_data.split_at(size_of::()); let header = bytemuck::try_from_bytes::(header_bytes).unwrap(); @@ -181,17 +174,23 @@ async fn test_change_market_fee_recipient_unclaimed_fees() { #[tokio::test] async fn test_change_market_fee_recipient_invalid_authority() { - let PhoenixTestClient { ctx: _, sdk, .. } = bootstrap_default(0).await; + let PhoenixTestClient { + ctx: _, + market, + sdk, + .. + } = bootstrap_default(0).await; println!("Seat program authority: {}", sdk.client.payer.pubkey()); let new_fee_recipient = Pubkey::new_unique(); let incorrect_authority = Keypair::new(); + let meta = sdk.get_market_metadata(&market).await.unwrap(); let change_market_fee_recipient_ix = create_change_market_fee_recipient_instruction( - &sdk.active_market_key, + &market, &incorrect_authority.pubkey(), &new_fee_recipient, - &sdk.quote_mint, + &meta.quote_mint, &sdk.client.payer.pubkey(), ); diff --git a/tests/test_change_market_status.rs b/tests/test_change_market_status.rs index e94f841..b80e999 100644 --- a/tests/test_change_market_status.rs +++ b/tests/test_change_market_status.rs @@ -15,11 +15,12 @@ async fn test_change_market_status_happy_path() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default(5).await; let change_market_status = create_change_market_status_instruction( - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), MarketStatus::Paused, ); @@ -29,11 +30,7 @@ async fn test_change_market_status_happy_path() { .await .unwrap(); - let market_data = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_data = sdk.client.get_account_data(&market).await.unwrap(); let (header_bytes, _) = market_data.split_at(size_of::()); let header = bytemuck::try_from_bytes::(header_bytes).unwrap(); @@ -45,6 +42,7 @@ async fn test_change_market_status_happy_path() { async fn test_change_market_status_fails_if_authority_not_signer_or_unauthorized_signer() { let PhoenixTestClient { ctx: _, + market, mut sdk, mint_authority: _, } = bootstrap_default(5).await; @@ -55,7 +53,7 @@ async fn test_change_market_status_fails_if_authority_not_signer_or_unauthorized .unwrap(); let change_market_status = create_change_market_status_instruction( - &sdk.active_market_key, + &market, &unauthorized.pubkey(), MarketStatus::Paused, ); @@ -67,7 +65,7 @@ async fn test_change_market_status_fails_if_authority_not_signer_or_unauthorized .is_err()); let mut change_market_status = create_change_market_status_instruction( - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), MarketStatus::Paused, ); diff --git a/tests/test_claim_market_authority.rs b/tests/test_claim_market_authority.rs index a56044e..fde2d32 100644 --- a/tests/test_claim_market_authority.rs +++ b/tests/test_claim_market_authority.rs @@ -29,6 +29,7 @@ async fn test_claim_market_authority_reclaim_works_with_fresh_dmms() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default(5).await; @@ -37,7 +38,7 @@ async fn test_claim_market_authority_reclaim_works_with_fresh_dmms() { let claim_seat = create_claim_seat_authorized_instruction( &trader_keypair.pubkey(), - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), ); @@ -47,7 +48,7 @@ async fn test_claim_market_authority_reclaim_works_with_fresh_dmms() { .unwrap(); let add_mm_ix = create_add_dmm_instruction( - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), &trader_keypair.pubkey(), ); @@ -57,7 +58,7 @@ async fn test_claim_market_authority_reclaim_works_with_fresh_dmms() { .await .unwrap(); - let seat_manager_address = get_seat_manager_address(&sdk.active_market_key).0; + let seat_manager_address = get_seat_manager_address(&market).0; let seat_manager_data = sdk .client .get_account_data(&seat_manager_address) @@ -76,7 +77,7 @@ async fn test_claim_market_authority_reclaim_works_with_fresh_dmms() { // Pass market authority to new keypair let new_authority = Keypair::new(); let name_market_authority_successor_ix = create_name_market_authority_successor_instruction( - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), &new_authority.pubkey(), ); @@ -87,29 +88,22 @@ async fn test_claim_market_authority_reclaim_works_with_fresh_dmms() { .unwrap(); let claim_market_authority = - create_claim_authority_instruction(&new_authority.pubkey(), &sdk.active_market_key); + create_claim_authority_instruction(&new_authority.pubkey(), &market); sdk.client .sign_send_instructions(vec![claim_market_authority], vec![&new_authority]) .await .unwrap(); - let market_data = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_data = sdk.client.get_account_data(&market).await.unwrap(); let header_bytes = &market_data[..size_of::()]; let market_header = bytemuck::try_from_bytes::(header_bytes).unwrap(); assert!(market_header.authority == new_authority.pubkey()); // New authority names seat manager as new market successor - let name_market_authority_successor_ix = create_name_successor_instruction( - &new_authority.pubkey(), - &sdk.active_market_key, - &seat_manager_address, - ); + let name_market_authority_successor_ix = + create_name_successor_instruction(&new_authority.pubkey(), &market, &seat_manager_address); sdk.client .sign_send_instructions( @@ -120,13 +114,11 @@ async fn test_claim_market_authority_reclaim_works_with_fresh_dmms() { .unwrap(); // Seat manager claim authority still works - let claim_market_authority = create_claim_market_authority_instruction( - &sdk.active_market_key, - &sdk.client.payer.pubkey(), - ); + let claim_market_authority = + create_claim_market_authority_instruction(&market, &sdk.client.payer.pubkey()); // Add lamports to the seat collector address because a trader exists on the market. let required_lamports = sdk.client.rent_exempt(spl_token::state::Account::LEN) * 2; - let seat_deposit_collector = get_seat_deposit_collector_address(&sdk.active_market_key).0; + let seat_deposit_collector = get_seat_deposit_collector_address(&market).0; airdrop(&sdk.client, &seat_deposit_collector, required_lamports) .await @@ -137,11 +129,7 @@ async fn test_claim_market_authority_reclaim_works_with_fresh_dmms() { .await .unwrap(); - let market_data = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_data = sdk.client.get_account_data(&market).await.unwrap(); let header_bytes = &market_data[..size_of::()]; let market_header = bytemuck::try_from_bytes::(header_bytes).unwrap(); @@ -166,6 +154,7 @@ async fn test_claim_market_authority_requires_rent_for_existing_traders() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default_without_sm_claiming_authority(5).await; @@ -176,27 +165,27 @@ async fn test_claim_market_authority_requires_rent_for_existing_traders() { let claim_seat = create_request_seat_authorized_instruction( &sdk.client.payer.pubkey(), &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &trader_keypair.pubkey(), ); let claim_seat_two = create_request_seat_authorized_instruction( &sdk.client.payer.pubkey(), &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &trader_keypair_two.pubkey(), ); let change_seat_status_one = create_change_seat_status_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &trader_keypair.pubkey(), SeatApprovalStatus::Approved, ); let change_seat_status_two = create_change_seat_status_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &trader_keypair_two.pubkey(), SeatApprovalStatus::Approved, ); @@ -214,29 +203,23 @@ async fn test_claim_market_authority_requires_rent_for_existing_traders() { .await .unwrap(); - let claim_market_authority = create_claim_market_authority_instruction( - &sdk.active_market_key, - &sdk.client.payer.pubkey(), - ); - let market_bytes = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let claim_market_authority = + create_claim_market_authority_instruction(&market, &sdk.client.payer.pubkey()); + let market_bytes = sdk.client.get_account_data(&market).await.unwrap(); let (header_bytes, market_bytes) = market_bytes.split_at(size_of::()); let market_header = bytemuck::try_from_bytes::(header_bytes).unwrap(); - let market = load_with_dispatch(&market_header.market_size_params, market_bytes) + let phoenix_market = load_with_dispatch(&market_header.market_size_params, market_bytes) .unwrap() .inner; - let registered_traders = market.get_registered_traders(); + let registered_traders = phoenix_market.get_registered_traders(); let required_lamports = sdk.client.rent_exempt(spl_token::state::Account::LEN) * 2 * registered_traders.len() as u64; // Times 2 for two token accounts for each trader - let seat_deposit_collector = get_seat_deposit_collector_address(&sdk.active_market_key).0; + let seat_deposit_collector = get_seat_deposit_collector_address(&market).0; println!("Required lamports: {}", required_lamports); airdrop(&sdk.client, &seat_deposit_collector, required_lamports) @@ -255,6 +238,7 @@ async fn test_claim_market_authority_fails_if_deposit_collector_has_insufficient let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default_without_sm_claiming_authority(5).await; @@ -265,27 +249,27 @@ async fn test_claim_market_authority_fails_if_deposit_collector_has_insufficient let claim_seat = create_request_seat_authorized_instruction( &sdk.client.payer.pubkey(), &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &trader_keypair.pubkey(), ); let claim_seat_two = create_request_seat_authorized_instruction( &sdk.client.payer.pubkey(), &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &trader_keypair_two.pubkey(), ); let change_seat_status_one = create_change_seat_status_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &trader_keypair.pubkey(), SeatApprovalStatus::Approved, ); let change_seat_status_two = create_change_seat_status_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &trader_keypair_two.pubkey(), SeatApprovalStatus::Approved, ); @@ -303,16 +287,10 @@ async fn test_claim_market_authority_fails_if_deposit_collector_has_insufficient .await .unwrap(); - let claim_market_authority = create_claim_market_authority_instruction( - &sdk.active_market_key, - &sdk.client.payer.pubkey(), - ); + let claim_market_authority = + create_claim_market_authority_instruction(&market, &sdk.client.payer.pubkey()); - let market_bytes = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_bytes = sdk.client.get_account_data(&market).await.unwrap(); let (header_bytes, market_bytes) = market_bytes.split_at(size_of::()); let market_header = bytemuck::try_from_bytes::(header_bytes).unwrap(); diff --git a/tests/test_claim_seat.rs b/tests/test_claim_seat.rs index ebae0e4..21bea50 100644 --- a/tests/test_claim_seat.rs +++ b/tests/test_claim_seat.rs @@ -19,13 +19,20 @@ async fn test_claim_seat_without_trader_as_signer_fails_and_with_signer_succeeds let PhoenixTestClient { ctx: _, sdk, + market, mint_authority, } = bootstrap_default(5).await; - let trader = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint) - .await - .user; - let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &sdk.active_market_key); + let meta = sdk.get_market_metadata(&market).await.unwrap(); + let trader = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await + .user; + let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &market); // Assert that claim seat fails when trader is not a signer assert!(sdk @@ -42,14 +49,14 @@ async fn test_claim_seat_without_trader_as_signer_fails_and_with_signer_succeeds // Asert able to create limit order let maker_order_packet = OrderPacket::new_limit_order_default( Side::Ask, - sdk.float_price_to_ticks(10.0), + meta.float_price_to_ticks_rounded_up(10.0), 1_000_000_000, ); let limit_order_ix = create_new_order_instruction( - &sdk.active_market_key, + &market, &trader.pubkey(), - &sdk.base_mint, - &sdk.quote_mint, + &meta.base_mint, + &meta.quote_mint, &maker_order_packet, ); assert!(sdk @@ -64,16 +71,24 @@ async fn test_claim_seat_authorized_happy_path() { let PhoenixTestClient { mut ctx, sdk, + market, mint_authority, } = bootstrap_default(5).await; - let trader = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint) - .await - .user; + let meta = sdk.get_market_metadata(&market).await.unwrap(); + + let trader = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await + .user; let claim_seat_ix = create_claim_seat_authorized_instruction( &trader.pubkey(), - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), ); @@ -86,14 +101,14 @@ async fn test_claim_seat_authorized_happy_path() { // Assert able to create limit order let maker_order_packet = OrderPacket::new_limit_order_default( Side::Ask, - sdk.float_price_to_ticks(10.0), + meta.float_price_to_ticks_rounded_up(10.0), 1_000_000_000, ); let limit_order_ix = create_new_order_instruction( - &sdk.active_market_key, + &market, &trader.pubkey(), - &sdk.base_mint, - &sdk.quote_mint, + &meta.base_mint, + &meta.quote_mint, &maker_order_packet, ); assert!(sdk @@ -106,7 +121,7 @@ async fn test_claim_seat_authorized_happy_path() { let claim_seat_ix = create_claim_seat_authorized_instruction( &trader.pubkey(), - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), ); @@ -122,12 +137,19 @@ async fn test_claim_seat_authorized_without_authority_signer_fails() { let PhoenixTestClient { ctx: _, mut sdk, + market, mint_authority, } = bootstrap_default(5).await; - let trader = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint) - .await - .user; + let meta = sdk.get_market_metadata(&market).await.unwrap(); + let trader = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await + .user; let unauthorized_payer = Keypair::new(); airdrop(&sdk.client, &unauthorized_payer.pubkey(), 1_000_000_000) @@ -136,7 +158,7 @@ async fn test_claim_seat_authorized_without_authority_signer_fails() { let claim_seat_ix = create_claim_seat_authorized_instruction( &trader.pubkey(), - &sdk.active_market_key, + &market, &unauthorized_payer.pubkey(), ); @@ -148,7 +170,7 @@ async fn test_claim_seat_authorized_without_authority_signer_fails() { let mut claim_seat_ix = create_claim_seat_authorized_instruction( &trader.pubkey(), - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), ); @@ -169,22 +191,28 @@ async fn test_claim_seat_deposits_two_token_accounts_lamports() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority, } = bootstrap_default(5).await; - let trader = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint) - .await - .user; + let meta = sdk.get_market_metadata(&market).await.unwrap(); + let trader = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await + .user; - let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &sdk.active_market_key); + let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &market); sdk.client .sign_send_instructions(vec![claim_seat_ix], vec![&trader]) .await .unwrap(); - let seat_deposit_collector_address = - get_seat_deposit_collector_address(&sdk.active_market_key).0; + let seat_deposit_collector_address = get_seat_deposit_collector_address(&market).0; let seat_deposit_collector_ending_lamports = sdk .client .get_account(&seat_deposit_collector_address) diff --git a/tests/test_claim_seat_manager_authority.rs b/tests/test_claim_seat_manager_authority.rs index b636fe6..bb70541 100644 --- a/tests/test_claim_seat_manager_authority.rs +++ b/tests/test_claim_seat_manager_authority.rs @@ -15,6 +15,7 @@ async fn test_claim_seat_manager_authority_happy_path() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default(5).await; @@ -22,7 +23,7 @@ async fn test_claim_seat_manager_authority_happy_path() { let name_successor_ix = create_name_seat_manager_successor_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &successor.pubkey(), ); @@ -31,17 +32,15 @@ async fn test_claim_seat_manager_authority_happy_path() { .await .unwrap(); - let claim_authority_ix = create_claim_seat_manager_authority_instruction( - &sdk.active_market_key, - &successor.pubkey(), - ); + let claim_authority_ix = + create_claim_seat_manager_authority_instruction(&market, &successor.pubkey()); sdk.client .sign_send_instructions(vec![claim_authority_ix], vec![&successor]) .await .unwrap(); - let (seat_manager_address, _) = get_seat_manager_address(&sdk.active_market_key); + let (seat_manager_address, _) = get_seat_manager_address(&market); let seat_manager_data = sdk .client .get_account_data(&seat_manager_address) @@ -57,6 +56,7 @@ async fn test_claim_seat_manager_authority_fails_if_sucessor_not_signer_or_wrong let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default(5).await; @@ -64,7 +64,7 @@ async fn test_claim_seat_manager_authority_fails_if_sucessor_not_signer_or_wrong let name_successor_ix = create_name_seat_manager_successor_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &successor.pubkey(), ); @@ -73,10 +73,8 @@ async fn test_claim_seat_manager_authority_fails_if_sucessor_not_signer_or_wrong .await .unwrap(); - let claim_authority_ix = create_claim_seat_manager_authority_instruction( - &sdk.active_market_key, - &successor.pubkey(), - ); + let claim_authority_ix = + create_claim_seat_manager_authority_instruction(&market, &successor.pubkey()); // Fails if sucessor is not a signer assert!(sdk @@ -88,10 +86,8 @@ async fn test_claim_seat_manager_authority_fails_if_sucessor_not_signer_or_wrong // Fails if wrong sucessor tries to claim let unauthorsized_successor = Keypair::new(); - let claim_authority_ix = create_claim_seat_manager_authority_instruction( - &sdk.active_market_key, - &unauthorsized_successor.pubkey(), - ); + let claim_authority_ix = + create_claim_seat_manager_authority_instruction(&market, &unauthorsized_successor.pubkey()); assert!(sdk .client diff --git a/tests/test_confirm_renounce_seat_manager_authority.rs b/tests/test_confirm_renounce_seat_manager_authority.rs index 73b1097..9316929 100644 --- a/tests/test_confirm_renounce_seat_manager_authority.rs +++ b/tests/test_confirm_renounce_seat_manager_authority.rs @@ -18,6 +18,7 @@ use crate::setup::init::PhoenixTestClient; async fn test_confirm_renounce_seat_manager_authority_success() { let PhoenixTestClient { ctx: _, + market, sdk, mint_authority: _, } = bootstrap_default(5).await; @@ -25,7 +26,7 @@ async fn test_confirm_renounce_seat_manager_authority_success() { let initiate_renounce_psm_authority_ix = create_initiate_renounce_seat_manager_authority_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, ); sdk.client @@ -36,7 +37,7 @@ async fn test_confirm_renounce_seat_manager_authority_success() { let confimr_renounce_psm_authority_ix = create_confirm_renounce_seat_manager_authority_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, ); sdk.client @@ -44,7 +45,7 @@ async fn test_confirm_renounce_seat_manager_authority_success() { .await .unwrap(); - let (seat_manager_address, _) = get_seat_manager_address(&sdk.active_market_key); + let (seat_manager_address, _) = get_seat_manager_address(&market); let seat_manager_data = sdk .client .get_account_data(&seat_manager_address) @@ -56,7 +57,7 @@ async fn test_confirm_renounce_seat_manager_authority_success() { // Assert that an admin action authorized by the previous authority fails. let change_market_status = create_change_market_status_instruction( - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), MarketStatus::Paused, ); @@ -73,13 +74,14 @@ async fn test_confirm_renounce_seat_manager_authority_fails_unauthorized_signer( let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default(5).await; let initiate_renounce_sm_authority_ix = create_initiate_renounce_seat_manager_authority_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, ); sdk.client @@ -95,7 +97,7 @@ async fn test_confirm_renounce_seat_manager_authority_fails_unauthorized_signer( let confirm_renounce_sm_authority_ix = create_confirm_renounce_seat_manager_authority_instruction( &unauthorized_signer.pubkey(), - &sdk.active_market_key, + &market, ); assert!(sdk @@ -109,7 +111,7 @@ async fn test_confirm_renounce_seat_manager_authority_fails_unauthorized_signer( let mut confirm_renounce_ix = create_confirm_renounce_seat_manager_authority_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, ); confirm_renounce_ix.accounts[1].is_signer = false; @@ -136,13 +138,14 @@ async fn test_confirm_renounce_seat_manager_authority_fails_if_not_initiated() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default(5).await; let confirm_renounce_sm_authority_ix = create_confirm_renounce_seat_manager_authority_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, ); assert!(sdk diff --git a/tests/test_evict_authorized_delegate.rs b/tests/test_evict_authorized_delegate.rs new file mode 100644 index 0000000..1199d23 --- /dev/null +++ b/tests/test_evict_authorized_delegate.rs @@ -0,0 +1,356 @@ +mod setup; + +use crate::setup::init::bootstrap_default; +use crate::setup::init::PhoenixTestClient; +use ellipsis_client::EllipsisClient; +use phoenix::program::create_deposit_funds_instruction; +use phoenix::program::deposit::DepositParams; +use phoenix_seat_manager::get_authorized_delegate_pda; +use phoenix_seat_manager::instruction_builders::create_add_approved_evictor_instruction; +use phoenix_seat_manager::instruction_builders::create_claim_seat_instruction; +use phoenix_seat_manager::instruction_builders::create_evict_seat_with_authorized_delegate_instruction; +use phoenix_seat_manager::instruction_builders::create_remove_approved_evictor_instruction; +use phoenix_seat_manager::instruction_builders::EvictTraderAccountBackup; +use setup::helpers::airdrop; +use setup::helpers::sol; +use setup::init::setup_account; +use solana_sdk::compute_budget::ComputeBudgetInstruction; +use solana_sdk::signature::Keypair; +use solana_sdk::signer::Signer; + +#[tokio::test] +async fn test_add_remove_happy_path() { + let PhoenixTestClient { + ctx: _, + sdk, + mint_authority: _, + market: _, + } = bootstrap_default(5).await; + + let authorized_delegate = Keypair::new(); + let (authorized_delegate_pda, _) = + get_authorized_delegate_pda(&sdk.client.payer.pubkey(), &authorized_delegate.pubkey()); + + // Add authorized delegate evictor + let add_evictor_ix = create_add_approved_evictor_instruction( + &sdk.client.payer.pubkey(), + &authorized_delegate.pubkey(), + ); + + sdk.client + .sign_send_instructions(vec![add_evictor_ix], vec![]) + .await + .unwrap(); + + let authorized_delegate_pda_data = sdk + .client + .get_account(&authorized_delegate_pda) + .await + .unwrap(); + + assert_ne!(authorized_delegate_pda_data.lamports, 0); + assert_eq!( + authorized_delegate_pda_data.owner, + phoenix_seat_manager::id() + ); + + // Remove authorized delegate evictor + let remove_evictor_ix = create_remove_approved_evictor_instruction( + &sdk.client.payer.pubkey(), + &authorized_delegate.pubkey(), + ); + + sdk.client + .sign_send_instructions(vec![remove_evictor_ix], vec![]) + .await + .unwrap(); + + let authorized_delegate_pda_resp = sdk.client.get_account(&authorized_delegate_pda).await; + + assert!(authorized_delegate_pda_resp.is_err()); +} + +#[tokio::test] +async fn test_evict_seat_multiple_authorized() { + let PhoenixTestClient { + ctx: _, + sdk, + market, + mint_authority, + } = bootstrap_default(5).await; + + let authorized_delegate = Keypair::new(); + let (authorized_delegate_pda, _) = + get_authorized_delegate_pda(&sdk.client.payer.pubkey(), &authorized_delegate.pubkey()); + + // Add authorized delegate evictor + let add_evictor_ix = create_add_approved_evictor_instruction( + &sdk.client.payer.pubkey(), + &authorized_delegate.pubkey(), + ); + + sdk.client + .sign_send_instructions(vec![add_evictor_ix], vec![]) + .await + .unwrap(); + + let authorized_delegate_pda_data = sdk + .client + .get_account(&authorized_delegate_pda) + .await + .unwrap(); + + assert_ne!(authorized_delegate_pda_data.lamports, 0); + assert_eq!( + authorized_delegate_pda_data.owner, + phoenix_seat_manager::id() + ); + + let meta = sdk.get_market_metadata(&market).await.unwrap(); + + // Claim seats for two traders, and add deposits + let trader_one = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; + + let trader_two = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; + + let claim_seat_one = create_claim_seat_instruction(&trader_one.user.pubkey(), &market); + + let deposit_one = create_deposit_funds_instruction( + &market, + &trader_one.user.pubkey(), + &meta.base_mint, + &meta.quote_mint, + &DepositParams { + quote_lots_to_deposit: 1, + base_lots_to_deposit: 1, + }, + ); + + let claim_seat_two = create_claim_seat_instruction(&trader_two.user.pubkey(), &market); + + let deposit_two = create_deposit_funds_instruction( + &market, + &trader_two.user.pubkey(), + &meta.base_mint, + &meta.quote_mint, + &DepositParams { + quote_lots_to_deposit: 1, + base_lots_to_deposit: 1, + }, + ); + + sdk.client + .sign_send_instructions( + vec![claim_seat_one, deposit_one, claim_seat_two, deposit_two], + vec![&trader_one.user, &trader_two.user], + ) + .await + .unwrap(); + + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); + assert!(traders.get(&trader_one.user.pubkey()).is_some()); + assert!(traders.get(&trader_two.user.pubkey()).is_some()); + + // Evict seats for both traders + let evict_seats = create_evict_seat_with_authorized_delegate_instruction( + &market, + &meta.base_mint, + &meta.quote_mint, + &authorized_delegate.pubkey(), + vec![ + EvictTraderAccountBackup { + trader_pubkey: trader_one.user.pubkey(), + base_token_account_backup: None, + quote_token_account_backup: None, + }, + EvictTraderAccountBackup { + trader_pubkey: trader_two.user.pubkey(), + base_token_account_backup: None, + quote_token_account_backup: None, + }, + ], + &sdk.client.payer.pubkey(), + ); + + let compute_increase = ComputeBudgetInstruction::set_compute_unit_limit(1_400_000); + + sdk.client + .sign_send_instructions( + vec![compute_increase, evict_seats], + vec![&authorized_delegate], + ) + .await + .unwrap(); + + // Assert that neither trader are in the market state + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); + assert!(traders.get(&trader_one.user.pubkey()).is_none()); + assert!(traders.get(&trader_two.user.pubkey()).is_none()); +} + +#[tokio::test] +async fn test_evict_seat_multiple_authorized_fails_after_delegate_removal() { + let PhoenixTestClient { + ctx, + sdk, + market, + mint_authority, + } = bootstrap_default(5).await; + + let authorized_delegate = Keypair::new(); + let (authorized_delegate_pda, _) = + get_authorized_delegate_pda(&sdk.client.payer.pubkey(), &authorized_delegate.pubkey()); + + // Add authorized delegate evictor + let add_evictor_ix = create_add_approved_evictor_instruction( + &sdk.client.payer.pubkey(), + &authorized_delegate.pubkey(), + ); + + sdk.client + .sign_send_instructions(vec![add_evictor_ix], vec![]) + .await + .unwrap(); + + let authorized_delegate_pda_data = sdk + .client + .get_account(&authorized_delegate_pda) + .await + .unwrap(); + + assert_ne!(authorized_delegate_pda_data.lamports, 0); + assert_eq!( + authorized_delegate_pda_data.owner, + phoenix_seat_manager::id() + ); + + // Remove authorized delegate evictor + let remove_evictor_ix = create_remove_approved_evictor_instruction( + &sdk.client.payer.pubkey(), + &authorized_delegate.pubkey(), + ); + + sdk.client + .sign_send_instructions(vec![remove_evictor_ix], vec![]) + .await + .unwrap(); + + let authorized_delegate_pda_resp = sdk.client.get_account(&authorized_delegate_pda).await; + + assert!(authorized_delegate_pda_resp.is_err()); + + let meta = sdk.get_market_metadata(&market).await.unwrap(); + + // Claim seats for two traders, and add deposits + let trader_one = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; + + let trader_two = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; + + let claim_seat_one = create_claim_seat_instruction(&trader_one.user.pubkey(), &market); + + let deposit_one = create_deposit_funds_instruction( + &market, + &trader_one.user.pubkey(), + &meta.base_mint, + &meta.quote_mint, + &DepositParams { + quote_lots_to_deposit: 1, + base_lots_to_deposit: 1, + }, + ); + + let claim_seat_two = create_claim_seat_instruction(&trader_two.user.pubkey(), &market); + + let deposit_two = create_deposit_funds_instruction( + &market, + &trader_two.user.pubkey(), + &meta.base_mint, + &meta.quote_mint, + &DepositParams { + quote_lots_to_deposit: 1, + base_lots_to_deposit: 1, + }, + ); + + sdk.client + .sign_send_instructions( + vec![claim_seat_one, deposit_one, claim_seat_two, deposit_two], + vec![&trader_one.user, &trader_two.user], + ) + .await + .unwrap(); + + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); + assert!(traders.get(&trader_one.user.pubkey()).is_some()); + assert!(traders.get(&trader_two.user.pubkey()).is_some()); + + // Create new client so that we don't accidentally sign with the seat_manager_authority keypair + airdrop(&sdk.client, &authorized_delegate.pubkey(), sol(10.0)) + .await + .unwrap(); + let mut ellipsis_client = EllipsisClient::from_banks(&ctx.banks_client, &authorized_delegate) + .await + .unwrap(); + let authority = Keypair::new(); + ellipsis_client.add_keypair(&authority); + + // Evict seats for both traders + let evict_seats = create_evict_seat_with_authorized_delegate_instruction( + &market, + &meta.base_mint, + &meta.quote_mint, + &authorized_delegate.pubkey(), + vec![ + EvictTraderAccountBackup { + trader_pubkey: trader_one.user.pubkey(), + base_token_account_backup: None, + quote_token_account_backup: None, + }, + EvictTraderAccountBackup { + trader_pubkey: trader_two.user.pubkey(), + base_token_account_backup: None, + quote_token_account_backup: None, + }, + ], + &sdk.client.payer.pubkey(), + ); + + let compute_increase = ComputeBudgetInstruction::set_compute_unit_limit(1_400_000); + + ellipsis_client + .sign_send_instructions( + vec![compute_increase, evict_seats], + vec![&authorized_delegate], + ) + .await + .unwrap(); + + // Assert that both traders are still in the market state, since eviction above should have failed + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); + assert!(traders.get(&trader_one.user.pubkey()).is_some()); + assert!(traders.get(&trader_two.user.pubkey()).is_some()); +} diff --git a/tests/test_evict_seat.rs b/tests/test_evict_seat.rs index 2939e96..4ca6c87 100644 --- a/tests/test_evict_seat.rs +++ b/tests/test_evict_seat.rs @@ -36,21 +36,32 @@ async fn test_evict_seat_multiple_authorized() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority, } = bootstrap_default(5).await; + let meta = sdk.get_market_metadata(&market).await.unwrap(); + // Claim seats for two traders - let trader_one = - setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint).await; + let trader_one = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; - let trader_two = - setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint).await; + let trader_two = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; - let claim_seat_one = - create_claim_seat_instruction(&trader_one.user.pubkey(), &sdk.active_market_key); + let claim_seat_one = create_claim_seat_instruction(&trader_one.user.pubkey(), &market); - let claim_seat_two = - create_claim_seat_instruction(&trader_two.user.pubkey(), &sdk.active_market_key); + let claim_seat_two = create_claim_seat_instruction(&trader_two.user.pubkey(), &market); sdk.client .sign_send_instructions( @@ -60,15 +71,15 @@ async fn test_evict_seat_multiple_authorized() { .await .unwrap(); - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); assert!(traders.get(&trader_one.user.pubkey()).is_some()); assert!(traders.get(&trader_two.user.pubkey()).is_some()); // Evict seats for both traders let evict_seats = create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &sdk.client.payer.pubkey(), vec![ EvictTraderAccountBackup { @@ -92,7 +103,7 @@ async fn test_evict_seat_multiple_authorized() { .unwrap(); // Assert that neither trader are in the market state - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); assert!(traders.get(&trader_one.user.pubkey()).is_none()); assert!(traders.get(&trader_two.user.pubkey()).is_none()); } @@ -102,19 +113,26 @@ async fn test_evict_seat_permissionless_succeeds_when_evicting_empty_seats() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority, } = bootstrap_default(5).await; + let meta = sdk.get_market_metadata(&market).await.unwrap(); let mut new_traders = vec![]; // Need to fill market with traders let num_new_traders = NUM_SEATS / 2; for _ in 0..num_new_traders { - let trader = - setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint).await; + let trader = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; let claim_seat = create_claim_seat_authorized_instruction( &trader.user.pubkey(), - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), ); @@ -139,9 +157,9 @@ async fn test_evict_seat_permissionless_succeeds_when_evicting_empty_seats() { } let evict_seats = create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &evictor.pubkey(), traders_to_evict .iter() @@ -165,7 +183,7 @@ async fn test_evict_seat_permissionless_succeeds_when_evicting_empty_seats() { .unwrap(); // Assert that all traders were evicted - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); let eviction_successful = traders_to_evict .iter() .all(|i| traders.get(&new_traders[*i].user.pubkey()).is_none()); @@ -178,37 +196,47 @@ async fn test_evict_seat_permissionless_succeeds_when_full_and_only_evicts_one() let PhoenixTestClient { ctx: _, sdk, + market, mint_authority, } = bootstrap_default(5).await; - let trader_one = - setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint).await; + let meta = sdk.get_market_metadata(&market).await.unwrap(); + let trader_one = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; - let trader_two = - setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint).await; + let trader_two = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; - let claim_seat_one = - create_claim_seat_instruction(&trader_one.user.pubkey(), &sdk.active_market_key); + let claim_seat_one = create_claim_seat_instruction(&trader_one.user.pubkey(), &market); let deposit_one = create_deposit_funds_instruction( - &sdk.active_market_key, + &market, &trader_one.user.pubkey(), - &sdk.base_mint, - &sdk.quote_mint, + &meta.base_mint, + &meta.quote_mint, &DepositParams { quote_lots_to_deposit: 1, base_lots_to_deposit: 1, }, ); - let claim_seat_two = - create_claim_seat_instruction(&trader_two.user.pubkey(), &sdk.active_market_key); + let claim_seat_two = create_claim_seat_instruction(&trader_two.user.pubkey(), &market); let deposit_two = create_deposit_funds_instruction( - &sdk.active_market_key, + &market, &trader_two.user.pubkey(), - &sdk.base_mint, - &sdk.quote_mint, + &meta.base_mint, + &meta.quote_mint, &DepositParams { quote_lots_to_deposit: 1, base_lots_to_deposit: 1, @@ -223,7 +251,7 @@ async fn test_evict_seat_permissionless_succeeds_when_full_and_only_evicts_one() .await .unwrap(); - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); assert!(traders.get(&trader_one.user.pubkey()).is_some()); assert!(traders.get(&trader_two.user.pubkey()).is_some()); @@ -232,11 +260,8 @@ async fn test_evict_seat_permissionless_succeeds_when_full_and_only_evicts_one() for _ in 0..num_new_traders { let trader = Pubkey::new_unique(); - let claim_seat = create_claim_seat_authorized_instruction( - &trader, - &sdk.active_market_key, - &sdk.client.payer.pubkey(), - ); + let claim_seat = + create_claim_seat_authorized_instruction(&trader, &market, &sdk.client.payer.pubkey()); let result = sdk .client @@ -245,19 +270,15 @@ async fn test_evict_seat_permissionless_succeeds_when_full_and_only_evicts_one() println!("Result: {:?}", result); } - let market_bytes = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_bytes = sdk.client.get_account_data(&market).await.unwrap(); let (header_bytes, market_bytes) = market_bytes.split_at(size_of::()); let market_header = bytemuck::try_from_bytes::(header_bytes).unwrap(); - let market = load_with_dispatch(&market_header.market_size_params, market_bytes) + let phoenix_market = load_with_dispatch(&market_header.market_size_params, market_bytes) .unwrap() .inner; - let registered_traders = market.get_registered_traders(); + let registered_traders = phoenix_market.get_registered_traders(); println!("Capacity: {:?}", registered_traders.capacity()); println!("Length: {:?}", registered_traders.len()); @@ -268,9 +289,9 @@ async fn test_evict_seat_permissionless_succeeds_when_full_and_only_evicts_one() let unauthorized_keypair = Keypair::new(); let evict_seats = create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &unauthorized_keypair.pubkey(), vec![ EvictTraderAccountBackup { @@ -298,7 +319,7 @@ async fn test_evict_seat_permissionless_succeeds_when_full_and_only_evicts_one() .unwrap(); // Assert that trader one was evicted but trader two remains - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); assert!(traders.get(&trader_one.user.pubkey()).is_none()); assert!(traders.get(&trader_two.user.pubkey()).is_some()); } @@ -309,17 +330,16 @@ async fn test_evict_seat_fails_on_designated_market_maker() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default(5).await; + let meta = sdk.get_market_metadata(&market).await.unwrap(); // Add seat for trader let trader = Pubkey::new_unique(); - let claim_seat = create_claim_seat_authorized_instruction( - &trader, - &sdk.active_market_key, - &sdk.client.payer.pubkey(), - ); + let claim_seat = + create_claim_seat_authorized_instruction(&trader, &market, &sdk.client.payer.pubkey()); sdk.client .sign_send_instructions(vec![claim_seat], vec![]) @@ -327,15 +347,14 @@ async fn test_evict_seat_fails_on_designated_market_maker() { .unwrap(); // Add designated MM - let add_as_mm = - create_add_dmm_instruction(&sdk.active_market_key, &sdk.client.payer.pubkey(), &trader); + let add_as_mm = create_add_dmm_instruction(&market, &sdk.client.payer.pubkey(), &trader); sdk.client .sign_send_instructions(vec![add_as_mm], vec![]) .await .unwrap(); - let (seat_manager_address, _) = get_seat_manager_address(&sdk.active_market_key); + let (seat_manager_address, _) = get_seat_manager_address(&market); let seat_manager_data = sdk .client .get_account_data(&seat_manager_address) @@ -347,9 +366,9 @@ async fn test_evict_seat_fails_on_designated_market_maker() { // Evict seats for dmm - should fail let evict_seat = create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &sdk.client.payer.pubkey(), vec![EvictTraderAccountBackup { trader_pubkey: trader, @@ -363,7 +382,7 @@ async fn test_evict_seat_fails_on_designated_market_maker() { .await .unwrap(); - let (seat_manager_address, _) = get_seat_manager_address(&sdk.active_market_key); + let (seat_manager_address, _) = get_seat_manager_address(&market); let seat_manager_data = sdk .client .get_account_data(&seat_manager_address) @@ -378,14 +397,22 @@ async fn test_evict_seat_fails_on_designated_market_maker() { async fn test_evict_seat_refunds_claim_seat_deposit() { let PhoenixTestClient { ctx: _, + market, sdk, mint_authority, } = bootstrap_default(5).await; - let trader = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint) - .await - .user; - let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &sdk.active_market_key); + let meta = sdk.get_market_metadata(&market).await.unwrap(); + + let trader = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await + .user; + let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &market); sdk.client .sign_send_instructions(vec![claim_seat_ix], vec![&trader]) @@ -400,9 +427,9 @@ async fn test_evict_seat_refunds_claim_seat_deposit() { .unwrap() .lamports; let evict_seat_ix = create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &sdk.client.payer.pubkey(), vec![EvictTraderAccountBackup { trader_pubkey: trader.pubkey(), @@ -421,8 +448,7 @@ async fn test_evict_seat_refunds_claim_seat_deposit() { ) .await .unwrap(); - let seat_deposit_collector_address = - get_seat_deposit_collector_address(&sdk.active_market_key).0; + let seat_deposit_collector_address = get_seat_deposit_collector_address(&market).0; assert!(sdk .client @@ -450,13 +476,21 @@ async fn test_evict_seat_no_refunds_if_trader_closes_ata() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority, } = bootstrap_default(5).await; - let trader = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint) - .await - .user; - let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &sdk.active_market_key); + let meta = sdk.get_market_metadata(&market).await.unwrap(); + + let trader = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await + .user; + let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &market); sdk.client .sign_send_instructions(vec![claim_seat_ix], vec![&trader]) @@ -464,7 +498,7 @@ async fn test_evict_seat_no_refunds_if_trader_closes_ata() { .unwrap(); // Close trader ata. Must burn all tokens first - let base_ata = get_associated_token_address(&trader.pubkey(), &sdk.base_mint); + let base_ata = get_associated_token_address(&trader.pubkey(), &meta.base_mint); let base_amount = spl_token::state::Account::unpack_from_slice( sdk.client .get_account_data(&base_ata) @@ -477,14 +511,14 @@ async fn test_evict_seat_no_refunds_if_trader_closes_ata() { let base_burn_ix = burn( &spl_token::id(), &base_ata, - &sdk.base_mint, + &meta.base_mint, &trader.pubkey(), &[&trader.pubkey()], base_amount, ) .unwrap(); - let quote_ata = get_associated_token_address(&trader.pubkey(), &sdk.quote_mint); + let quote_ata = get_associated_token_address(&trader.pubkey(), &meta.quote_mint); let quote_amount = spl_token::state::Account::unpack_from_slice( sdk.client .get_account_data("e_ata) @@ -498,7 +532,7 @@ async fn test_evict_seat_no_refunds_if_trader_closes_ata() { let quote_burn_ix = burn( &spl_token::id(), "e_ata, - &sdk.quote_mint, + &meta.quote_mint, &trader.pubkey(), &[&trader.pubkey()], quote_amount, @@ -542,9 +576,9 @@ async fn test_evict_seat_no_refunds_if_trader_closes_ata() { .lamports; let evict_seat_ix = create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &sdk.client.payer.pubkey(), vec![EvictTraderAccountBackup { trader_pubkey: trader.pubkey(), @@ -565,8 +599,7 @@ async fn test_evict_seat_no_refunds_if_trader_closes_ata() { .unwrap(); // Seat deposit collector should have no more lamports, due to using deposit to create ATAs - let seat_deposit_collector_address = - get_seat_deposit_collector_address(&sdk.active_market_key).0; + let seat_deposit_collector_address = get_seat_deposit_collector_address(&market).0; assert!(sdk .client .get_account(&seat_deposit_collector_address) @@ -588,13 +621,21 @@ async fn test_evict_seat_change_ata_owners_uses_backup_token_accounts() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority, } = bootstrap_default(5).await; - let trader = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint) - .await - .user; - let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &sdk.active_market_key); + let meta = sdk.get_market_metadata(&market).await.unwrap(); + + let trader = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await + .user; + let claim_seat_ix = create_claim_seat_instruction(&trader.pubkey(), &market); sdk.client .sign_send_instructions(vec![claim_seat_ix], vec![&trader]) @@ -603,7 +644,7 @@ async fn test_evict_seat_change_ata_owners_uses_backup_token_accounts() { // Change ATA owners let new_owner = Pubkey::new_unique(); - let base_ata = get_associated_token_address(&trader.pubkey(), &sdk.base_mint); + let base_ata = get_associated_token_address(&trader.pubkey(), &meta.base_mint); let change_owner = spl_token::instruction::set_authority( &spl_token::id(), &base_ata, @@ -614,7 +655,7 @@ async fn test_evict_seat_change_ata_owners_uses_backup_token_accounts() { ) .unwrap(); - let quote_ata = get_associated_token_address(&trader.pubkey(), &sdk.quote_mint); + let quote_ata = get_associated_token_address(&trader.pubkey(), &meta.quote_mint); let quote_change_owner = spl_token::instruction::set_authority( &spl_token::id(), "e_ata, @@ -643,7 +684,7 @@ async fn test_evict_seat_change_ata_owners_uses_backup_token_accounts() { let create_backup_base_token = spl_token::instruction::initialize_account3( &spl_token::id(), &new_base_token_account.pubkey(), - &sdk.base_mint, + &meta.base_mint, &trader.pubkey(), ) .unwrap(); @@ -658,7 +699,7 @@ async fn test_evict_seat_change_ata_owners_uses_backup_token_accounts() { let create_backup_quote_token = spl_token::instruction::initialize_account3( &spl_token::id(), &new_quote_token_account.pubkey(), - &sdk.quote_mint, + &meta.quote_mint, &trader.pubkey(), ); @@ -697,9 +738,9 @@ async fn test_evict_seat_change_ata_owners_uses_backup_token_accounts() { // Evict seat with backup token accounts let evict_seat_ix = create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &sdk.client.payer.pubkey(), vec![EvictTraderAccountBackup { trader_pubkey: trader.pubkey(), @@ -733,8 +774,7 @@ async fn test_evict_seat_change_ata_owners_uses_backup_token_accounts() { .unwrap() .lamports; - let seat_deposit_collector_address = - get_seat_deposit_collector_address(&sdk.active_market_key).0; + let seat_deposit_collector_address = get_seat_deposit_collector_address(&market).0; // Seat deposit collector account should be empty after refunding signer for creation of backup accounts assert!(sdk diff --git a/tests/test_name_market_authority_successor.rs b/tests/test_name_market_authority_successor.rs index 911c38f..29a764c 100644 --- a/tests/test_name_market_authority_successor.rs +++ b/tests/test_name_market_authority_successor.rs @@ -1,8 +1,8 @@ use std::mem::size_of; -use ellipsis_client::program_test::*; use phoenix::program::*; use phoenix_seat_manager::instruction_builders::create_name_market_authority_successor_instruction; +use solana_program_test::*; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::Keypair; @@ -14,13 +14,18 @@ use crate::setup::init::PhoenixTestClient; #[tokio::test] async fn test_name_market_authority_successor() { - let PhoenixTestClient { ctx: _, sdk, .. } = bootstrap_default(0).await; + let PhoenixTestClient { + ctx: _, + sdk, + market, + .. + } = bootstrap_default(0).await; // Create seat manager instruction to name market authority successor let successor = Pubkey::new_unique(); let name_market_authority_successor_ix = create_name_market_authority_successor_instruction( - &sdk.active_market_key, + &market, &sdk.client.payer.pubkey(), &successor, ); @@ -35,11 +40,7 @@ async fn test_name_market_authority_successor() { .unwrap(); // Verify that the market authority successor is set to the new keypair - let market_account_data = sdk - .client - .get_account_data(&sdk.active_market_key) - .await - .unwrap(); + let market_account_data = sdk.client.get_account_data(&market).await.unwrap(); let (header_bytes, _bytes) = market_account_data.split_at(size_of::()); let header = bytemuck::try_from_bytes::(header_bytes).unwrap(); @@ -50,14 +51,19 @@ async fn test_name_market_authority_successor() { #[tokio::test] async fn test_name_market_authority_unauthorized_seat_authority_signed() { // Same setup as test_name_market_authority_successor except authority is not the payer not a random pubkey - let PhoenixTestClient { ctx: _, sdk, .. } = bootstrap_default(0).await; + let PhoenixTestClient { + ctx: _, + sdk, + market, + .. + } = bootstrap_default(0).await; // Create seat manager instruction to name market authority successor let successor = Pubkey::new_unique(); let incorrect_authority = Keypair::new(); let name_market_authority_successor_ix = create_name_market_authority_successor_instruction( - &sdk.active_market_key, + &market, &incorrect_authority.pubkey(), &successor, ); diff --git a/tests/test_name_seat_manager_successor.rs b/tests/test_name_seat_manager_successor.rs index f7d86ca..f79ee4d 100644 --- a/tests/test_name_seat_manager_successor.rs +++ b/tests/test_name_seat_manager_successor.rs @@ -15,6 +15,7 @@ async fn test_name_seat_manager_successor_happy_path() { let PhoenixTestClient { ctx: _, sdk, + market, mint_authority: _, } = bootstrap_default(5).await; @@ -22,7 +23,7 @@ async fn test_name_seat_manager_successor_happy_path() { let name_successor_ix = create_name_seat_manager_successor_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &successor, ); @@ -31,7 +32,7 @@ async fn test_name_seat_manager_successor_happy_path() { .await .unwrap(); - let (seat_manager_address, _) = get_seat_manager_address(&sdk.active_market_key); + let (seat_manager_address, _) = get_seat_manager_address(&market); let seat_manager_data = sdk .client .get_account_data(&seat_manager_address) @@ -47,6 +48,7 @@ async fn test_name_seat_manager_sucesssor_fails_if_authority_not_signer_or_autho let PhoenixTestClient { ctx: _, mut sdk, + market, mint_authority: _, } = bootstrap_default(5).await; @@ -57,11 +59,8 @@ async fn test_name_seat_manager_sucesssor_fails_if_authority_not_signer_or_autho .unwrap(); // Fails if authority mismatch with seat manager account (real authority is sdk.client.pubkey) - let name_successor_ix = create_name_seat_manager_successor_instruction( - &unauthorized.pubkey(), - &sdk.active_market_key, - &successor, - ); + let name_successor_ix = + create_name_seat_manager_successor_instruction(&unauthorized.pubkey(), &market, &successor); assert!(sdk .client @@ -72,7 +71,7 @@ async fn test_name_seat_manager_sucesssor_fails_if_authority_not_signer_or_autho // Fails if authority is not a signer let mut name_successor_ix = create_name_seat_manager_successor_instruction( &sdk.client.payer.pubkey(), - &sdk.active_market_key, + &market, &successor, ); diff --git a/tests/test_seat_manager.rs b/tests/test_seat_manager.rs index c4faa8a..75d66b0 100644 --- a/tests/test_seat_manager.rs +++ b/tests/test_seat_manager.rs @@ -1,4 +1,3 @@ -use ellipsis_client::program_test::*; use phoenix::program::create_deposit_funds_instruction; use phoenix::program::deposit::DepositParams; use phoenix_seat_manager::instruction_builders::create_claim_seat_instruction; @@ -7,6 +6,7 @@ use phoenix_seat_manager::instruction_builders::EvictTraderAccountBackup; use rand::seq::IteratorRandom; use rand::thread_rng; use solana_program::system_instruction; +use solana_program_test::*; use solana_sdk::compute_budget::ComputeBudgetInstruction; use solana_sdk::signature::{Keypair, Signer}; @@ -25,17 +25,25 @@ async fn test_seat_manager() { let PhoenixTestClient { ctx, sdk, + market, mint_authority, } = bootstrap_default(0).await; + let meta = sdk.get_market_metadata(&market).await.unwrap(); // Create 30 let mut market_traders = vec![]; for i in 0..NUM_SEATS { - let t = setup_account(&sdk.client, &mint_authority, sdk.base_mint, sdk.quote_mint).await; + let t = setup_account( + &sdk.client, + &mint_authority, + meta.base_mint, + meta.quote_mint, + ) + .await; airdrop(&sdk.client, &t.user.pubkey(), 100_000_000) .await .unwrap(); if i % 100 == 0 { - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); assert!(traders.len() == i); let mut rng = thread_rng(); let sample = traders @@ -56,9 +64,9 @@ async fn test_seat_manager() { 1781760, ), create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &t.user.pubkey(), sample, ), @@ -69,16 +77,16 @@ async fn test_seat_manager() { .unwrap(); // Can't evict a seat while the market is not full - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); assert!(traders.len() == i); println!("Created {} traders", i); } let deposit_ix = create_deposit_funds_instruction( - &sdk.active_market_key, + &market, &t.user.pubkey(), - &sdk.base_mint, - &sdk.quote_mint, + &meta.base_mint, + &meta.quote_mint, &DepositParams { quote_lots_to_deposit: 1, base_lots_to_deposit: 1, @@ -95,16 +103,16 @@ async fn test_seat_manager() { spl_associated_token_account::instruction::create_associated_token_account_idempotent( &sdk.client.payer.pubkey(), &t.user.pubkey(), - &sdk.base_mint, + &meta.base_mint, &spl_token::id(), ), spl_associated_token_account::instruction::create_associated_token_account_idempotent( &sdk.client.payer.pubkey(), &t.user.pubkey(), - &sdk.quote_mint, + &meta.quote_mint, &spl_token::id(), ), - create_claim_seat_instruction(&t.user.pubkey(), &sdk.active_market_key), + create_claim_seat_instruction(&t.user.pubkey(), &market), deposit_ix, ], vec![&sdk.client.payer, &t.user], @@ -115,7 +123,7 @@ async fn test_seat_manager() { } let t = Keypair::new(); - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); assert!(traders.len() == NUM_SEATS); let mut rng = thread_rng(); let sample = traders @@ -129,9 +137,9 @@ async fn test_seat_manager() { // Can evict at most 1 seat when the market is full let evict_seat_ix = create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &t.pubkey(), sample, ); @@ -145,7 +153,7 @@ async fn test_seat_manager() { ) .await .unwrap(); - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); assert!(traders.len() == NUM_SEATS - 1); // Seat manager authority can evict multiple seats @@ -158,9 +166,9 @@ async fn test_seat_manager() { }) .choose_multiple(&mut rng, 3); let evict_seat_ix = create_evict_seat_instruction( - &sdk.active_market_key, - &sdk.base_mint, - &sdk.quote_mint, + &market, + &meta.base_mint, + &meta.quote_mint, &sdk.client.payer.pubkey(), sample, ); @@ -175,6 +183,7 @@ async fn test_seat_manager() { ) .await .unwrap(); - let traders = sdk.get_traders().await; + let traders = sdk.get_traders_with_market_key(&market).await.unwrap(); + assert!(traders.len() == NUM_SEATS - 4); }