From 87fb6da101e6e777e8b316343ccb2a0592714c95 Mon Sep 17 00:00:00 2001 From: Chris Heaney Date: Mon, 24 Jun 2024 12:31:58 -0400 Subject: [PATCH] update drift to v2.84.0 --- Cargo.lock | 167 +++++++++++++++++++++++++++------- programs/jit-proxy/Cargo.toml | 3 +- 2 files changed, 136 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1915d3e6..e833f3fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,9 +51,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72832d73be48bac96a5d7944568f305d829ed55b0ce3b483647089dfaf6cf704" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", "getrandom 0.2.9", @@ -500,7 +500,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" dependencies = [ "borsh-derive 0.10.3", - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -867,9 +867,10 @@ dependencies = [ [[package]] name = "drift" -version = "2.83.0" -source = "git+https://github.com/drift-labs/protocol-v2.git?rev=a95009#a9500947038624afbf03d565833be50567145af7" +version = "2.84.0" +source = "git+https://github.com/drift-labs/protocol-v2.git?rev=v2.84.0#4c990151647b9aef038e59b22ef09bc5e9b27623" dependencies = [ + "ahash 0.8.6", "anchor-lang", "anchor-spl", "arrayref", @@ -883,6 +884,7 @@ dependencies = [ "num-traits", "phoenix-v1", "pyth-client", + "pyth-solana-receiver-sdk", "serum_dex", "solana-program", "solana-security-txt", @@ -989,6 +991,15 @@ dependencies = [ "termcolor", ] +[[package]] +name = "fast-math" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2465292146cdfc2011350fe3b1c616ac83cf0faeedb33463ba1c332ed8948d66" +dependencies = [ + "ieee754", +] + [[package]] name = "feature-probe" version = "0.1.1" @@ -1057,22 +1068,13 @@ dependencies = [ "ahash 0.7.6", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] - [[package]] name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.4", + "ahash 0.8.6", ] [[package]] @@ -1098,6 +1100,9 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] [[package]] name = "hmac" @@ -1141,6 +1146,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "ieee754" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9007da9cacbd3e6343da136e98b0d2df013f553d35bdec8b518f07bea768e19c" + [[package]] name = "im" version = "15.1.0" @@ -1185,6 +1196,7 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" name = "jit-proxy" version = "0.10.2" dependencies = [ + "ahash 0.8.6", "anchor-lang", "anchor-spl", "bytemuck", @@ -1351,6 +1363,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -1362,6 +1388,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-complex" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +dependencies = [ + "num-traits", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -1394,6 +1429,29 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.15" @@ -1610,9 +1668,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -1623,6 +1681,40 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44de48029c54ec1ca570786b5baeb906b0fc2409c8e0145585e287ee7a526c72" +[[package]] +name = "pyth-solana-receiver-sdk" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e6559643f0b377b6f293269251f6a804ae7332c37f7310371f50c833453cd0" +dependencies = [ + "anchor-lang", + "hex", + "pythnet-sdk", + "solana-program", +] + +[[package]] +name = "pythnet-sdk" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bbbc0456f9f27c9ad16b6c3bf1b2a7fea61eebf900f4d024a0468b9a84fe0c1" +dependencies = [ + "anchor-lang", + "bincode", + "borsh 0.10.3", + "bytemuck", + "byteorder", + "fast-math", + "hex", + "proc-macro2", + "rustc_version 0.4.0", + "serde", + "sha3 0.10.4", + "slow_primes", + "solana-program", + "thiserror", +] + [[package]] name = "qstring" version = "0.7.2" @@ -2035,6 +2127,15 @@ dependencies = [ "typenum", ] +[[package]] +name = "slow_primes" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58267dd2fbaa6dceecba9e3e106d2d90a2b02497c0e8b01b8759beccf5113938" +dependencies = [ + "num", +] + [[package]] name = "smallvec" version = "1.8.0" @@ -2043,11 +2144,11 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "solana-frozen-abi" -version = "1.16.27" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a96a0a64cbc75e06c8eb49d6cd0a87054c48dbf59100d9959389aba51fb501" +checksum = "a7077f6495ccc313dff49c3e3f3ed03e49058258bae7fee77ac29ba0a474ba82" dependencies = [ - "ahash 0.8.4", + "ahash 0.8.6", "blake3", "block-buffer 0.10.4", "bs58 0.4.0", @@ -2076,9 +2177,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.16.27" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae9765c963bebbf609dcdc82cfb969746cbdf6d65cfc9d94112e984475ae4ac" +checksum = "f516f992211a2ab70de5c367190575c97e02d156f9f1d8b76886d673f30e88a2" dependencies = [ "proc-macro2", "quote", @@ -2088,9 +2189,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.16.27" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c039e4336890c7a0667207caeb452187efa0602d80eca61a854f2e39915e972" +checksum = "7b64def674bfaa4a3f8be7ba19c03c9caec4ec028ba62b9a427ec1bf608a2486" dependencies = [ "env_logger", "lazy_static", @@ -2099,9 +2200,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.16.27" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c16757f43d4384907f6e81924e155b8bd8228efcdcf9ea38bd4e18ea100804" +checksum = "3e92350aa5b42564681655331e7e0b9d5c99a442de317ceeb4741efbbe9a6c05" dependencies = [ "ark-bn254", "ark-ec", @@ -2154,9 +2255,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.27" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf179cda65775982e5f31da8d58dfa4349c3b5ae1573ceb507c7fc91df66690" +checksum = "2087e15c92d4d6b3f085dc12fbe9614141c811f90a54cc418240ac30b608133f" dependencies = [ "assert_matches", "base64 0.21.7", @@ -2207,9 +2308,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.27" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f188d6fe76183137a4922274acbe76fc4fcc474b3fad860bb2612cb225e6e2a" +checksum = "2e0e0e7ee984b0f9179a1d4f4e9e67ce675de2324b5a98b61d2bdb61be3c19bb" dependencies = [ "bs58 0.4.0", "proc-macro2", @@ -2226,9 +2327,9 @@ checksum = "7e0461f3afb29d8591300b3dd09b5472b3772d65688a2826ad960b8c0d5fa605" [[package]] name = "solana-zk-token-sdk" -version = "1.16.27" +version = "1.16.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9513c4f1595b61f8a39a14c27535da2b2145c20c6b35ab491a1830981972b2bd" +checksum = "1457c85ab70a518438b9ac2b0c56037b9f6693060dfb617bbb93c7116e4f0c22" dependencies = [ "aes-gcm-siv", "base64 0.21.7", @@ -2481,7 +2582,7 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "switchboard" version = "0.1.0" -source = "git+https://github.com/drift-labs/protocol-v2.git?rev=a95009#a9500947038624afbf03d565833be50567145af7" +source = "git+https://github.com/drift-labs/protocol-v2.git?rev=v2.84.0#4c990151647b9aef038e59b22ef09bc5e9b27623" dependencies = [ "anchor-lang", ] diff --git a/programs/jit-proxy/Cargo.toml b/programs/jit-proxy/Cargo.toml index db583005..c5d80280 100644 --- a/programs/jit-proxy/Cargo.toml +++ b/programs/jit-proxy/Cargo.toml @@ -17,5 +17,6 @@ default = [] anchor-lang = "0.29.0" anchor-spl = "0.29.0" bytemuck = { version = "1.4.0" } -drift = { git = "https://github.com/drift-labs/protocol-v2.git", rev = "a95009", features = ["cpi", "mainnet-beta"]} +drift = { git = "https://github.com/drift-labs/protocol-v2.git", rev = "v2.84.0", features = ["cpi", "mainnet-beta"]} static_assertions = "1.1.0" +ahash = "=0.8.6"