diff --git a/.github/workflows/ci-code-review-rust.yml b/.github/workflows/ci-code-review-rust.yml index d2c8c0bcb..33344254c 100644 --- a/.github/workflows/ci-code-review-rust.yml +++ b/.github/workflows/ci-code-review-rust.yml @@ -21,7 +21,7 @@ on: env: CARGO_TERM_COLOR: always - SOLANA_VERSION: '1.13.3' + SOLANA_VERSION: '1.14.9' RUST_TOOLCHAIN: '1.60.0' LOG_PROGRAM: 'm43thNJ58XCjL798ZSq6JGAG1BnWskhdq5or6kcnfsD' diff --git a/.gitmodules b/.gitmodules index bb905a829..cbe50ef2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = anchor url = https://github.com/blockworks-foundation/anchor.git branch = v0.25.0-mangov4 +[submodule "switchboard-v2"] + path = switchboard-v2 + url = https://github.com/blockworks-foundation/sbv2-solana.git diff --git a/Cargo.lock b/Cargo.lock index 42b2a2fe8..7414c55d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,9 +67,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -110,7 +110,7 @@ dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", "regex", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -123,7 +123,7 @@ dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", "rustversion", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -132,7 +132,7 @@ version = "0.25.0" dependencies = [ "anchor-syn", "proc-macro2 1.0.47", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -142,7 +142,7 @@ dependencies = [ "anchor-syn", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -153,7 +153,7 @@ dependencies = [ "anyhow", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -165,7 +165,7 @@ dependencies = [ "heck 0.3.3", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -176,7 +176,7 @@ dependencies = [ "anyhow", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -187,7 +187,7 @@ dependencies = [ "anyhow", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -202,7 +202,7 @@ dependencies = [ "chrono", "clap 3.2.23", "dirs 3.0.2", - "flate2 1.0.24", + "flate2 1.0.25", "heck 0.3.3", "pathdiff", "portpicker", @@ -217,7 +217,7 @@ dependencies = [ "solana-faucet", "solana-program", "solana-sdk", - "syn 1.0.103", + "syn 1.0.105", "tar", "tokio", "toml", @@ -247,7 +247,7 @@ dependencies = [ "anyhow", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -297,7 +297,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.9.9", - "syn 1.0.103", + "syn 1.0.105", "thiserror", ] @@ -362,7 +362,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.15", + "time 0.3.17", ] [[package]] @@ -373,7 +373,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", "synstructure", ] @@ -385,7 +385,7 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -396,9 +396,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-channel" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ "concurrent-queue", "event-listener", @@ -412,7 +412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" dependencies = [ "brotli", - "flate2 1.0.24", + "flate2 1.0.25", "futures-core", "memchr", "pin-project-lite", @@ -456,7 +456,7 @@ checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -467,18 +467,18 @@ checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -508,15 +508,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "axum" -version = "0.5.17" +name = "autotools" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" +checksum = "c8138adefca3e5d2e73bfba83bd6eeaf904b26a7ac1b4a19892cfe16cc7e1701" +dependencies = [ + "cc", +] + +[[package]] +name = "axum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48" dependencies = [ "async-trait", "axum-core", "bitflags", - "bytes 1.2.1", + "bytes 1.3.0", "futures-util", "http", "http-body", @@ -527,9 +536,9 @@ dependencies = [ "mime 0.3.16", "percent-encoding 2.2.0", "pin-project-lite", + "rustversion", "serde", "sync_wrapper", - "tokio", "tower", "tower-http", "tower-layer", @@ -538,16 +547,17 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.2.9" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" +checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" dependencies = [ "async-trait", - "bytes 1.2.1", + "bytes 1.3.0", "futures-util", "http", "http-body", "mime 0.3.16", + "rustversion", "tower-layer", "tower-service", ] @@ -572,12 +582,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base64" version = "0.9.3" @@ -626,9 +630,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" dependencies = [ "bitflags", "cexpr", @@ -660,16 +664,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if 1.0.0", "constant_time_eq", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -738,7 +742,7 @@ dependencies = [ "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2 1.0.47", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -749,7 +753,7 @@ checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -760,7 +764,7 @@ checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -827,6 +831,27 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" +[[package]] +name = "bytecheck" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d11cac2c12b5adc6570dad2ee1b87eff4955dac476fe12d81e5fdd352e52406f" +dependencies = [ + "bytecheck_derive", + "ptr_meta", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" +dependencies = [ + "proc-macro2 1.0.47", + "quote 1.0.21", + "syn 1.0.105", +] + [[package]] name = "bytemuck" version = "1.12.3" @@ -844,7 +869,7 @@ checksum = "5fe233b960f12f8007e3db2d136e3cb1c291bfd7396e384ee76025fc1a3932b4" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -865,9 +890,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "bzip2" @@ -890,12 +915,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "caps" version = "0.5.5" @@ -919,9 +938,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.76" +version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" dependencies = [ "jobserver", ] @@ -954,22 +973,22 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", "trybuild", ] [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", "num-integer", "num-traits", "serde", - "time 0.1.44", + "time 0.1.45", "wasm-bindgen", "winapi 0.3.9", ] @@ -1055,7 +1074,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1129,15 +1148,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "cmake" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -1163,11 +1173,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" dependencies = [ - "cache-padded", + "crossbeam-utils 0.8.14", ] [[package]] @@ -1210,17 +1220,11 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" [[package]] name = "convert_case" @@ -1281,7 +1285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.12", + "crossbeam-utils 0.8.14", ] [[package]] @@ -1292,19 +1296,19 @@ checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils 0.8.12", + "crossbeam-utils 0.8.14", ] [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", - "crossbeam-utils 0.8.12", - "memoffset", + "crossbeam-utils 0.8.14", + "memoffset 0.7.1", "scopeguard", ] @@ -1321,9 +1325,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if 1.0.0", ] @@ -1379,9 +1383,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" +checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" dependencies = [ "cc", "cxxbridge-flags", @@ -1391,9 +1395,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" +checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" dependencies = [ "cc", "codespan-reporting", @@ -1401,24 +1405,24 @@ dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", "scratch", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] name = "cxxbridge-flags" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" +checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" [[package]] name = "cxxbridge-macro" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" +checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1434,9 +1438,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "der" @@ -1475,7 +1479,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1488,7 +1492,7 @@ dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", "rustc_version 0.4.0", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1522,9 +1526,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -1590,12 +1594,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "displaydoc" version = "0.2.3" @@ -1604,7 +1602,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1642,6 +1640,12 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +[[package]] +name = "eager" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" + [[package]] name = "ed25519" version = "1.5.2" @@ -1686,7 +1690,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1712,22 +1716,22 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" +checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" +checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1741,7 +1745,7 @@ dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", "rustc_version 0.4.0", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1753,7 +1757,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1773,7 +1777,7 @@ checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1844,15 +1848,15 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" dependencies = [ - "memoffset", + "memoffset 0.6.5", "rustc_version 0.3.3", ] [[package]] name = "filetime" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" +checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1896,7 +1900,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -1927,9 +1931,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "miniz_oxide", @@ -2056,7 +2060,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -2149,8 +2153,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2174,9 +2180,9 @@ dependencies = [ [[package]] name = "goauth" -version = "0.11.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f3d68c8343245dc047982651b5afb8bd659c9959ed72efe5a73bf22684e5fd" +checksum = "f8af59a261bcf42f45d1b261232847b9b850ba0a1419d6100698246fb66e9240" dependencies = [ "arc-swap", "futures 0.3.25", @@ -2187,15 +2193,15 @@ dependencies = [ "serde_json", "simpl", "smpl_jwt", - "time 0.3.15", + "time 0.3.17", "tokio", ] [[package]] name = "goblin" -version = "0.4.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926" +checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" dependencies = [ "log 0.4.17", "plain", @@ -2208,7 +2214,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "fnv", "futures-core", "futures-sink", @@ -2229,9 +2235,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hash32" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" dependencies = [ "byteorder", ] @@ -2262,12 +2268,12 @@ checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", "bitflags", - "bytes 1.2.1", + "bytes 1.3.0", "headers-core", "http", "httpdate", "mime 0.3.16", - "sha1 0.10.5", + "sha1", ] [[package]] @@ -2325,7 +2331,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -2345,7 +2351,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "fnv", "itoa", ] @@ -2356,7 +2362,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "http", "pin-project-lite", ] @@ -2397,7 +2403,7 @@ dependencies = [ "log 0.3.9", "mime 0.2.6", "num_cpus", - "time 0.1.44", + "time 0.1.45", "traitobject", "typeable", "unicase 1.4.2", @@ -2410,7 +2416,7 @@ version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "futures-channel", "futures-core", "futures-util", @@ -2434,7 +2440,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "futures 0.3.25", "headers", "http", @@ -2448,9 +2454,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper 0.14.23", @@ -2477,7 +2483,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "hyper 0.14.23", "native-tls", "tokio", @@ -2559,9 +2565,9 @@ checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce" [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg 1.1.0", "hashbrown 0.12.3", @@ -2609,9 +2615,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" +checksum = "ec947b7a4ce12e3b87e353abae7ce124d025b6c7d6c5aea5cc0bcf92e9510ded" [[package]] name = "itertools" @@ -2742,7 +2748,7 @@ dependencies = [ "proc-macro-crate 0.1.5", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -2796,7 +2802,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "futures 0.3.25", "globset", "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2810,9 +2816,12 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "keeper" @@ -2869,9 +2878,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libloading" @@ -2891,9 +2900,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "librocksdb-sys" -version = "0.6.1+6.28.2" +version = "0.8.0+7.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" +checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d" dependencies = [ "bindgen", "bzip2-sys", @@ -2990,7 +2999,7 @@ dependencies = [ "async-trait", "bs58 0.3.1", "bytemuck", - "bytes 1.2.1", + "bytes 1.3.0", "checked_math", "clap 3.2.23", "client", @@ -3124,7 +3133,6 @@ dependencies = [ "spl-token", "static_assertions", "switchboard-program", - "switchboard-utils", "switchboard-v2", ] @@ -3136,9 +3144,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "matchit" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "maybe-uninit" @@ -3170,6 +3178,15 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg 1.1.0", +] + [[package]] name = "merlin" version = "3.0.0" @@ -3225,9 +3242,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -3303,7 +3320,7 @@ checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -3375,15 +3392,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", - "cc", "cfg-if 1.0.0", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] @@ -3482,7 +3498,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -3567,16 +3583,7 @@ dependencies = [ "proc-macro-crate 1.2.1", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", + "syn 1.0.105", ] [[package]] @@ -3614,9 +3621,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.42" +version = "0.10.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -3635,7 +3642,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -3655,9 +3662,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.77" +version = "0.9.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" dependencies = [ "autocfg 1.1.0", "cc", @@ -3669,13 +3676,15 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" dependencies = [ "async-trait", "crossbeam-channel", - "futures 0.3.25", + "futures-channel", + "futures-executor", + "futures-util", "js-sys", "lazy_static", "percent-encoding 2.2.0", @@ -3686,32 +3695,31 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.4.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" [[package]] name = "ouroboros" -version = "0.14.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71643f290d126e18ac2598876d01e1d57aed164afc78fdb6e2a0c6589a1f6662" +checksum = "dfbb50b356159620db6ac971c6d5c9ab788c9cc38a6f49619fca2a27acb062ca" dependencies = [ "aliasable", "ouroboros_macro", - "stable_deref_trait", ] [[package]] name = "ouroboros_macro" -version = "0.14.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9a247206016d424fe8497bc611e510887af5c261fbbf977877c4bb55ca4d82" +checksum = "4a0d9d1a6191c4f391f87219d1ea42b23f09ee84d64763cd05ee6ea88d9f384d" dependencies = [ "Inflector", "proc-macro-error", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -3743,7 +3751,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api 0.4.9", - "parking_lot_core 0.9.4", + "parking_lot_core 0.9.5", ] [[package]] @@ -3777,9 +3785,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" dependencies = [ "cfg-if 1.0.0", "libc", @@ -3811,11 +3819,11 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -3856,9 +3864,9 @@ dependencies = [ [[package]] name = "pest" -version = "2.4.1" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8" +checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" dependencies = [ "thiserror", "ucd-trie", @@ -3891,7 +3899,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -3963,7 +3971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" dependencies = [ "proc-macro2 1.0.47", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -3995,7 +4003,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", "version_check 0.9.4", ] @@ -4010,12 +4018,6 @@ dependencies = [ "version_check 0.9.4", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "0.4.30" @@ -4042,66 +4044,95 @@ checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", "version_check 0.9.4", "yansi", ] [[package]] name = "prost" -version = "0.10.4" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "prost-derive", ] [[package]] name = "prost-build" -version = "0.10.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94" dependencies = [ - "bytes 1.2.1", - "cfg-if 1.0.0", - "cmake", + "bytes 1.3.0", "heck 0.4.0", "itertools 0.10.5", "lazy_static", "log 0.4.17", "multimap", "petgraph", + "prettyplease", "prost", "prost-types", "regex", + "syn 1.0.105", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" dependencies = [ "anyhow", "itertools 0.10.5", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] name = "prost-types" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "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]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2 1.0.47", + "quote 1.0.21", + "syn 1.0.105", +] + [[package]] name = "pyth-sdk" version = "0.1.0" @@ -4155,7 +4186,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "futures-channel", "futures-util", "fxhash", @@ -4174,7 +4205,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "fxhash", "rand 0.8.5", "ring", @@ -4190,9 +4221,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f832d8958db3e84d2ec93b5eb2272b45aa23cf7f8fe6e79f578896f4e6c231b" +checksum = "b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54" dependencies = [ "futures-util", "libc", @@ -4234,7 +4265,7 @@ dependencies = [ "rand_isaac", "rand_jitter", "rand_os", - "rand_pcg 0.1.2", + "rand_pcg", "rand_xorshift", "winapi 0.3.9", ] @@ -4250,7 +4281,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", - "rand_pcg 0.2.1", ] [[package]] @@ -4389,15 +4419,6 @@ dependencies = [ "rand_core 0.4.2", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_xorshift" version = "0.1.1" @@ -4418,25 +4439,23 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "autocfg 1.1.0", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", - "crossbeam-utils 0.8.12", + "crossbeam-utils 0.8.14", "num_cpus", ] @@ -4448,7 +4467,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", "ring", - "time 0.3.15", + "time 0.3.17", "yasna", ] @@ -4489,13 +4508,14 @@ dependencies = [ [[package]] name = "reed-solomon-erasure" -version = "5.0.3" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2fe31452b684b8b33f65f8730c8b8812c3f5a0bb8a096934717edb1ac488641" +checksum = "7263373d500d4d4f505d43a2a662d475a894aa94503a1ee28e9188b5f3960d4f" dependencies = [ "cc", "libc", "libm", + "lru", "parking_lot 0.11.2", "smallvec 1.10.0", "spin 0.9.4", @@ -4528,14 +4548,23 @@ dependencies = [ ] [[package]] -name = "reqwest" -version = "0.11.12" +name = "rend" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +checksum = "79af64b4b6362ffba04eef3a4e10829718a4896dac19daa741851c86781edf95" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ "async-compression", "base64 0.13.1", - "bytes 1.2.1", + "bytes 1.3.0", "encoding_rs", "futures-core", "futures-util", @@ -4588,10 +4617,35 @@ dependencies = [ ] [[package]] -name = "rocksdb" -version = "0.18.0" +name = "rkyv" +version = "0.7.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" +checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15" +dependencies = [ + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4" +dependencies = [ + "proc-macro2 1.0.47", + "quote 1.0.21", + "syn 1.0.105", +] + +[[package]] +name = "rocksdb" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" dependencies = [ "libc", "librocksdb-sys", @@ -4611,20 +4665,27 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.26.1" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee9164faf726e4f3ece4978b25ca877ddc6802fa77f38cdccb32c7f805ecd70c" +checksum = "33c321ee4e17d2b7abe12b5d20c1231db708dd36185c8a21e9de5fed6da4dbe9" dependencies = [ "arrayvec", + "borsh", + "bytecheck", + "byteorder", + "bytes 1.3.0", "num-traits", + "rand 0.8.5", + "rkyv", "serde", + "serde_json", ] [[package]] name = "rust_decimal_macros" -version = "1.26.1" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4903d8db81d2321699ca8318035d6ff805c548868df435813968795a802171b2" +checksum = "5a7e2dba1342e9f1166786a4329ba0d6d6b8d9db7e81d702ec9ba3b39591ddff" dependencies = [ "quote 1.0.21", "rust_decimal", @@ -4784,7 +4845,7 @@ dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", "serde_derive_internals", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -4801,22 +4862,22 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" [[package]] name = "scroll" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" dependencies = [ "scroll_derive", ] [[package]] name = "scroll_derive" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" +checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -4829,6 +4890,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + [[package]] name = "security-framework" version = "2.7.0" @@ -4893,9 +4960,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.147" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" dependencies = [ "serde_derive", ] @@ -4911,13 +4978,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -4928,14 +4995,14 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "itoa", "ryu", @@ -5039,22 +5106,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", + "digest 0.10.6", ] [[package]] @@ -5065,15 +5123,9 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.9.9" @@ -5095,7 +5147,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -5116,42 +5168,42 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "keccak", ] [[package]] name = "shank" -version = "0.0.10" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90b0d7b8998cc311310854451e7f5903cf3a151ca93ef6aa2b8b6c369a037b21" +checksum = "b63e565b5e95ad88ab38f312e89444c749360641c509ef2de0093b49f55974a5" dependencies = [ "shank_macro", ] [[package]] name = "shank_macro" -version = "0.0.10" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a37d6cf5df84eb622cb6fc74071d5d773c6a23b9ec55691db7b6a8c2286926" +checksum = "63927d22a1e8b74bda98cc6e151fcdf178b7abb0dc6c4f81e0bbf5ffe2fc4ec8" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", "shank_macro_impl", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] name = "shank_macro_impl" -version = "0.0.10" +version = "0.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1314ff5d5a3dffd9b93de1463e2b6afc2350f17596d7d9b3fe0924c9edd250df" +checksum = "40ce03403df682f80f4dc1efafa87a4d0cb89b03726d0565e6364bdca5b9a441" dependencies = [ "anyhow", "proc-macro2 1.0.47", "quote 1.0.21", "serde", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -5235,9 +5287,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smpl_jwt" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4370044f8b20f944e05c35d77edd3518e6f21fc4de77e593919f287c6a3f428a" +checksum = "95b6ff8c21c74ce7744643a7cddbb02579a44f1f77e4316bff1ddb741aca8ac9" dependencies = [ "base64 0.13.1", "log 0.4.17", @@ -5246,7 +5298,7 @@ dependencies = [ "serde_derive", "serde_json", "simpl", - "time 0.2.27", + "time 0.3.17", ] [[package]] @@ -5266,7 +5318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64 0.13.1", - "bytes 1.2.1", + "bytes 1.3.0", "futures 0.3.25", "httparse", "log 0.4.17", @@ -5276,9 +5328,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8416433ac2eab50c11d761cc3ef72a4e09889305402d22fbf62919e435fd5d" +checksum = "8e319617cd926e48d3521849c38b1a9b282a37d87c74e7524d796f4fd64bb050" dependencies = [ "Inflector", "base64 0.13.1", @@ -5289,6 +5341,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", + "solana-address-lookup-table-program", "solana-config-program", "solana-sdk", "solana-vote-program", @@ -5300,9 +5353,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1932713c34b892ecbabdae35f9fcdfbbc5d15958805c8deaaef43003964b3f" +checksum = "df996750c5a514d36b8aa35f63661ae743c52a95960c9cec4600a45d181f46c7" dependencies = [ "bincode", "bytemuck", @@ -5321,9 +5374,9 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f461892b0a13b346a835fe894a3e277d16609c810a2688752f70081504951520" +checksum = "a03d21338c579b621b26cb3c8ef05a417d3852891cef46312cb4df00574b8371" dependencies = [ "borsh", "futures 0.3.25", @@ -5338,9 +5391,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53449984f6e61c8d0446a256c4e6391c7753494ce5b08d91f6d3f409f991b38b" +checksum = "a1b83bf0d8b1cac6f7f82d872f660e5b1a54c1c8698d4706972237391fc7eff2" dependencies = [ "serde", "solana-sdk", @@ -5349,9 +5402,9 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f371d20fe39eb0817c323d814957fbe171d615050294ef042358c6219701e72" +checksum = "1c6d523f852b125d700e797d6a9517adf36c867369311fef1cf6b343e2fa797e" dependencies = [ "bincode", "crossbeam-channel", @@ -5369,9 +5422,9 @@ dependencies = [ [[package]] name = "solana-bloom" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a1b19a224d8f67ad2e3c1b2dbeed341fc8db8dad334962c382dd384b7131bb" +checksum = "cbb00c4c9b32ac0ec7cb73f8d8aee2fb42b9f3c170b5721de60ba1c9544a56de" dependencies = [ "bv", "fnv", @@ -5388,9 +5441,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d693765f41655e9a2d4da90a1da4bbf7166192278dcbe1bbd8939fee635e8e13" +checksum = "197e44180b0b5fdba6814a03d8ee3692325b579465286389bc85f693f507b403" dependencies = [ "bincode", "byteorder", @@ -5407,9 +5460,9 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1394bd97f12b2eb4bc93446422a5a2da89875a14681044850b2514cdef75557b" +checksum = "8161bbbdaf7f0c21e2af497e436851c2a10ff17721ef1b6b53dc0b2a83883abe" dependencies = [ "log 0.4.17", "memmap2", @@ -5422,9 +5475,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1272c0d0fc98a05de725371ac5ba247439bb0d3e869a478f968fa77e3e04f9" +checksum = "9f01fb8496fdd7f6c5994182b55b7d3a29b94a0ff09ce25fe6e810743996914a" dependencies = [ "chrono", "clap 2.34.0", @@ -5440,9 +5493,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9501b259e00d0c25d1cf8487da063b5a306bacfc09cb1ff15061d2bc37edf9" +checksum = "3dc0c843ad3db6f791b8279aeae0d61f0151709d574edde56d17fa0f7f2230d5" dependencies = [ "dirs-next", "lazy_static", @@ -5456,16 +5509,16 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa3c4ff14a32c14a96f23cfae33b115fe16ee2e2dc2b308a95e39279393ee18" +checksum = "67dd2fd7ba13f301d953073463a479890f21d930819794d7a9e80ace61dc8904" dependencies = [ "async-mutex", "async-trait", "base64 0.13.1", "bincode", "bs58 0.4.0", - "bytes 1.2.1", + "bytes 1.3.0", "clap 2.34.0", "crossbeam-channel", "enum_dispatch", @@ -5477,7 +5530,6 @@ dependencies = [ "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static", "log 0.4.17", - "lru", "quinn", "quinn-proto", "rand 0.7.3", @@ -5511,9 +5563,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd952f23d3f8515fc201df27f68db04a93e6713e202bd9b748ae70522b414b42" +checksum = "6f2de1835ca9bb54d759f42bcbafe4db251bd211217c5f7d4d164ea21e6e9b14" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -5521,9 +5573,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda8c487468746228af00ec32a7412d27482989717d1251f5ef61c9d7934446e" +checksum = "3fdfe7c2946d9f552cd91fffb8a991eb40465f70586d5fb71f9a49dc0cd296f5" dependencies = [ "bincode", "chrono", @@ -5535,14 +5587,15 @@ dependencies = [ [[package]] name = "solana-entry" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2668141b51eb815676d0a54aac44ca6d45cbfae597c202047a6b0b4e5099fba1" +checksum = "9b856f8b351ba69de50d11f0c27b725abd6d4cbc51ccd9e142f848f18fd51639" dependencies = [ "bincode", "crossbeam-channel", "dlopen", "dlopen_derive", + "lazy_static", "log 0.4.17", "rand 0.7.3", "rayon", @@ -5557,9 +5610,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ee1be7340481fac7a1fe5ea85f53ee2360149278f59f8a8aec7a5709d6d3cc" +checksum = "ce450d5c9114569329f0e6900a53be424f77ba07ed932b5d57a3bfb55afefe41" dependencies = [ "bincode", "byteorder", @@ -5581,49 +5634,61 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d343b3838e95561548a2a651787d17aebf0a3f490f193746ee58f174f65bd7c3" +checksum = "a73da3a286cf0d1ab25d669c17a3c2b5fe1334f8262b9673cb22912d92a94b14" dependencies = [ + "ahash", + "blake3", + "block-buffer 0.9.0", "bs58 0.4.0", "bv", + "byteorder", + "cc", + "either", "generic-array 0.14.6", + "getrandom 0.1.16", + "hashbrown 0.12.3", "im", "lazy_static", "log 0.4.17", "memmap2", + "once_cell", + "rand_core 0.6.4", "rustc_version 0.4.0", "serde", "serde_bytes", "serde_derive", + "serde_json", "sha2 0.10.6", "solana-frozen-abi-macro", + "subtle", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37211ec8dff16b08fcb422807fa7f046bbc6417bc43e00a2f2effd8fafec6bc" +checksum = "c88a0446927b49aee9b40ec1c6a96be562a9de543a0c58483a8520f99f454f36" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", "rustc_version 0.4.0", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] name = "solana-gossip" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc84bc57ff4273975fc902ee6e1e4016835beb5a7ace8014655e86ec7d36fe6" +checksum = "d5f0834f5698c2d343364c7737ba204a9d2dae0363b161172f603dd59dc1e011" dependencies = [ "bincode", "bv", "clap 2.34.0", "crossbeam-channel", - "flate2 1.0.24", + "flate2 1.0.25", "indexmap", "itertools 0.10.5", "log 0.4.17", @@ -5660,16 +5725,18 @@ dependencies = [ [[package]] name = "solana-ledger" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4aedc20bac639268430562185a9cfffaecb0207344ca042099b53b2b0e3f4cc" +checksum = "9965a8d801c1e69f8ad6220391691158f9dda0f969a14f84503deef7a96a7144" dependencies = [ + "assert_matches", "bincode", "bitflags", "byteorder", "chrono", "chrono-humanize", "crossbeam-channel", + "dashmap", "fs_extra", "futures 0.3.25", "itertools 0.10.5", @@ -5701,12 +5768,14 @@ dependencies = [ "solana-rayon-threadlimit", "solana-runtime", "solana-sdk", + "solana-stake-program", "solana-storage-bigtable", "solana-storage-proto", "solana-transaction-status", "solana-vote-program", "spl-token", "spl-token-2022", + "static_assertions", "tempfile", "thiserror", "tokio", @@ -5716,9 +5785,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7201d64123c46afa4246194c7bdd3530b78b78ee47b9c71716ee0527c6534df2" +checksum = "48ec3aec81a83a876c68b6225d7eaf465b97e2d88ff33b2426e77ba08eded7ce" dependencies = [ "env_logger 0.9.3", "lazy_static", @@ -5727,9 +5796,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588094b3ef6e1093387c90f00419a302bba405458dae0849251262451442d134" +checksum = "cecc0ddf9b0db68e2e92664b6e0432acf9d1739b3a6bc76a466c910d88d0ba98" dependencies = [ "log 0.4.17", "solana-sdk", @@ -5737,9 +5806,9 @@ dependencies = [ [[package]] name = "solana-merkle-tree" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb8cc5c16fbb72f8b912fead241ec8a83f3c6c4790d4d809264e1b6a3bf76e1" +checksum = "65d285004a0724449e3e93892eb38dd8f58c397971058ab82ad169545bcaa4da" dependencies = [ "fast-math", "matches", @@ -5748,9 +5817,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a996efd3f4fe1096db470d1c0c74b1647e835d41dcc404950961959fcab78c" +checksum = "684c01d65b3b5a546afaff2fd83e9117d0842a1e805a47acba26b461a8b26a4b" dependencies = [ "crossbeam-channel", "gethostname", @@ -5762,12 +5831,12 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d2f56778b731dc58f3b6b8e6c837575e22f2a7efdbfd792008b4b1d258e7db" +checksum = "dc95e2746f871dc2fa7e115a05158148b1522e9c1c99f3e7e3cc02f68dad8a19" dependencies = [ "bincode", - "clap 2.34.0", + "clap 3.2.23", "crossbeam-channel", "log 0.4.17", "nix", @@ -5784,9 +5853,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e8d7de557b7ba59c8cd4cb2d46b0202a7afb477d648cd1cc71f4f329d85076" +checksum = "94c36a9572ac81be290f006a09aa53d14ce5fb8634345e7bc4fc3c89c0596bfe" dependencies = [ "ahash", "bincode", @@ -5811,9 +5880,9 @@ dependencies = [ [[package]] name = "solana-poh" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996bbc4bd8ada27b6abe39db5795ba09110e969058c44f2f326931fa94fe39a6" +checksum = "abbb5548f0c4ada36f76e54da817b279682a074fadecdd6012d1624293072ce9" dependencies = [ "core_affinity", "crossbeam-channel", @@ -5830,9 +5899,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9622af117fe254208f1fe99a533ea523624d64745d6cffecd986da6753662ef" +checksum = "927d3d7e49093e601811a89ede4a9698059fb819871b3eba88a6cb0c964040fe" dependencies = [ "base64 0.13.1", "bincode", @@ -5843,41 +5912,49 @@ dependencies = [ "bs58 0.4.0", "bv", "bytemuck", + "cc", "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.1.16", + "getrandom 0.2.8", "itertools 0.10.5", "js-sys", "lazy_static", + "libc", "libsecp256k1", "log 0.4.17", + "memoffset 0.6.5", "num-derive", "num-traits", "parking_lot 0.12.1", "rand 0.7.3", + "rand_chacha 0.2.2", "rustc_version 0.4.0", "rustversion", "serde", "serde_bytes", "serde_derive", + "serde_json", "sha2 0.10.6", "sha3 0.10.6", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro", "thiserror", + "tiny-bip39", "wasm-bindgen", + "zeroize", ] [[package]] name = "solana-program-runtime" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f35372d7d9f77e125ef233df20575bf75dd27198e8b15cc1662d8b3eea5b59" +checksum = "7ddadda3f8b3944188ca93988033cbe5decf569271b5fcc0cd9338282115a47d" dependencies = [ "base64 0.13.1", "bincode", + "eager", "enum-iterator", "itertools 0.10.5", "libc", @@ -5885,21 +5962,24 @@ dependencies = [ "log 0.4.17", "num-derive", "num-traits", + "rand 0.7.3", "rustc_version 0.4.0", "serde", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-measure", + "solana-metrics", "solana-sdk", "thiserror", ] [[package]] name = "solana-program-test" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd78d8e6d2ac8a63f1d110f5d26121c6eeeafa7983235fc4be061fe64059c1e" +checksum = "417a2ce701c6c65593a1ae4d654998a7aef9ab69abc7087dc2b999d42eff14da" dependencies = [ + "assert_matches", "async-trait", "base64 0.13.1", "bincode", @@ -5920,9 +6000,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc2877dde7888007d1fb5cc16e8bb9f5b5220d0de4f66cc406a16cd43731022" +checksum = "8bd7d70fdf385e1b67d8d43a7d2c5db60e0dc667de4cfee1471cead6563e6878" dependencies = [ "lazy_static", "num_cpus", @@ -5930,9 +6010,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f0dd9d31dcbb27f63015e187d1d73ab924fda44e17d6711fb82cdb613173d0" +checksum = "3b5ebbd2a1790e6cd1b594027bdb75da17b410958773fc0f521ff3ee20791dfa" dependencies = [ "console", "dialoguer", @@ -5949,9 +6029,9 @@ dependencies = [ [[package]] name = "solana-rpc" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f18f6fbcc775d4b113320e631101aa2831e341eb923cec21ccf0a1000dfc68f3" +checksum = "869c584a2d04193f3a9bfc2a3117a2123a3a5f6a9f3eb510736279e0bdefaea9" dependencies = [ "base64 0.13.1", "bincode", @@ -5986,6 +6066,7 @@ dependencies = [ "solana-runtime", "solana-sdk", "solana-send-transaction-service", + "solana-stake-program", "solana-storage-bigtable", "solana-streamer", "solana-transaction-status", @@ -6001,9 +6082,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25c09cc9cd9dc2fe67198de16a047571c7e97bf7d58e3d9725ebe8587f3bdcc" +checksum = "a9bc515c9119a108e67aacb4b8241bddf5fdcaea9a404cfdca75b69418d9be04" dependencies = [ "arrayref", "bincode", @@ -6015,7 +6096,7 @@ dependencies = [ "crossbeam-channel", "dashmap", "dir-diff", - "flate2 1.0.24", + "flate2 1.0.25", "fnv", "im", "index_list", @@ -6027,6 +6108,7 @@ dependencies = [ "num-derive", "num-traits", "num_cpus", + "once_cell", "ouroboros", "rand 0.7.3", "rayon", @@ -6060,9 +6142,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9efdeb6e4c4d3f8a93876a1d60d0734ad8c43ced6033b33e78771129bbbcc6a" +checksum = "6c925686af7b3235245997acdac126e53c78bab8b924b11434ca5ec45259114d" dependencies = [ "assert_matches", "base64 0.13.1", @@ -6074,7 +6156,7 @@ dependencies = [ "byteorder", "chrono", "derivation-path", - "digest 0.10.5", + "digest 0.10.6", "ed25519-dalek", "ed25519-dalek-bip32", "generic-array 0.14.6", @@ -6087,7 +6169,7 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "pbkdf2 0.10.1", + "pbkdf2 0.11.0", "qstring", "rand 0.7.3", "rand_chacha 0.2.2", @@ -6111,22 +6193,22 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d036e3a52e5570114ec9ab56a1d0a6659e1ebd1c948605318b4e35eafca4515" +checksum = "f511aecadeab3ebc0db10e78d9e7b571dffe1744c0003d6602f537581c3448cf" dependencies = [ "bs58 0.4.0", "proc-macro2 1.0.47", "quote 1.0.21", "rustversion", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] name = "solana-send-transaction-service" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c90c2d1720133c53e78ebc93002f0186edc38eddb77ae0a8a2e9f00bcd4d10e" +checksum = "c4caef6a83ebb24b78b19f5a894d6ab10c196322217ccceeec5d4fd2b594b36d" dependencies = [ "crossbeam-channel", "log 0.4.17", @@ -6139,9 +6221,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1569e462e0ab02fdd1c817f5791204981098be8b43185d3d05463a52148bce1" +checksum = "2c794a81a68d12192fc08064431b32a0bc9976c7df67c6921fda99604d7bea6e" dependencies = [ "bincode", "log 0.4.17", @@ -6162,16 +6244,16 @@ dependencies = [ [[package]] name = "solana-storage-bigtable" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b86f95be39366c7c40f60773614d7e092bc66ea4e5c98d8a95836e4dc86ee8" +checksum = "054a84a2304588bc15d0765ac86d20ee38b5a866e05d76cdfd6d6a95cbc62372" dependencies = [ "backoff", "bincode", - "bytes 1.2.1", + "bytes 1.3.0", "bzip2", "enum-iterator", - "flate2 1.0.24", + "flate2 1.0.25", "futures 0.3.25", "goauth", "http", @@ -6196,13 +6278,14 @@ dependencies = [ [[package]] name = "solana-storage-proto" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89397f1edb89a04ff64a3ae26bd8cfceb5bf4cf69eb487d773b16f99926b1191" +checksum = "3d51ddec84ea16dde3ebaa64dc8920ac3bc7647c34ca2b25bc53a38bad39ca6c" dependencies = [ "bincode", "bs58 0.4.0", "prost", + "protobuf-src", "serde", "solana-account-decoder", "solana-sdk", @@ -6212,9 +6295,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f06826cdee022890a0912b9ae5ee4035f0e823734c57f9a3e5af954f2483cc82" +checksum = "971e56ca8c6bcd2f36992dd04b6bf65f0786bba55e458bdaa42ddc9c948f39dd" dependencies = [ "crossbeam-channel", "futures-util", @@ -6241,9 +6324,9 @@ dependencies = [ [[package]] name = "solana-sys-tuner" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce00f67176e524edb1451ea781e77f67c0e6f17ab458bd9c1b286d8a75e47f06" +checksum = "375a4cbf29903cfd0a8e7c9393424937655780e583dc14dcb1ac7ace536f706a" dependencies = [ "clap 2.34.0", "libc", @@ -6258,9 +6341,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f82fd9089023371aa3bf18d6e5340693ef221bf459405245f6b37da6114cf4b" +checksum = "58138ee0d2c3f0b3be7e7d8a5bfafdd3fafe66e108b8934169b8b7ecfe8ac60e" dependencies = [ "Inflector", "base64 0.13.1", @@ -6273,6 +6356,7 @@ dependencies = [ "serde_derive", "serde_json", "solana-account-decoder", + "solana-address-lookup-table-program", "solana-measure", "solana-metrics", "solana-sdk", @@ -6286,9 +6370,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "089731f373da9e65517571221369fe50067653c89cda54153b53785f51dc930f" +checksum = "d976c2590fb565b2e07ff3659deb94774f3a7edf90ddcaa62078164740b8fee5" dependencies = [ "log 0.4.17", "rustc_version 0.4.0", @@ -6302,9 +6386,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b83f5ae0ab7c1065424ae30141543c038df61998fc74581aedf1373fcdb41e10" +checksum = "ffc47706ca644433d7681f3fe3e0b30094260065ae86a53ae4f92078a7cd4bf4" dependencies = [ "bincode", "log 0.4.17", @@ -6323,9 +6407,9 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff96963c9415267cd1d2d316cb82a04d5222213cb67422e3eb3111f2a4a660f" +checksum = "d7704396dcd9338e6ac72137908ad5781edd023767d6e6d6b0a68938b8d86fb5" dependencies = [ "bytemuck", "getrandom 0.1.16", @@ -6338,9 +6422,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.10.41" +version = "1.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4359c3382a88fb175d4213cea4a846889edb3cda237714c70516306d058dad" +checksum = "facf969af237320649c2ea99be5f75e98cba9b6e3217d9ddc5cbf3497c0282f9" dependencies = [ "aes-gcm-siv", "arrayref", @@ -6351,6 +6435,7 @@ dependencies = [ "cipher 0.4.3", "curve25519-dalek", "getrandom 0.1.16", + "itertools 0.10.5", "lazy_static", "merlin", "num-derive", @@ -6368,9 +6453,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.2.24" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e138f6d6d4eb6a65f8e9f01ca620bc9907d79648d5038a69dd3f07b6ed3f1f" +checksum = "80a28c5dfe7e8af38daa39d6561c8e8b9ed7a2f900951ebe7362ad6348d36c73" dependencies = [ "byteorder", "combine", @@ -6378,11 +6463,10 @@ dependencies = [ "hash32", "libc", "log 0.4.17", - "rand 0.7.3", + "rand 0.8.5", "rustc-demangle", "scroll", "thiserror", - "time 0.1.44", ] [[package]] @@ -6409,9 +6493,9 @@ dependencies = [ [[package]] name = "spl-associated-token-account" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a33ecc83137583902c3e13c02f34151c8b2f2b74120f9c2b3ff841953e083d" +checksum = "fbc000f0fdf1f12f99d77d398137c1751345b18c88258ce0f99b7872cf6c9bd6" dependencies = [ "assert_matches", "borsh", @@ -6449,9 +6533,9 @@ dependencies = [ [[package]] name = "spl-token-2022" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a97cbf60b91b610c846ccf8eecca96d92a24a19ffbf9fe06cd0c84e76ec45e" +checksum = "0edb869dbe159b018f17fb9bfa67118c30f232d7f54a73742bc96794dff77ed8" dependencies = [ "arrayref", "bytemuck", @@ -6465,76 +6549,12 @@ dependencies = [ "thiserror", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check 0.9.4", -] - [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2 1.0.47", - "quote 1.0.21", - "serde", - "serde_derive", - "syn 1.0.103", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2 1.0.47", - "quote 1.0.21", - "serde", - "serde_derive", - "serde_json", - "sha1 0.6.1", - "syn 1.0.103", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "stream-cancel" version = "0.8.1" @@ -6577,7 +6597,7 @@ dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", "rustversion", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -6639,9 +6659,7 @@ dependencies = [ [[package]] name = "switchboard-v2" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be74fbee74b06e26fdb20168157d8d96a680f2101051d191182d7a7d8e2382a" +version = "0.1.17" dependencies = [ "anchor-lang", "anchor-spl", @@ -6671,9 +6689,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", @@ -6694,7 +6712,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", "unicode-xid 0.2.4", ] @@ -6724,9 +6742,9 @@ dependencies = [ [[package]] name = "tarpc" -version = "0.27.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85d0a9369a919ba0db919b142a2b704cd207dfc676f7a43c2d105d0bc225487" +checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80" dependencies = [ "anyhow", "fnv", @@ -6754,7 +6772,7 @@ checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -6822,7 +6840,7 @@ checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -6836,9 +6854,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -6847,58 +6865,29 @@ dependencies = [ [[package]] name = "time" -version = "0.2.27" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check 0.9.4", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ "itoa", - "libc", - "num_threads", - "time-macros 0.2.4", + "serde", + "time-core", + "time-macros", ] [[package]] -name = "time-macros" -version = "0.1.1" +name = "time-core" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.47", - "quote 1.0.21", - "standback", - "syn 1.0.103", + "time-core", ] [[package]] @@ -6942,7 +6931,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d0183f6f6001549ab68f8c7585093bb732beefbcf6d23a10b9b95c73a1dd49" dependencies = [ "autocfg 1.1.0", - "bytes 1.2.1", + "bytes 1.3.0", "libc", "memchr", "mio 0.7.14", @@ -6999,13 +6988,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -7055,7 +7044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" dependencies = [ "bincode", - "bytes 1.2.1", + "bytes 1.3.0", "educe", "futures-core", "futures-sink", @@ -7144,7 +7133,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "futures-core", "futures-io", "futures-sink", @@ -7160,7 +7149,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" dependencies = [ - "bytes 1.2.1", + "bytes 1.3.0", "futures-core", "futures-sink", "pin-project-lite", @@ -7179,15 +7168,15 @@ dependencies = [ [[package]] name = "tonic" -version = "0.7.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be9d60db39854b30b835107500cf0aca0b0d14d6e1c3de124217c23a29c2ddb" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream 0.3.3", "async-trait", "axum", "base64 0.13.1", - "bytes 1.2.1", + "bytes 1.3.0", "futures-core", "futures-util", "h2", @@ -7213,15 +7202,15 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.7.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9263bf4c9bfaae7317c1c2faf7f18491d2fe476f70c414b73bf5d445b00ffa1" +checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" dependencies = [ "prettyplease", "proc-macro2 1.0.47", "prost-build", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -7246,12 +7235,12 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ "bitflags", - "bytes 1.2.1", + "bytes 1.3.0", "futures-core", "futures-util", "http", @@ -7296,7 +7285,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", ] [[package]] @@ -7321,10 +7310,11 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.15.0" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599f388ecb26b28d9c1b2e4437ae019a7b336018b45ed911458cd9ebf91129f6" +checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" dependencies = [ + "once_cell", "opentelemetry", "tracing", "tracing-core", @@ -7333,9 +7323,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.25" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ "sharded-slab", "thread_local", @@ -7362,9 +7352,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea496675d71016e9bc76aa42d87f16aefd95447cc5818e671e12b2d7e269075d" +checksum = "db29f438342820400f2d9acfec0d363e987a38b2950bdb50a7069ed17b2148ee" dependencies = [ "glob", "once_cell", @@ -7383,7 +7373,7 @@ checksum = "6ad3713a14ae247f22a728a0456a545df14acf3867f905adff84be99e23b3ad1" dependencies = [ "base64 0.13.1", "byteorder", - "bytes 1.2.1", + "bytes 1.3.0", "http", "httparse", "log 0.4.17", @@ -7402,13 +7392,13 @@ checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ "base64 0.13.1", "byteorder", - "bytes 1.2.1", + "bytes 1.3.0", "http", "httparse", "log 0.4.17", "rand 0.8.5", "rustls", - "sha-1 0.10.0", + "sha-1 0.10.1", "thiserror", "url 2.3.1", "utf-8", @@ -7424,9 +7414,9 @@ checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" @@ -7684,7 +7674,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", "wasm-bindgen-shared", ] @@ -7718,7 +7708,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7751,9 +7741,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -7997,7 +7987,7 @@ dependencies = [ "oid-registry", "rusticata-macros", "thiserror", - "time 0.3.15", + "time 0.3.17", ] [[package]] @@ -8030,7 +8020,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" dependencies = [ - "time 0.3.15", + "time 0.3.17", ] [[package]] @@ -8044,13 +8034,13 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.103", + "syn 1.0.105", "synstructure", ] @@ -8075,9 +8065,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.4+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 3926ccbaa..d48934502 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,8 @@ members = [ [patch.crates-io] # for gzip encoded responses jsonrpc-core-client = { git = "https://github.com/ckamm/jsonrpc.git", branch = "ckamm/http-with-gzip" } -# these patch anchor to use solana 1.10.35 in order to fix dependency conflicts in switchboard-v2 +# these patch anchor to use solana 1.14.9 in order to fix dependency conflicts in switchboard-v2 # downstream applications may need to copy these patches to their own workspace anchor-spl = { path = "./anchor/spl/" } anchor-lang = { path = "./anchor/lang/" } +switchboard-v2 = { path = "./switchboard-v2/rust/switchboard-v2/" } diff --git a/anchor b/anchor index 3f8373770..309c2c2f4 160000 --- a/anchor +++ b/anchor @@ -1 +1 @@ -Subproject commit 3f8373770c51e105730b0bfd65208d3ba704c9ec +Subproject commit 309c2c2f4cce7c0a13d307fab3c7e2985bff3fa5 diff --git a/cli/Cargo.toml b/cli/Cargo.toml index cd5f246c7..7fb316b69 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -21,6 +21,6 @@ log = "0.4.0" mango-v4 = { path = "../programs/mango-v4", features = ["no-entrypoint", "client"] } pyth-sdk-solana = "0.1.0" serum_dex = { version = "0.5.6", git = "https://github.com/blockworks-foundation/serum-dex.git", default-features=false,features = ["no-entrypoint", "program"], branch = "ckamm/find_by_key" } -solana-client = "~1.10.35" -solana-sdk = "~1.10.35" +solana-client = "~1.14.9" +solana-sdk = "~1.14.9" tokio = { version = "1.14.1", features = ["rt-multi-thread", "time", "macros", "sync"] } diff --git a/client/Cargo.toml b/client/Cargo.toml index 8a4203174..901913398 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -18,9 +18,9 @@ mango-v4 = { path = "../programs/mango-v4", features = ["no-entrypoint", "client pyth-sdk-solana = "0.1.0" serum_dex = { version = "0.5.6", git = "https://github.com/blockworks-foundation/serum-dex.git", default-features=false,features = ["no-entrypoint", "program"], branch = "ckamm/find_by_key" } shellexpand = "2.1.0" -solana-account-decoder = "~1.10.35" -solana-client = "~1.10.35" -solana-sdk = "~1.10.35" +solana-account-decoder = "~1.14.9" +solana-client = "~1.14.9" +solana-sdk = "~1.14.9" spl-associated-token-account = "1.0.3" thiserror = "1.0.31" log = "0.4" diff --git a/client/src/account_fetcher.rs b/client/src/account_fetcher.rs index 7061cda79..a63d203cd 100644 --- a/client/src/account_fetcher.rs +++ b/client/src/account_fetcher.rs @@ -65,15 +65,12 @@ impl AccountFetcher for RpcAccountFetcher { ) -> anyhow::Result> { use solana_account_decoder::UiAccountEncoding; use solana_client::rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig}; - use solana_client::rpc_filter::{ - Memcmp, MemcmpEncodedBytes, MemcmpEncoding, RpcFilterType, - }; + use solana_client::rpc_filter::{Memcmp, RpcFilterType}; let config = RpcProgramAccountsConfig { - filters: Some(vec![RpcFilterType::Memcmp(Memcmp { - offset: 0, - bytes: MemcmpEncodedBytes::Bytes(discriminator.to_vec()), - encoding: Some(MemcmpEncoding::Binary), - })]), + filters: Some(vec![RpcFilterType::Memcmp(Memcmp::new_raw_bytes( + 0, + discriminator.to_vec(), + ))]), account_config: RpcAccountInfoConfig { encoding: Some(UiAccountEncoding::Base64), commitment: Some(self.rpc.commitment()), diff --git a/client/src/gpa.rs b/client/src/gpa.rs index 5acc5b4b9..5e836ac24 100644 --- a/client/src/gpa.rs +++ b/client/src/gpa.rs @@ -5,7 +5,7 @@ use mango_v4::state::{Bank, MangoAccount, MangoAccountValue, MintInfo, PerpMarke use solana_account_decoder::UiAccountEncoding; use solana_client::rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig}; -use solana_client::rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType}; +use solana_client::rpc_filter::{Memcmp, RpcFilterType}; use solana_sdk::pubkey::Pubkey; pub fn fetch_mango_accounts( @@ -15,21 +15,12 @@ pub fn fetch_mango_accounts( ) -> Result, ClientError> { let config = RpcProgramAccountsConfig { filters: Some(vec![ - RpcFilterType::Memcmp(Memcmp { - offset: 0, - bytes: MemcmpEncodedBytes::Bytes(MangoAccount::discriminator().to_vec()), - encoding: None, - }), - RpcFilterType::Memcmp(Memcmp { - offset: 8, - bytes: MemcmpEncodedBytes::Base58(group.to_string()), - encoding: None, - }), - RpcFilterType::Memcmp(Memcmp { - offset: 40, - bytes: MemcmpEncodedBytes::Base58(owner.to_string()), - encoding: None, - }), + RpcFilterType::Memcmp(Memcmp::new_base58_encoded( + 0, + &MangoAccount::discriminator(), + )), + RpcFilterType::Memcmp(Memcmp::new_base58_encoded(8, &group.to_bytes())), + RpcFilterType::Memcmp(Memcmp::new_base58_encoded(40, &owner.to_bytes())), ]), account_config: RpcAccountInfoConfig { encoding: Some(UiAccountEncoding::Base64), @@ -46,42 +37,38 @@ pub fn fetch_mango_accounts( } pub fn fetch_banks(program: &Program, group: Pubkey) -> Result, ClientError> { - program.accounts::(vec![RpcFilterType::Memcmp(Memcmp { - offset: 8, - bytes: MemcmpEncodedBytes::Base58(group.to_string()), - encoding: None, - })]) + program.accounts::(vec![RpcFilterType::Memcmp(Memcmp::new_base58_encoded( + 8, + &group.to_bytes(), + ))]) } pub fn fetch_mint_infos( program: &Program, group: Pubkey, ) -> Result, ClientError> { - program.accounts::(vec![RpcFilterType::Memcmp(Memcmp { - offset: 8, - bytes: MemcmpEncodedBytes::Base58(group.to_string()), - encoding: None, - })]) + program.accounts::(vec![RpcFilterType::Memcmp(Memcmp::new_base58_encoded( + 8, + &group.to_bytes(), + ))]) } pub fn fetch_serum3_markets( program: &Program, group: Pubkey, ) -> Result, ClientError> { - program.accounts::(vec![RpcFilterType::Memcmp(Memcmp { - offset: 8, - bytes: MemcmpEncodedBytes::Base58(group.to_string()), - encoding: None, - })]) + program.accounts::(vec![RpcFilterType::Memcmp(Memcmp::new_base58_encoded( + 8, + &group.to_bytes(), + ))]) } pub fn fetch_perp_markets( program: &Program, group: Pubkey, ) -> Result, ClientError> { - program.accounts::(vec![RpcFilterType::Memcmp(Memcmp { - offset: 8, - bytes: MemcmpEncodedBytes::Base58(group.to_string()), - encoding: None, - })]) + program.accounts::(vec![RpcFilterType::Memcmp(Memcmp::new_base58_encoded( + 8, + &group.to_bytes(), + ))]) } diff --git a/keeper/Cargo.toml b/keeper/Cargo.toml index e38b5febe..8f78b2a3c 100644 --- a/keeper/Cargo.toml +++ b/keeper/Cargo.toml @@ -22,6 +22,6 @@ log = "0.4.0" mango-v4 = { path = "../programs/mango-v4", features = ["no-entrypoint", "client"] } pyth-sdk-solana = "0.1.0" serum_dex = { version = "0.5.6", git = "https://github.com/blockworks-foundation/serum-dex.git", default-features=false,features = ["no-entrypoint", "program"], branch = "ckamm/find_by_key" } -solana-client = "~1.10.35" -solana-sdk = "~1.10.35" +solana-client = "~1.14.9" +solana-sdk = "~1.14.9" tokio = { version = "1.14.1", features = ["rt-multi-thread", "time", "macros", "sync"] } diff --git a/liquidator/Cargo.toml b/liquidator/Cargo.toml index ffa29cab3..e89f8a315 100644 --- a/liquidator/Cargo.toml +++ b/liquidator/Cargo.toml @@ -36,11 +36,11 @@ serde_derive = "1.0.130" serde_json = "1.0.68" serum_dex = { version = "0.5.6", git = "https://github.com/blockworks-foundation/serum-dex.git", default-features=false,features = ["no-entrypoint", "program"], branch = "ckamm/find_by_key" } shellexpand = "2.1.0" -solana-account-decoder = "~1.10.35" -solana-client = "~1.10.35" -solana-logger = "~1.10.35" -solana-rpc = "~1.10.35" -solana-sdk = "~1.10.35" +solana-account-decoder = "~1.14.9" +solana-client = "~1.14.9" +solana-logger = "~1.14.9" +solana-rpc = "~1.14.9" +solana-sdk = "~1.14.9" tokio = { version = "1", features = ["full"] } tokio-stream = { version = "0.1.9"} tokio-tungstenite = "0.16.1" diff --git a/liquidator/src/snapshot_source.rs b/liquidator/src/snapshot_source.rs index 28df1b299..789a2b3f6 100644 --- a/liquidator/src/snapshot_source.rs +++ b/liquidator/src/snapshot_source.rs @@ -3,12 +3,9 @@ use jsonrpc_core_client::transports::http; use solana_account_decoder::{UiAccount, UiAccountEncoding}; use solana_client::{ rpc_config::{RpcAccountInfoConfig, RpcContextConfig, RpcProgramAccountsConfig}, - rpc_response::{Response, RpcKeyedAccount}, -}; -use solana_rpc::{ - rpc::OptionalContext, - rpc::{rpc_accounts::AccountsDataClient, rpc_minimal::MinimalClient}, + rpc_response::{OptionalContext, Response, RpcKeyedAccount}, }; +use solana_rpc::rpc::{rpc_accounts::AccountsDataClient, rpc_minimal::MinimalClient}; use solana_sdk::{account::AccountSharedData, commitment_config::CommitmentConfig, pubkey::Pubkey}; use anyhow::Context; diff --git a/liquidator/src/websocket_source.rs b/liquidator/src/websocket_source.rs index d86f6a30b..088161d18 100644 --- a/liquidator/src/websocket_source.rs +++ b/liquidator/src/websocket_source.rs @@ -4,7 +4,7 @@ use jsonrpc_core_client::transports::ws; use solana_account_decoder::UiAccountEncoding; use solana_client::{ rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig}, - rpc_filter::{Memcmp, MemcmpEncodedBytes, RpcFilterType}, + rpc_filter::{Memcmp, RpcFilterType}, rpc_response::{Response, RpcKeyedAccount, RpcResponseContext}, }; use solana_rpc::rpc_pubsub::RpcSolPubSubClient; @@ -78,17 +78,16 @@ async fn feed_data( // filter for only OpenOrders with v4 authority filters: Some(vec![ RpcFilterType::DataSize(3228), // open orders size - RpcFilterType::Memcmp(Memcmp { - offset: 0, - // "serum" + u64 that is Initialized (1) + OpenOrders (4) - bytes: MemcmpEncodedBytes::Base58("AcUQf4PGf6fCHGwmpB".into()), - encoding: None, - }), - RpcFilterType::Memcmp(Memcmp { - offset: 45, // owner is the 4th field, after "serum" (header), account_flags: u64 and market: Pubkey - bytes: MemcmpEncodedBytes::Bytes(config.open_orders_authority.to_bytes().into()), - encoding: None, - }), + // "serum" + u64 that is Initialized (1) + OpenOrders (4) + RpcFilterType::Memcmp(Memcmp::new_raw_bytes( + // new_base58_encoded() does not work with old RPC nodes + 0, + [0x73, 0x65, 0x72, 0x75, 0x6d, 5, 0, 0, 0, 0, 0, 0, 0].to_vec(), + )), + RpcFilterType::Memcmp(Memcmp::new_raw_bytes( + 45, + config.open_orders_authority.to_bytes().to_vec(), + )), ]), with_context: Some(true), account_config: account_info_config.clone(), diff --git a/programs/mango-v4/Cargo.toml b/programs/mango-v4/Cargo.toml index 4995bf6b3..5dccb6fc0 100644 --- a/programs/mango-v4/Cargo.toml +++ b/programs/mango-v4/Cargo.toml @@ -35,18 +35,17 @@ num_enum = "0.5.1" pyth-sdk-solana = "0.1.0" serde = "^1.0" serum_dex = { version = "0.5.6", git = "https://github.com/blockworks-foundation/serum-dex.git", default-features=false,features = ["no-entrypoint", "program"], branch = "ckamm/find_by_key" } -solana-address-lookup-table-program = "~1.10.35" -solana-program = "~1.10.35" -solana-sdk = { version = "~1.10.35", default-features = false, optional = true } +solana-address-lookup-table-program = "~1.14.9" +solana-program = "~1.14.9" +solana-sdk = { version = "~1.14.9", default-features = false, optional = true } static_assertions = "1.1" switchboard-program = ">=0.2.0" -switchboard-utils = ">=0.1.36" -switchboard-v2 = "0.1.12" +switchboard-v2 = "0.1.17" [dev-dependencies] -solana-sdk = { version = "~1.10.35", default-features = false } -solana-program-test = "~1.10.35" -solana-logger = "~1.10.35" +solana-sdk = { version = "~1.14.9", default-features = false } +solana-program-test = "~1.14.9" +solana-logger = "~1.14.9" spl-token = { version = "^3.0.0", features = ["no-entrypoint"] } spl-associated-token-account = { version = "^1.0.3", features = ["no-entrypoint"] } bincode = "^1.3.1" diff --git a/programs/margin-trade/Cargo.toml b/programs/margin-trade/Cargo.toml index 9f39deedf..f235e953e 100644 --- a/programs/margin-trade/Cargo.toml +++ b/programs/margin-trade/Cargo.toml @@ -20,4 +20,4 @@ test-bpf = [] [dependencies] anchor-lang = { path = "../../anchor/lang" } anchor-spl = { path = "../../anchor/spl" } -solana-program = "~1.10.35" +solana-program = "~1.14.9" diff --git a/switchboard-v2 b/switchboard-v2 new file mode 160000 index 000000000..97ed7b12d --- /dev/null +++ b/switchboard-v2 @@ -0,0 +1 @@ +Subproject commit 97ed7b12de198f9dca2637af0ce8f5823cc3a0e3